Changeset 1a3173 in indico

Timestamp:

12/01/11 13:38:18 (18 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

04f83e

Parents:

71a6b7

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (11/09/11 12:39:11)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (12/01/11 13:38:18)

Message:

[IMP] Replace lightbox with jQuery colorbox

• gets rid of some 404 errors
• looks better
• uses jquery instead of plain js

Files:

• etc/js/jquery.cfg (modified) (1 diff)
• indico/MaKaC/common/Configuration.py (modified) (1 diff)
• indico/MaKaC/webinterface/pages/base.py (modified) (1 diff)
• indico/MaKaC/webinterface/pages/conferences.py (modified) (2 diffs)
• indico/MaKaC/webinterface/pages/roomBooking.py (modified) (3 diffs)
• indico/MaKaC/webinterface/pages/sessions.py (modified) (1 diff)
• indico/MaKaC/webinterface/tpls/HTMLHeader.tpl (modified) (1 diff)
• indico/htdocs/css/jquery.colorbox.css (added)
• indico/htdocs/images/colorbox/border.png (added)
• indico/htdocs/images/colorbox/controls.png (added)
• indico/htdocs/images/colorbox/loading.gif (added)
• indico/htdocs/images/colorbox/loading_background.png (added)
• indico/htdocs/images/colorbox/overlay.png (added)
• indico/htdocs/js/indico/Management/Timetable.js (modified) (3 diffs)
• indico/htdocs/js/indico/jquery/defaults.js (modified) (1 diff)
• indico/htdocs/js/indico/jquery/global.js (modified) (1 diff)
• indico/htdocs/js/jquery/jquery.colorbox.js (added)
• indico/htdocs/js/lightbox/close.gif (deleted)
• indico/htdocs/js/lightbox/lightbox.css (deleted)
• indico/htdocs/js/lightbox/lightbox.js (deleted)
• indico/htdocs/js/lightbox/loading.gif (deleted)
• indico/htdocs/js/lightbox/overlay.png (deleted)

etc/js/jquery.cfg

@@ -3 +3 @@
 first=
     underscore.js
-        jquery.js
-        jquery-ui.js
-        jquery.form.js
-        jquery.custom.js
-        jquery.daterange.js
-        jquery.form.js
+    jquery.js
+    jquery-ui.js
+    jquery.form.js
+    jquery.custom.js
+    jquery.daterange.js
+    jquery.form.js
     jquery.qtip.js
-        jquery.dttbutton.js
+    jquery.dttbutton.js
+    jquery.colorbox.js

indico/MaKaC/common/Configuration.py

@@ -490 +490 @@
                        'accessCredentials': ('CN=user,OU=Users,'
                                              'DC=example,DC=com',
-                                             'secret_password')},
-        # Room Booking Related
-        'LightboxCssStylesheetName' : "lightbox/lightbox.css",
-        'LightboxJavascriptName'    : "lightbox/lightbox.js"
+                                             'secret_password')}
         }
 

indico/MaKaC/webinterface/pages/base.py

@@ -57 +57 @@
         info = HelperMaKaCInfo().getMaKaCInfoInstance()
         files = ['underscore', 'jquery', 'jquery-ui', 'jquery.form', 'jquery.custom',
-                 'jquery.daterange', 'jquery.qtip', 'jquery.dttbutton']
+                 'jquery.daterange', 'jquery.qtip', 'jquery.dttbutton', 'jquery.colorbox']
         if info.isDebugActive():
             # We can't use Loader.js as jQuery is included before any indico js

indico/MaKaC/webinterface/pages/conferences.py

@@ -2633 +2633 @@
         pluginCSSFiles = {"paths" : []}
         self._notify("includeTimetableCSSFiles", pluginCSSFiles)
-        cssPaths = ".".join(["""<link rel="stylesheet" href="%s/%s">"""%(baseurl,path) for path in pluginCSSFiles['paths']])
-        return """
-        <!-- Lightbox -->
-        <link rel="stylesheet" href="%s/js/lightbox/lightbox.css"> <!--lightbox.css-->
-        <script type="text/javascript" src="%s/js/lightbox/lightbox.js"></script>
-        """ % ( baseurl, baseurl) + cssPaths
+        return ".".join(["""<link rel="stylesheet" href="%s/%s">"""%(baseurl,path) for path in pluginCSSFiles['paths']])
 
     def _getPageContent(self, params):
@@ -10528 +10523 @@
         baseurl = self._getBaseURL()
         return """
-        <!-- Lightbox -->
-        <link rel="stylesheet" href="%s/js/lightbox/lightbox.css"> <!--lightbox.css-->
-        <script type="text/javascript" src="%s/js/lightbox/lightbox.js"></script>
-
         <!-- Our libs -->
         <script type="text/javascript" src="%s/js/indico/Legacy/validation.js"></script>
 
-        """ % ( baseurl, baseurl, baseurl )
+        """ % (baseurl)
 
     def _setActiveSideMenuItem(self):

indico/MaKaC/webinterface/pages/roomBooking.py

@@ -50 +50 @@
 #        conf = Config.getInstance()
 #        return """
-#        <!-- Lightbox -->
-#        <link rel="stylesheet" href="%s/js/lightbox/lightbox.css"> <!--lightbox.css-->
-#        <script type="text/javascript" src="%s/js/lightbox/lightbox.js"></script>
-#
 #        <!-- Our libs -->
 #        <script type="text/javascript" src="%s/js/indico/validation.js"></script>
@@ -61 +57 @@
 #        <script type="text/javascript" src="%s"></script>
 #        <script type="text/javascript" src="%s"></script>
-#        """ % ( baseurl, baseurl, baseurl, baseurl, urlHandlers.UHJavascriptCalendar.getURL(),
-#                urlHandlers.UHJavascriptCalendarSetup.getURL() )
+#        """ % (baseurl, baseurl, urlHandlers.UHJavascriptCalendar.getURL(),
+#                urlHandlers.UHJavascriptCalendarSetup.getURL())
 
 
@@ -90 +86 @@
         baseurl = self._getBaseURL()
         return """
-        <!-- Lightbox -->
-        <link rel="stylesheet" href="%s/js/lightbox/lightbox.css"> <!--lightbox.css-->
-        <script type="text/javascript" src="%s/js/lightbox/lightbox.js"></script>
-
         <!-- Our libs -->
         <script type="text/javascript" src="%s/js/indico/Legacy/validation.js"></script>
-        """ % ( baseurl, baseurl, baseurl)
+        """ % (baseurl)
 
     def _getSideMenu(self):

indico/MaKaC/webinterface/pages/sessions.py

@@ -1411 +1411 @@
         return WPConfModifScheduleGraphic.getJSFiles(self)
 
-    def _getHeadContent( self ):
-
-        baseurl = self._getBaseURL()
-        return """
-        <!-- Lightbox -->
-        <link rel="stylesheet" href="%s/js/lightbox/lightbox.css"> <!--lightbox.css-->
-        <script type="text/javascript" src="%s/js/lightbox/lightbox.js"></script>
-        """ % ( baseurl, baseurl)
-
     def _generateTimetable(self):
 

indico/MaKaC/webinterface/tpls/HTMLHeader.tpl

@@ -10 +10 @@
         <link rel="stylesheet" type="text/css" href="${ baseurl }/css/jquery-ui.css">
         <link rel="stylesheet" type="text/css" href="${ baseurl }/css/jquery.qtip.css">
+        <link rel="stylesheet" type="text/css" href="${ baseurl }/css/jquery.colorbox.css">
         <link rel="stylesheet" type="text/css" href="${ baseurl }/css/jquery-ui-custom.css">
 

indico/htdocs/js/indico/Management/Timetable.js

@@ -1240 +1240 @@
 
         var startTimeRescheduleRB = Html.radio({name:"rescheduleAction", id:"startTimeRescheduleRB", style:{verticalAlign: "middle"}});
+        var startTimeRescheduleExample = Html.a({href: Indico.Urls.ImagesBase + '/resched_ex_1.png', title: 'Starting Time Example'}, $T("See an example"));
+        $(startTimeRescheduleExample.dom).colorbox();
         var startTimeRescheduleLabel = Html.label({style: {fontWeight: "normal"}},
                 Html.div("rescheduleLabelTitle", $T("Adjust starting time of all entries")),
@@ -1251 +1253 @@
                             $T("The first entry will start when the interval starts (") + this.tt.contextInfo.startDate.time.slice(0,5) + "), " ,
                     $T("and the other entries will follow consecutively after it. The durations of the entries will not change. "),
-                    Html.a({href: Indico.Urls.ImagesBase + '/resched_ex_1.png', rel: 'lightbox', title: 'Starting Time Example', onclick: "showLightbox(this); return false;"}, $T("See an example"))));
+                    startTimeRescheduleExample));
 
         startTimeRescheduleLabel.dom.htmlFor = "startTimeRescheduleRB";
 
         var durationRescheduleRB = Html.radio({name:"rescheduleAction", id:"durationRescheduleRB", style:{verticalAlign: "middle"}});
+        var durationRescheduleExample = Html.a({href: Indico.Urls.ImagesBase + '/resched_ex_2.png', title: 'Duration Example'}, $T("See an example"));
+        $(durationRescheduleExample.dom).colorbox();
         var durationRescheduleLabel = Html.label({style: {fontWeight: "normal"}},
                 Html.div("rescheduleLabelTitle", $T("Adjust duration of all entries")),
@@ -1266 +1270 @@
                                         "If a time gap is specified, the duration will be extended up to the value of " +
                                         "this time gap before the starting time of the next entry. "),
-                        Html.a({href: Indico.Urls.ImagesBase + '/resched_ex_2.png', rel: 'lightbox', title: 'Duration Example', onclick: "showLightbox(this); return false;"}, $T("See an example"))));
+                        durationRescheduleExample));
 
         durationRescheduleLabel.dom.htmlFor = "durationRescheduleRB";

indico/htdocs/js/indico/jquery/defaults.js

@@ -10 +10 @@
     style: {tip: {corner: true}}
 });
+
+$.extend($.colorbox.settings, {
+    opacity: 0.6
+});

indico/htdocs/js/indico/jquery/global.js

@@ -25 +25 @@
         }
     });
+
+    // Enable colorbox for links with rel="lightbox"
+    $('a[rel="lightbox"]').colorbox();
 });