Changeset 2570


Ignore:
Timestamp:
07/21/10 20:25:10 (19 months ago)
Author:
mattlevine
Message:
  1. Removing the site manager manual sorting to use jquery ui sortable back to select boxes. Need to restructure mark-up first.
Location:
branches/5.2/www/admin/view/vArchitecture
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/5.2/www/admin/view/vArchitecture/dsp_list.cfm

    r2569 r2570  
    77Mura CMS is distributed in the hope that it will be useful, 
    88but WITHOUT ANY WARRANTY; without even the implied warranty of 
    9 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ï¿œSee the 
     9MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. †See the 
    1010GNU General Public License for more details. 
    1111 
    1212You should have received a copy of the GNU General Public License 
    13 along with Mura CMS. ï¿œIf not, see <http://www.gnu.org/licenses/>. 
     13along with Mura CMS. †If not, see <http://www.gnu.org/licenses/>. 
    1414 
    1515Linking Mura CMS statically or dynamically with other modules constitutes 
    1616the preparation of a derivative work based on Mura CMS. Thus, the terms and      
    17 conditions of the GNU General Public License version 2 (ï¿œGPLï¿œ) cover the entire combined work. 
     17conditions of the GNU General Public License version 2 (ìGPLî) cover the entire combined work. 
    1818 
    1919However, as a special exception, the copyright holders of Mura CMS grant you permission 
    2020to combine Mura CMS with programs or libraries that are released under the GNU Lesser General Public License version 2.1. 
    2121 
    22 In addition, as a special exception, ï¿œthe copyright holders of Mura CMS grant you permission 
    23 to combine Mura CMS ï¿œwith independent software modules that communicate with Mura CMS solely 
     22In addition, as a special exception, †the copyright holders of Mura CMS grant you permission 
     23to combine Mura CMS †with independent software modules that communicate with Mura CMS solely 
    2424through modules packaged as Mura CMS plugins and deployed through the Mura CMS plugin installation API, 
    25 provided that these modules (a) may only modify the ï¿œ/trunk/www/plugins/ directory through the Mura CMS 
     25provided that these modules (a) may only modify the †/trunk/www/plugins/ directory through the Mura CMS 
    2626plugin installation API, (b) must not alter any default objects in the Mura CMS database 
    2727and (c) must not alter any files in the following directories except in cases where the code contains 
    … …  
    3838For clarity, if you create a modified version of Mura CMS, you are not obligated to grant this special exception 
    3939for your modified version; it is your choice whether to do so, or to make such modified version available under 
    40 the GNU General Public License version 2 ï¿œwithout this exception. ï¿œYou may, if you choose, apply this exception 
     40the GNU General Public License version 2 †without this exception. †You may, if you choose, apply this exception 
    4141to your own modified versions of Mura CMS. 
    4242---> 
    … …  
    6363<cfif isdefined('attributes.orderid') > 
    6464<cfloop from="1" to="#listlen(attributes.orderid)#" index="i"> 
    65 <cfset newOrderNo=(attributes.startrow+i)-1> 
    6665<cfquery datasource="#application.configBean.getDatasource()#" username="#application.configBean.getDBUsername()#" password="#application.configBean.getDBPassword()#" > 
    67 update tcontent set orderno= #newOrderNo# where contentid ='#listgetat(attributes.orderid,i)#' 
     66update tcontent set orderno= #listgetat(attributes.orderno,i)# where contentid ='#listgetat(attributes.orderid,i)#' 
    6867</cfquery> 
    6968</cfloop> 
    … …  
    104103 
    105104<cfoutput>       
     105<cfif session.copySiteID eq attributes.siteID> 
    106106<script> 
    107 <cfif session.copySiteID eq attributes.siteID> 
    108107copyContentID = '#session.copyContentID#'; 
    109108copySiteID = '#session.copySiteID#'; 
    110109copyAll = '#session.copyAll#'; 
     110</script> 
    111111<cfelse> 
     112<script> 
    112113copyContentID = ''; 
    113114copySiteID = ''; 
    114115copyAll = 'false'; 
    115 </cfif> 
    116 <cfif attributes.sortBy eq 'orderno' and perm eq 'editor'> 
    117 startrow=#int(attributes.startrow)# 
    118 jQuery(document).ready( 
    119         function(){ 
    120                 jQuery("##sortableKids").sortable( 
    121                         { 
    122                                 stop: function(event, ui) { stripe('stripe'); } 
    123                         } 
    124                 ); 
    125                 jQuery("##sortableKids").disableSelection(); 
    126         } 
    127         ); 
    128 </cfif> 
    129116</script> 
     117</cfif> 
    130118<h2>#application.rbFactory.getKeyValue(session.rb,"sitemanager.sitemanager")#</h2> 
    131119<form id="siteSearch" name="siteSearch" method="get"><h3>#application.rbFactory.getKeyValue(session.rb,"sitemanager.contentsearch")#</h3><input name="keywords" value="#HTMLEditFormat(session.keywords)#" type="text" class="text" align="absmiddle" />   
    … …  
    233221</tr> 
    234222                  <cfif request.rstop.hasKids> 
    235                         <cfif attributes.sortBy eq 'orderno'><tbody id="sortableKids"></cfif> 
    236223             <cf_dsp_nest topid="#attributes.topid#" parentid="#attributes.topid#"  rsnest="#rsNext#" locking="#application.settingsManager.getSite(attributes.siteid).getlocking()#" nestlevel="1" perm="#perm#" siteid="#attributes.siteid#" moduleid="#attributes.moduleid#" restricted="#r#" viewdepth="#session.viewDepth#" nextn="#session.nextN#" startrow="#attributes.startrow#" sortBy="#attributes.sortBy#" sortDirection="#attributes.sortDirection#" pluginEvent="#pluginEvent#"> 
    237                 <cfif attributes.sortBy eq 'orderno'></tbody></cfif> 
    238                         </cfif> 
     224          </cfif> 
    239225          <cfif isMore> 
    240226             #pageList# 

  • branches/5.2/www/admin/view/vArchitecture/dsp_nest.cfm

    r2569 r2570  
    77Mura CMS is distributed in the hope that it will be useful, 
    88but WITHOUT ANY WARRANTY; without even the implied warranty of 
    9 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ï¿œSee the 
     9MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ÔÞΩSee the 
    1010GNU General Public License for more details. 
    1111 
    1212You should have received a copy of the GNU General Public License 
    13 along with Mura CMS. ï¿œIf not, see <http://www.gnu.org/licenses/>. 
     13along with Mura CMS. ÔÞΩIf not, see <http://www.gnu.org/licenses/>. 
    1414 
    1515Linking Mura CMS statically or dynamically with other modules constitutes 
    1616the preparation of a derivative work based on Mura CMS. Thus, the terms and      
    17 conditions of the GNU General Public License version 2 (ï¿œGPLï¿œ) cover the entire combined work. 
     17conditions of the GNU General Public License version 2 (ÔÞΩGPLÔÞΩ) cover the entire combined work. 
    1818 
    1919However, as a special exception, the copyright holders of Mura CMS grant you permission 
    2020to combine Mura CMS with programs or libraries that are released under the GNU Lesser General Public License version 2.1. 
    2121 
    22 In addition, as a special exception, ï¿œthe copyright holders of Mura CMS grant you permission 
    23 to combine Mura CMS ï¿œwith independent software modules that communicate with Mura CMS solely 
     22In addition, as a special exception, ÔÞΩthe copyright holders of Mura CMS grant you permission 
     23to combine Mura CMS ÔÞΩwith independent software modules that communicate with Mura CMS solely 
    2424through modules packaged as Mura CMS plugins and deployed through the Mura CMS plugin installation API, 
    25 provided that these modules (a) may only modify the ï¿œ/trunk/www/plugins/ directory through the Mura CMS 
     25provided that these modules (a) may only modify the ÔÞΩ/trunk/www/plugins/ directory through the Mura CMS 
    2626plugin installation API, (b) must not alter any default objects in the Mura CMS database 
    2727and (c) must not alter any files in the following directories except in cases where the code contains 
    … …  
    3838For clarity, if you create a modified version of Mura CMS, you are not obligated to grant this special exception 
    3939for your modified version; it is your choice whether to do so, or to make such modified version available under 
    40 the GNU General Public License version 2 ï¿œwithout this exception. ï¿œYou may, if you choose, apply this exception 
     40the GNU General Public License version 2 ÔÞΩwithout this exception. ÔÞΩYou may, if you choose, apply this exception 
    4141to your own modified versions of Mura CMS. 
    4242---> 
    … …  
    122122<cfif attributes.parentid eq attributes.topid> 
    123123<input type="hidden" name="orderid" value="#attributes.rsnest.contentid#"> 
    124 <!--- 
    125124<select name="orderno" class="dropdown" <cfif attributes.perm neq 'editor'>#application.rbFactory.getKeyValue(session.rb,"sitemanager.disabled")#</cfif>> 
    126125<cfloop from="#variables.startrow#" to="#endrow#" index="o"> 
    127126<option value="#o#" <cfif o eq currentPos>selected</cfif>>#o#</option> 
    128127</cfloop> 
    129 </select>---><span class="ui-icon ui-icon-arrowthick-2-n-s"></span><cfelse>&nbsp;</cfif>#currentPos#</td> 
     128</select><cfelse>&nbsp;</cfif></td> 
    130129</cfif> 
    131130                <td>#attributes.rsNest.inheritObjects#</td>  
Note: See TracChangeset for help on using the changeset viewer.