Changeset 2575

Timestamp:

07/23/10 21:40:11 (19 months ago)

Author:

mattlevine

Message:

1. Fixing wrong cf_sql_type value for new param attribute.
2. Adding argument scoping to rc.
3. Fixing strange issue with event struct not passing by reference.
4. Adding old tabs css back in.

Location:

trunk/www

Files:

• admin/css/tab-view.css (copied) (copied from branches/5.2/www/admin/css/tab-view.css)
• admin/fw1/controllers/carch.cfc (modified) (1 diff)
• admin/view/vArchitecture/dsp_list.cfm (modified) (2 diffs)
• admin/view/vArchitecture/dsp_nest.cfm (modified) (2 diffs)
• default/includes/themes/merced/display_objects (modified) (1 prop)
• default/includes/themes/merced/resourceBundles (modified) (1 prop)
• default/includes/themes/merced/templates/cfmx7/inc (modified) (1 prop)
• default/includes/themes/merced/templates/components (modified) (1 prop)
• requirements/mura/content/contentManager.cfc (modified) (2 diffs)
• requirements/mura/resourceBundle/resourceBundleFactory.cfc (modified) (1 diff)
• requirements/mura/resourceBundle/utils.cfc (modified) (3 diffs)

trunk/www/admin/fw1/controllers/carch.cfc

@@ -172 +172 @@
          <cfif arguments.rc.allowAction and arguments.rc.action eq 'add'>
                 <cfif structKeyExists(arguments.rc,"preserveID") and isValid('UUID',arguments.rc.preserveID)>
-                         <cfset arguments.rc.contentBean=getBean('content').loadBy(contentHistID=rc.preserveID, siteid=rc.siteid).set(arguments.rc).save() />
+                         <cfset arguments.rc.contentBean=getBean('content').loadBy(contentHistID=arguments.rc.preserveID, siteid=arguments.rc.siteid).set(arguments.rc).save() />
                 <cfelse>
-                         <cfset arguments.rc.contentBean=getBean('content').loadBy(contentID=rc.contentID, siteid=rc.siteid).set(arguments.rc).save() />
+                         <cfset arguments.rc.contentBean=getBean('content').loadBy(contentID=arguments.rc.contentID, siteid=arguments.rc.siteid).set(arguments.rc).save() />
                 </cfif>
          </cfif>

trunk/www/admin/view/vArchitecture/dsp_list.cfm

@@ -7 +7 @@
 Mura CMS is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. †See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Mura CMS.  If not, see <http://www.gnu.org/licenses/>.
+along with Mura CMS. †If not, see <http://www.gnu.org/licenses/>.
 
 Linking Mura CMS statically or dynamically with other modules constitutes
 the preparation of a derivative work based on Mura CMS. Thus, the terms and     
-conditions of the GNU General Public License version 2 (“GPL”) cover the entire combined work.
+conditions of the GNU General Public License version 2 (ìGPLî) cover the entire combined work.
 
 However, as a special exception, the copyright holders of Mura CMS grant you permission
 to combine Mura CMS with programs or libraries that are released under the GNU Lesser General Public License version 2.1.
 
-In addition, as a special exception,  the copyright holders of Mura CMS grant you permission
-to combine Mura CMS  with independent software modules that communicate with Mura CMS solely
+In addition, as a special exception, †the copyright holders of Mura CMS grant you permission
+to combine Mura CMS †with independent software modules that communicate with Mura CMS solely
 through modules packaged as Mura CMS plugins and deployed through the Mura CMS plugin installation API,
-provided that these modules (a) may only modify the  /trunk/www/plugins/ directory through the Mura CMS
+provided that these modules (a) may only modify the †/trunk/www/plugins/ directory through the Mura CMS
 plugin installation API, (b) must not alter any default objects in the Mura CMS database
 and (c) must not alter any files in the following directories except in cases where the code contains
@@ -38 +38 @@
 For clarity, if you create a modified version of Mura CMS, you are not obligated to grant this special exception
 for your modified version; it is your choice whether to do so, or to make such modified version available under
-the GNU General Public License version 2  without this exception.  You may, if you choose, apply this exception
+the GNU General Public License version 2 †without this exception. †You may, if you choose, apply this exception
 to your own modified versions of Mura CMS.
 --->

trunk/www/admin/view/vArchitecture/dsp_nest.cfm

@@ -7 +7 @@
 Mura CMS is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ï¿œSee the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ÔÞΩSee the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Mura CMS. ï¿œIf not, see <http://www.gnu.org/licenses/>.
+along with Mura CMS. ÔÞΩIf not, see <http://www.gnu.org/licenses/>.
 
 Linking Mura CMS statically or dynamically with other modules constitutes
 the preparation of a derivative work based on Mura CMS. Thus, the terms and     
-conditions of the GNU General Public License version 2 (ￜGPLￜ) cover the entire combined work.
+conditions of the GNU General Public License version 2 (ÔÞΩGPLÔÞΩ) cover the entire combined work.
 
 However, as a special exception, the copyright holders of Mura CMS grant you permission
 to combine Mura CMS with programs or libraries that are released under the GNU Lesser General Public License version 2.1.
 
-In addition, as a special exception, ï¿œthe copyright holders of Mura CMS grant you permission
-to combine Mura CMS ï¿œwith independent software modules that communicate with Mura CMS solely
+In addition, as a special exception, ÔÞΩthe copyright holders of Mura CMS grant you permission
+to combine Mura CMS ÔÞΩwith independent software modules that communicate with Mura CMS solely
 through modules packaged as Mura CMS plugins and deployed through the Mura CMS plugin installation API,
-provided that these modules (a) may only modify the ￜ/trunk/www/plugins/ directory through the Mura CMS
+provided that these modules (a) may only modify the ÔÞΩ/trunk/www/plugins/ directory through the Mura CMS
 plugin installation API, (b) must not alter any default objects in the Mura CMS database
 and (c) must not alter any files in the following directories except in cases where the code contains
@@ -38 +38 @@
 For clarity, if you create a modified version of Mura CMS, you are not obligated to grant this special exception
 for your modified version; it is your choice whether to do so, or to make such modified version available under
-the GNU General Public License version 2 ï¿œwithout this exception. ï¿œYou may, if you choose, apply this exception
+the GNU General Public License version 2 ÔÞΩwithout this exception. ÔÞΩYou may, if you choose, apply this exception
 to your own modified versions of Mura CMS.
 --->

trunk/www/requirements/mura/content/contentManager.cfc

@@ -463 +463 @@
                 <cfset var rsDrafts = "" />
                 <cfset var d = "" />
-                <cfset var pluginEvent = createObject("component","mura.event") />
+                <cfset var pluginEvent = createObject("component","mura.MuraScope") />
                 <cfset var tempFile="" />
                 
@@ -475 +475 @@
                 </cfif>
                 
-                <cfset pluginEvent.init(arguments.data)>
+                <cfset pluginEvent=pluginEvent.init(arguments.data).getEvent()>
                 
                 <!--- MAKE SURE ALL REQUIRED DATA IS THERE--->

trunk/www/requirements/mura/resourceBundle/resourceBundleFactory.cfc

@@ -833 +833 @@
 
 <!--- now we create a date so we can parse it and figure out the date format and then create a date validation key --->
-<cfif not len(arguments.mySession.dateKey) or not len(arguments.mySession.dateKeyFormat)> --->
+<cfif not len(arguments.mySession.dateKey) or not len(arguments.mySession.dateKeyFormat)>
         <cfset utils=getUtils(arguments.mySession.locale)>
         <cfset arguments.mySession.dateKey=utils.getJSDateKey()>

trunk/www/requirements/mura/resourceBundle/utils.cfc

@@ -32 +32 @@
         
                 <cfset loadLocale()>
+                
                 <cfreturn this />
         </cffunction>
@@ -350 +351 @@
         <cfloop list="#formatTest#" index="f" delimiters="#dtCh#">
                 <cfif listFind("2018,18",f)>    
-                        <cfset dateKeyFormat=listAppend(dateKeyFormat,"YYYY",dtCh)>
+                        <cfset variables.dateKeyFormat=listAppend(variables.dateKeyFormat,"YYYY",dtCh)>
                 <cfelseif f eq 11>
-                        <cfset dateKeyFormat=listAppend(dateKeyFormat,"MM",dtCh)>
+                        <cfset variables.dateKeyFormat=listAppend(variables.dateKeyFormat,"MM",dtCh)>
                 <cfelse>
-                        <cfset dateKeyFormat=listAppend(dateKeyFormat,"DD",dtCh)>
+                        <cfset variables.dateKeyFormat=listAppend(variables.dateKeyFormat,"DD",dtCh)>
                 </cfif>
         </cfloop>
@@ -366 +367 @@
         </cfif>
         
-        <cfset datekeyExample=lsDateFormat(createDate(2018,11,10),datekeyFormat)/>
-
-<cfsavecontent variable="jsDateKey">
+        <cfset variables.datekeyExample=lsDateFormat(createDate(2018,11,10),datekeyFormat)/>
+
+<cfsavecontent variable="variables.jsDateKey">
 <cfoutput><script type="text/javascript">
-var dtExample="#datekeyExample#";
+var dtExample="#variables.datekeyExample#";
 var dtCh="#dtCh#";
 var dtFormat =[#dtFormat#];