- Timestamp:
- 02/09/12 21:20:43 (3 months ago)
- Location:
- trunk/www
- Files:
-
- 37 added
- 3 edited
- 1 copied
-
admin/fw1/controllers/home.cfc (modified) (1 diff)
-
default/includes/display_objects/htmlhead/jquery-ui.cfm (copied) (copied from trunk/www/default/includes/display_objects/htmlhead/jquery.cfm) (1 diff, 1 prop)
-
default/includes/display_objects/htmlhead/jquery.cfm (modified) (1 diff)
-
default/includes/themes/merced/templates/mobile.cfm (modified) (2 diffs)
-
default/jquery (added)
-
default/jquery/jquery.js (added)
-
default/jquery/mobile (added)
-
default/jquery/mobile/images (added)
-
default/jquery/mobile/images/ajax-loader.png (added)
-
default/jquery/mobile/images/icons-18-black.png (added)
-
default/jquery/mobile/images/icons-18-white.png (added)
-
default/jquery/mobile/images/icons-36-black.png (added)
-
default/jquery/mobile/images/icons-36-white.png (added)
-
default/jquery/mobile/jquery.mobile-1.0.1.css (added)
-
default/jquery/mobile/jquery.mobile-1.0.1.js (added)
-
default/jquery/mobile/jquery.mobile.min.css (added)
-
default/jquery/mobile/jquery.mobile.min.js (added)
-
default/jquery/mobile/jquery.mobile.structure-1.0.1.css (added)
-
default/jquery/mobile/jquery.mobile.structure.min.css (added)
-
default/jquery/ui (added)
-
default/jquery/ui/images (added)
-
default/jquery/ui/images/ui-bg_diagonals-thick_18_b81900_40x40.png (added)
-
default/jquery/ui/images/ui-bg_diagonals-thick_20_666666_40x40.png (added)
-
default/jquery/ui/images/ui-bg_flat_10_000000_40x100.png (added)
-
default/jquery/ui/images/ui-bg_glass_100_f6f6f6_1x400.png (added)
-
default/jquery/ui/images/ui-bg_glass_100_fdf5ce_1x400.png (added)
-
default/jquery/ui/images/ui-bg_glass_65_ffffff_1x400.png (added)
-
default/jquery/ui/images/ui-bg_gloss-wave_35_f6a828_500x100.png (added)
-
default/jquery/ui/images/ui-bg_highlight-soft_100_eeeeee_1x100.png (added)
-
default/jquery/ui/images/ui-bg_highlight-soft_75_ffe45c_1x100.png (added)
-
default/jquery/ui/images/ui-icons_222222_256x240.png (added)
-
default/jquery/ui/images/ui-icons_228ef1_256x240.png (added)
-
default/jquery/ui/images/ui-icons_ef8c08_256x240.png (added)
-
default/jquery/ui/images/ui-icons_ffd27a_256x240.png (added)
-
default/jquery/ui/images/ui-icons_ffffff_256x240.png (added)
-
default/jquery/ui/jquery-ui-1.8.17.custom.css (added)
-
default/jquery/ui/jquery-ui-1.8.17.custom.min.js (added)
-
default/jquery/ui/jquery-ui.min.css (added)
-
default/jquery/ui/jquery-ui.min.js (added)
-
default/js/jquery/moved.txt (added)
-
default/mobile/moved.txt (added)
Legend:
- Unmodified
- Added
- Removed
-
trunk/www/admin/fw1/controllers/home.cfc
r4748 r4795 47 47 <cfcomponent extends="controller" output="false"> 48 48 49 50 51 52 49 <cffunction name="init" output="false"> 50 <cfargument name="fw" /> 51 <cfset variables.fw = arguments.fw /> 52 </cffunction> 53 53 54 55 54 <cffunction name="setContentServer" output="false"> 55 <cfargument name="ContentServer"> 56 56 <cfset variables.contentServer=arguments.contentServer> 57 </cffunction> 57 </cffunction> 58 59 <cffunction name="redirect" output="false"> 60 <cfargument name="rc" /> 61 <cfset var siteID=""> 62 <cfset var rsList=""> 63 <cfset var rsDefault=structNew()> 64 65 <cfset arguments.rc.siteid=""> 58 66 59 <cffunction name="redirect" output="false"> 60 <cfargument name="rc" /> 61 <cfset var siteID=""> 62 <cfset var rsList=""> 63 <cfset var rsDefault=structNew()> 64 67 <cfif not listFind(session.mura.memberships,'S2IsPrivate')> 68 <cfset variables.fw.redirect(action="clogin.main",path="index.cfm")> 69 </cfif> 70 71 <cfset rsList=application.settingsManager.getUserSites(session.siteArray,listFind(session.mura.memberships,'S2')) /> 72 73 <cfset siteID=application.contentServer.bindToDomain(isAdmin=true)> 74 75 <cfif siteID neq "--none--"> 76 <cfquery name="rsDefault" dbtype="query"> 77 SELECT siteid FROM rsList 78 WHERE siteid = <cfqueryparam cfsqltype="cf_sql_varchar" 79 value="#siteID#" /> 80 </cfquery> 81 <cfelse> 65 82 <cfset rsDefault.recordcount=0> 66 <cfset arguments.rc.siteid=""> 67 68 <cfif not listFind(session.mura.memberships,'S2IsPrivate')> 69 <cfset variables.fw.redirect(action="clogin.main",path="index.cfm")> 83 </cfif> 84 85 <cfif rsDefault.recordcount> 86 <cfset arguments.rc.siteid=rsDefault.siteid /> 87 <cfelseif rsList.recordcount> 88 <cfset arguments.rc.siteid=rsList.siteid /> 89 </cfif> 90 91 <cfif len(arguments.rc.siteid)> 92 <cfif application.configBean.getDashboard()> 93 <cfset variables.fw.redirect(action="cDashboard.main",append="siteid",path="index.cfm")> 94 <cfelse> 95 <cfset arguments.rc.moduleid="00000000000000000000000000000000000"> 96 <cfset arguments.rc.topid="00000000000000000000000000000000001"> 97 <cfset variables.fw.redirect(action="cArch.list",append="siteid,moduleid,topid",path="index.cfm")> 70 98 </cfif> 71 72 <cfset rsList=application.settingsManager.getUserSites(session.siteArray,listFind(session.mura.memberships,'S2')) /> 73 74 <cfif isDefined("session.siteID")> 75 <cfquery name="rsDefault" dbtype="query"> 76 SELECT siteid FROM rsList 77 WHERE siteid = <cfqueryparam cfsqltype="cf_sql_varchar" value="#session.siteID#" /> 78 </cfquery> 79 </cfif> 80 81 <cfif not rsDefault.recordcount> 82 <cfset siteID=application.contentServer.bindToDomain(isAdmin=true)> 83 84 <cfif siteID neq "--none--"> 85 <cfquery name="rsDefault" dbtype="query"> 86 SELECT siteid FROM rsList 87 WHERE siteid = <cfqueryparam cfsqltype="cf_sql_varchar" value="#siteID#" /> 88 </cfquery> 89 </cfif> 90 91 </cfif> 92 93 <cfif rsDefault.recordcount> 94 <cfset arguments.rc.siteid=rsDefault.siteid /> 95 <cfelseif rsList.recordcount> 96 <cfset arguments.rc.siteid=rsList.siteid /> 97 </cfif> 98 99 <cfif len(arguments.rc.siteid)> 100 <cfif application.configBean.getDashboard()> 101 <cfset variables.fw.redirect(action="cDashboard.main",append="siteid",path="index.cfm")> 102 <cfelse> 103 <cfset arguments.rc.moduleid="00000000000000000000000000000000000"> 104 <cfset arguments.rc.topid="00000000000000000000000000000000001"> 105 <cfset variables.fw.redirect(action="cArch.list",append="siteid,moduleid,topid",path="index.cfm")> 106 </cfif> 107 </cfif> 108 109 <cfset variables.fw.redirect(action="cMessage.noAccess",path="index.cfm")> 99 </cfif> 110 100 111 </cffunction> 101 <cfset variables.fw.redirect(action="cMessage.noAccess",path="index.cfm")> 102 103 </cffunction> 112 104 113 105 </cfcomponent> -
trunk/www/default/includes/display_objects/htmlhead/jquery-ui.cfm
- Property svn:executable deleted
r4720 r4795 45 45 version 2 without this exception. You may, if you choose, apply this exception to your own modified versions of Mura CMS. 46 46 ---> 47 <cfoutput><script type="text/javascript"> 48 <!-- 49 !window.jQuery && document.write(unescape('%3Cscript type="text/javascript" src="#event.getSite().getAssetPath()#/js/jquery/jquery.js"%3E%3C/script%3E')) 50 //--> 51 </script></cfoutput> 47 <cfoutput> 48 <script>!window.jQuery.ui && document.write(unescape('%3Cscript src="#$.siteConfig("assetPath")#/jquery/ui/jquery-ui.min.js"%3E%3C/script%3E'))</script> 49 <link href="#$.siteConfig('assetPath')#/jquery/ui/jquery-ui.min.css" rel="stylesheet" type="text/css" /> 50 </cfoutput> -
trunk/www/default/includes/display_objects/htmlhead/jquery.cfm
r4720 r4795 47 47 <cfoutput><script type="text/javascript"> 48 48 <!-- 49 !window.jQuery && document.write(unescape('%3Cscript type="text/javascript" src="# event.getSite().getAssetPath()#/js/jquery/jquery.js"%3E%3C/script%3E'))49 !window.jQuery && document.write(unescape('%3Cscript type="text/javascript" src="#$.siteConfig("assetPath")#/jquery/jquery.js"%3E%3C/script%3E')) 50 50 //--> 51 51 </script></cfoutput> -
trunk/www/default/includes/themes/merced/templates/mobile.cfm
r4792 r4795 16 16 17 17 <link rel="stylesheet" href="#$.siteConfig('assetPath')#/css/mura.min.css?" /> 18 <link rel="stylesheet" href="#$.siteConfig('assetPath')#/ mobile/jquery.mobile.min.css" />18 <link rel="stylesheet" href="#$.siteConfig('assetPath')#/jquery/mobile/jquery.mobile.min.css" /> 19 19 <link rel="stylesheet" href="#$.siteConfig('themeAssetPath')#/css/mobile/mobile.css" /> 20 20 21 <script src="#$.siteConfig('assetPath')#/j s/jquery/jquery.js"></script>21 <script src="#$.siteConfig('assetPath')#/jquery/jquery.js"></script> 22 22 23 23 <script type="text/javascript"> … … 30 30 </script> 31 31 32 <script src="#$.siteConfig('assetPath')#/ mobile/jquery.mobile.min.js"></script>32 <script src="#$.siteConfig('assetPath')#/jquery/mobile/jquery.mobile.min.js"></script> 33 33 <cfset rs=$.getBean('feedManager').getFeeds($.event('siteID'),'Local',true,true) /> 34 34
Note: See TracChangeset
for help on using the changeset viewer.
