Changeset 64729b in indico

Timestamp:

03/17/10 20:31:23 (3 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, prov-dual-interface, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

7dd15f, f3d0f4

Parents:

382574

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (03/05/10 17:24:34)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (03/17/10 20:31:23)

Message:

[IMP] Better material creation Widget

• Clearer, nicer - file uploads and links in one single tab;
• Slight refactor on the server side, regarding material factories and the file upload code;
• Some bug fixes since last improvements;
• There shouldn't be such a promiscuity between material names and ids, but fixing it would require major changes in the DB. To be addressed later;
• Some changes to the TabWidgets? that required some refactoring, and changes in the timetable - fixed some other dialogs as well;
• fixes #247

Location:

indico

Files:

• MaKaC/common/output.py (modified) (7 diffs)
• MaKaC/webinterface/materialFactories.py (modified) (3 diffs)
• MaKaC/webinterface/rh/conferenceBase.py (modified) (5 diffs)
• MaKaC/webinterface/stylesheets/include/common.xsl (modified) (1 diff)
• MaKaC/webinterface/tpls/AdminPlugins.tpl (modified) (1 diff)
• MaKaC/webinterface/tpls/ShowExistingMaterial.tpl (modified) (1 diff)
• MaKaC/webinterface/tpls/js/vars.js.tpl (modified) (1 diff)
• MaKaC/webinterface/wcomponents.py (modified) (2 diffs)
• htdocs/css/Default.css (modified) (4 diffs)
• htdocs/images/balloon_popup_arrows_yellow.png (added)
• htdocs/js/indico/Core/Data.js (modified) (1 diff)
• htdocs/js/indico/Core/Dialogs/Popup.js (modified) (5 diffs)
• htdocs/js/indico/Core/Widgets/Base.js (modified) (7 diffs)
• htdocs/js/indico/Core/Widgets/Inline.js (modified) (11 diffs)
• htdocs/js/indico/Legacy/Dialogs.js (modified) (1 diff)
• htdocs/js/indico/Legacy/Util.js (modified) (2 diffs)
• htdocs/js/indico/MaterialEditor/Editor.js (modified) (33 diffs)
• htdocs/js/indico/Timetable/Base.js (modified) (7 diffs)

indico/MaKaC/common/output.py

@@ -111 +111 @@
         self.webFactory = WebFactoryRegistry()
 
+    # TODO: Put this out of here, and unify with WShowExistingMaterial._generateMaterialList
+    # (when we have a better class hierarchy)
+    def _generateMaterialList(self, obj):
+        """
+        Generates a list containing all the materials, with the
+        corresponding Ids for those that already exist
+        """
+
+        from MaKaC.webinterface.rh.conferenceBase import RHSubmitMaterialBase
+        if isinstance(obj, conference.Category):
+            _allowedMats = RHSubmitMaterialBase._allowedMatsCategory
+        else:
+            _allowedMats = RHSubmitMaterialBase._allowedMatsEvent[obj.getConference().getType()]
+
+        matDict = dict((title.lower(), title) for title in _allowedMats)
+
+        for material in obj.getMaterialList():
+            title = material.getTitle().lower()
+            matDict[title] = material.getId()
+
+        return sorted(list((matId, title.title()) for title, matId in matDict.iteritems()))
+
+
     def getOutput(self, conf, stylesheet, vars=None, includeSession=1,includeContribution=1,includeMaterial=1,showSession="all",showDate="all",showContribution="all"):
         # get xml conference
@@ -188 +211 @@
         else:
             out.writeTag("category","")
+
+        out.writeTag("parentProtection", simplejson.dumps(conf.getAccessController().isProtected()))
+        out.writeTag("materialList", simplejson.dumps(self._generateMaterialList(conf)))
 
         if conf.canModify( self.__aw ) and vars and modificons:
@@ -216 +242 @@
 
         out.writeTag("customMaterialList", simplejson.dumps(customMaterials))
-            
+
         if conf.getOrgText() != "":
             out.writeTag("organiser", conf.getOrgText())
@@ -452 +478 @@
         out.openTag("session")
         out.writeTag("ID",session.getId())
+
         if session.getCode() not in ["no code", ""]:
             out.writeTag("code",session.getCode())
@@ -535 +562 @@
         out.openTag("session")
         out.writeTag("ID",session.getId())
+
+        out.writeTag("parentProtection", simplejson.dumps(session.getAccessController().isProtected()))
+        out.writeTag("materialList", simplejson.dumps(self._generateMaterialList(session)))
+
+
         slotCode = session.getSortedSlotList().index(slot) + 1
         if session.getCode() not in ["no code", ""]:
@@ -609 +641 @@
         out.openTag("contribution")
         out.writeTag("ID",cont.getId())
+
+        out.writeTag("parentProtection", simplejson.dumps(cont.getAccessController().isProtected()))
+        out.writeTag("materialList", simplejson.dumps(self._generateMaterialList(cont)))
+
         if cont.getBoardNumber() != "":
             out.writeTag("board",cont.getBoardNumber())
@@ -708 +744 @@
         out.openTag("subcontribution")
         out.writeTag("ID",subCont.getId())
+
+        out.writeTag("parentProtection", simplejson.dumps(subCont.getContribution().getAccessController().isProtected()))
+        out.writeTag("materialList", simplejson.dumps(self._generateMaterialList(subCont)))
+
         if subCont.canModify( self.__aw ) and vars and modificons:
             out.writeTag("modifyLink",vars["subContribModifyURLGen"](subCont))

indico/MaKaC/webinterface/materialFactories.py

@@ -333 +333 @@
     and creates new one if needed. """
 
-    # inheritance from MaterialFactory is actually not needed
-
-    def __init__(self, name):
-        self.name = name
-    
+    def __init__(self, matId):
+        self.name = matId
+
     def get( self, owner ):
         """returns the material"""
 
         for mat in owner.getMaterialList():
-            if mat.getTitle() == self.name:
+            if mat.getTitle().lower() == self.name.lower():
                 return mat
-
-        return None
-
-    def getTitle(self):
-        return self.name
-
-    def getId(self):
-        return self.id
 
     def remove( self, owner ):
@@ -358 +348 @@
 
     def canAdd( self, target ):
-        #only one slide can be added to a contribution
         return True
 
     def canDelete( self, target ):
-        #only a slide which is already set in a contribution can be deleted
         return len(target.getMaterialList) > 0
 
     def getModificationURL( self, mat ):
-        """returns the URL for accessing to the modification view of the 
-            material"""
-        return urlHandlers.UHMaterialModification.getURL( mat )
-
-    def create( self, target ):
+        """returns the URL for accessing to the modification view of the
+            material"""
+        return urlHandlers.UHMaterialModification.getURL( mat )
+
+    def create(self, target):
         m = conference.Material()
-        m.setTitle(self.name)
+        m.setTitle(self.name.title())
         target.addMaterial( m )
         return m
+
 
     @classmethod
@@ -380 +369 @@
         return cls(name)
 
+
 class MaterialFactoryRegistry:
-    """Keeps a list of material factories. When a new material type wants to be 
+    """Keeps a list of material factories. When a new material type wants to be
         added one just needs to implement the corresponding factory and add the
         entry in the "_registry" attribute of this class
     """
-    _registry = {} 
+    _registry = {}
 
     @classmethod
-    def getById( cls, id ):
-        return cls._registry.get(id.lower().strip(), DefaultMaterialFactory.getInstance(id))
+    def getById( cls, matId ):
+        return cls._registry.get(matId, DefaultMaterialFactory.getInstance(matId))
 
     @classmethod
     def getList( cls ):
         return cls._registry.values()
+
+    @classmethod
+    def getIdList( cls ):
+        return cls._registry.keys()
 
     @classmethod

indico/MaKaC/webinterface/rh/conferenceBase.py

@@ -207 +207 @@
     _allowedMatsCategory = [ "paper", "slides", "poster", "minutes", "agenda", "video", "pictures", "text", "more information", "document", "list of actions", "drawings", "proceedings", "live broadcast" ]
 
+    _allowedMatsEvent = {
+        'simple_event': [ "paper", "slides", "poster", "minutes", "agenda", "pictures", "text", "more information", "document", "list of actions", "drawings", "proceedings", "live broadcast", "video", "streaming video", "downloadable video" ],
+        'meeting': [ "paper", "slides", "poster", "minutes", "agenda", "video", "pictures", "text", "more information", "document", "list of actions", "drawings", "proceedings", "live broadcast" ],
+        'conference' : ["paper", "slides", "poster", "minutes"]
+        }
+
     def __init__(self, target, rh = None):
         self._target=target
@@ -247 +253 @@
         self._userList = json.decode(params.get("userList", ""))
 
-
         if self._uploadType == "file":
             if type(params["file"]) != str and params["file"].filename.strip() != "":
@@ -253 +258 @@
                 fDict["filePath"]=self._saveFileToTemp(params["file"].file)
 
-                # TODO: Check this!
                 if self._callerRH != None:
                     self._callerRH._tempFilesToDelete.append(fDict["filePath"])
@@ -286 +290 @@
 
     def _getMaterial(self):
-
-        """ Returns the Material object to which the ressource is being submitted
         """
-
-        mf = self._target.getMaterialRegistry().getById(self._materialId)
-
-        material = mf.get(self._target)
-        if material is None:
-            material = mf.create(self._target)
-
-        return material
+        Returns the Material object to which the resource is being added
+        """
+
+        material = None
+        registry = self._target.getMaterialRegistry()
+
+        if isinstance(self._target, Category):
+            namedMats = RHSubmitMaterialBase._allowedMatsCategory
+        else:
+            namedMats = RHSubmitMaterialBase._allowedMatsEvent[self._target.getConference().getType()]
+
+        material = self._target.getMaterialById(self._materialId)
+
+        if material:
+            return material, False
+        # there's a defined id (not new type)
+        elif self._materialId:
+            # get a material factory for it
+            mf = registry.getById(self._materialId)
+            # get a material from the material factory
+            material = mf.get(self._target)
+
+            # if the factory returns an empty material (doesn't exist)
+            if material == None:
+                # create one
+                material = mf.create(self._target)
+                newlyCreated = True
+            else:
+                newlyCreated = False
+
+            return material, newlyCreated
+        else:
+            # else, something has gone wrong
+            raise Exception("""A material ID must be specified.""")
+
+    def _addMaterialType(self, text, user):
+
+        from MaKaC.common.PickleJar import DictPickler
+
+        Logger.get('requestHandler').debug('Adding %s - request %s ' % (self._uploadType, id(self._callerRH._req)))
+
+        mat, newlyCreated = self._getMaterial()
+
+        # if the material still doesn't exist, create it
+        if newlyCreated:
+            protectedAtResourceLevel = False
+        else:
+            protectedAtResourceLevel = True
+
+        if self._uploadType in ['file','link']:
+            if self._uploadType == "file":
+
+                resource = LocalFile()
+                resource.setFileName(self._file["fileName"])
+                resource.setName(resource.getFileName())
+                resource.setFilePath(self._file["filePath"])
+                resource.setDescription(self._description)
+
+                if not type(self._target) is Category:
+                    self._target.getConference().getLogHandler().logAction({"subject":"Added file %s%s" % (self._file["fileName"],text)},"Files",user)
+                # in case of db conflict we do not want to send the file to conversion again, nor re-store the file
+
+            elif self._uploadType == "link":
+
+                resource = Link()
+                resource.setURL(self._link["url"])
+                resource.setName(resource.getURL())
+                resource.setDescription(self._description)
+
+                if not type(self._target) is Category:
+                    self._target.getConference().getLogHandler().logAction({"subject":"Added link %s%s" % (resource.getURL(),text)},"Files",user)
+
+            status = "OK"
+            info = resource
+        else:
+            status = "ERROR"
+            info = "Unknown upload type"
+            return mat, status, info
+
+        mat.addResource(resource, forcedFileId=self._repositoryId)
+
+        #apply conversion
+        if self._topdf and fileConverter.CDSConvFileConverter.hasAvailableConversionsFor(os.path.splitext(resource.getFileName())[1].strip().lower()):
+            Logger.get('conv').debug('Queueing %s for conversion' % resource.getFilePath())
+
+            fileConverter.CDSConvFileConverter.convert(resource.getFilePath(), "pdf", mat)
+
+        self._topdf = False
+
+        # store the repo id, for files
+        if isinstance(resource, LocalFile):
+            self._repositoryId = resource.getRepositoryId()
+
+        if protectedAtResourceLevel:
+            protectedObject = resource
+        else:
+            protectedObject = mat
+            mat.setHidden(self._visibility)
+            mat.setAccessKey(self._password)
+
+        protectedObject.setProtection(self._statusSelection)
+
+        from MaKaC.user import AvatarHolder, GroupHolder
+
+        for userElement in self._userList:
+            if 'isGroup' in userElement and userElement['isGroup']:
+                avatar = GroupHolder().getById(userElement['id'])
+            else:
+                avatar = AvatarHolder().getById(userElement['id'])
+            protectedObject.grantAccess(avatar)
+
+        return mat, status, DictPickler.pickle(info)
 
     def _process(self, rh, params):
 
         # We will need to pickle the data back into JSON
-        from MaKaC.common.PickleJar import DictPickler
 
         errorList=[]
@@ -325 +430 @@
 
         errorList=self._getErrorList()
-        fDict = self._file
-        link = self._link
         resource = None
 
-        Logger.get('requestHandler').debug('Adding %s - request %s ' % (self._uploadType, id(self._callerRH._req)))
-        if self._uploadType == "file":
-            if len(errorList)==0:
-                mat = self._getMaterial()
-
-                if mat == None:
-                    errorList.append("Unknown material");
-                else:
-                    mat.setProtection(self._statusSelection)
-                    mat.setHidden(self._visibility)
-                    mat.setAccessKey(self._password)
-                    from MaKaC.user import AvatarHolder
-                    ah = AvatarHolder()
-                    for userElement in self._userList:
-                        userAvatar = ah.getById(userElement['id'])
-                        mat.grantAccess(userAvatar)
-
-                    resource = LocalFile()
-                    resource.setFileName(fDict["fileName"])
-                    resource.setName(resource.getFileName())
-                    resource.setFilePath(fDict["filePath"])
-                    resource.setDescription(self._description)
-                    mat.addResource(resource, forcedFileId=self._repositoryId)
-
-                    #apply conversion
-                    if self._topdf and fileConverter.CDSConvFileConverter.hasAvailableConversionsFor(os.path.splitext(resource.getFileName())[1].strip().lower()):
-                        fileConverter.CDSConvFileConverter.convert(resource.getFilePath(), "pdf", mat)
-                    if not type(self._target) is Category:
-                        self._target.getConference().getLogHandler().logAction({"subject":"Added file %s%s" % (fDict["fileName"],text)},"Files",user)
-                    # in case of db conflict we do not want to send the file to conversion again, nor re-store the file
-                    self._topdf = False
-                    self._repositoryId = resource.getRepositoryId()
-
-            if len(errorList) > 0:
-                status = "ERROR"
-                info = errorList
-            else:
-                status = "OK"
-                info = DictPickler.pickle(resource)
+        if len(errorList) > 0:
+            status = "ERROR"
+            info = errorList
+        else:
+            mat, status, info = self._addMaterialType(text, user)
+
+            if status == "OK":
                 info['material'] = mat.getId();
-
-        elif self._uploadType == "link":
-            if len(errorList)==0:
-                mat = self._getMaterial()
-                if mat == None:
-                    mat = Material()
-                    mat.setTitle(link["matType"])
-                    self._target.addMaterial( mat )
-                else:
-                    mat.setProtection(self._statusSelection)
-                    mat.setHidden(self._visibility)
-                    mat.setAccessKey(self._password)
-                    from MaKaC.user import AvatarHolder
-                    ah = AvatarHolder()
-                    for userElement in self._userList:
-                        userAvatar = ah.getById(userElement['id'])
-                        mat.grantAccess(userAvatar)
-
-                resource = Link()
-                resource.setURL(link["url"])
-                resource.setName(resource.getURL())
-                resource.setDescription(self._description)
-                mat.addResource(resource)
-                if not type(self._target) is Category:
-                    self._target.getConference().getLogHandler().logAction({"subject":"Added link %s%s" % (resource.getURL(),text)},"Files",user)
-
-                status = "OK"
-                info = DictPickler.pickle(resource)
-                info['material'] = mat.getId();
-            else:
-                status = "ERROR"
-                info = errorList
-
-        else:
-            status = "ERROR"
-            info = "Unknown upload type"
 
         # hackish, because of mime types. Konqueror, for instance, would assume text if there were no tags,

indico/MaKaC/webinterface/stylesheets/include/common.xsl

@@ -128 +128 @@
                 '<xsl:value-of select="$contId"/>',
                 '<xsl:value-of select="$subContId"/>',
-                Indico.Data.MaterialTypes.meeting,
+                <xsl:value-of select="$item/parentProtection"/>,
+                <xsl:value-of select="$item/materialList"/>,
                 <xsl:value-of select="$uploadURL"/>,
                 true,

indico/MaKaC/webinterface/tpls/AdminPlugins.tpl

@@ -101 +101 @@
 
 <script type="text/javascript">
-var tabControl = new TabWidget([
+var tabList = [
     <%= ",\n".join(['["' + plugin.getName() + '" , $E("' + plugin.getName() + 'OptionsDiv")]' for plugin in pluginList])%>
-], null, null, <%= InitialPlugin %>);
+]
+var tabControl = new TabWidget(tabList, null, null, tabList[<%= InitialPlugin %>][0]);
 $E('pluginTabs').set(tabControl.draw());
 

indico/MaKaC/webinterface/tpls/ShowExistingMaterial.tpl

@@ -79 +79 @@
 <% end %>
 
-var matList = Indico.Data.MaterialTypes[targetType];
-var customMatList = $L();
+var matList = <%= DictPickler.pickle(materialList) %>
 
-each(<%= jsonEncode(DictPickler.pickle(self._target.getMaterialList())) %>, function(material){
-    if (!contains(matList, material.title)){
-        customMatList.append(material.title);
-    }
-    });
-
-var mlist = new MaterialListWidget(args, matList, customMatList, uploadAction);
+var mlist = new MaterialListWidget(args, matList, uploadAction);
 
 $E('materialListPlace').set(mlist.draw());

indico/MaKaC/webinterface/tpls/js/vars.js.tpl

@@ -119 +119 @@
 
     Data: {
-        MaterialTypes: { meeting : <%= RHSubmitMaterialBase._allowedMatsForMeetings %>,
-        simple_event: <%= RHSubmitMaterialBase._allowedMatsForSE %>,
-        conference: <%= RHSubmitMaterialBase._allowedMatsConference %>,
-        category: <%= RHSubmitMaterialBase._allowedMatsCategory %>},
+        MaterialTypes: { meeting : <%= simplejson.dumps(list((k,k.title()) for k in RHSubmitMaterialBase._allowedMatsForMeetings)) %>,
+        simple_event: <%= simplejson.dumps(list((k,k.title()) for k in RHSubmitMaterialBase._allowedMatsForSE)) %>,
+        conference: <%= simplejson.dumps(list((k,k.title()) for k in RHSubmitMaterialBase._allowedMatsConference)) %>,
+        category: <%= simplejson.dumps(list((k,k.title()) for k in RHSubmitMaterialBase._allowedMatsCategory)) %>},
         WeekDays: <%= [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" ] %>,
         DefaultLocation: '<%= str(Location.getDefaultLocation().friendlyName) %>',

indico/MaKaC/webinterface/wcomponents.py

@@ -42 +42 @@
 from MaKaC.common import Config
 from MaKaC.webinterface.common.person_titles import TitlesRegistry
-from MaKaC.conference import Conference
+from MaKaC.conference import Conference, Category
 
 from MaKaC.webinterface.common.timezones import TimezoneRegistry, DisplayTimezoneRegistry
@@ -5541 +5541 @@
         self._target=target
 
+        from MaKaC.webinterface.rh.conferenceBase import RHSubmitMaterialBase
+        if isinstance(target, Category):
+            self._allowedMats = RHSubmitMaterialBase._allowedMatsCategory
+        else:
+            self._allowedMats = RHSubmitMaterialBase._allowedMatsEvent[self._target.getConference().getType()]
+
+    # TODO: Put this out of here, and unify with outputGenerator._generateMaterialList
+    # (when we have a better class hierarchy)
+    def _generateMaterialList(self):
+        """
+        Generates a list containing all the materials, with the
+        corresponding Ids for those that already exist
+        """
+
+        matDict = dict((title.lower(), title) for title in self._allowedMats)
+
+        for material in self._target.getMaterialList():
+            title = material.getTitle().lower()
+            matDict[title] = material.getId()
+
+        return sorted(list((matId, title.title()) for title, matId in matDict.iteritems()))
 
     def getVars(self):
         vars=WTemplated.getVars(self)
+
+        vars["materialList"] = self._generateMaterialList()
 
         vars["materialModifHandler"] = vars.get("materialModifHandler", None)

indico/htdocs/css/Default.css

@@ -4504 +4504 @@
     height: 15px;
 }
+div.exclusivePopup .buttonBar {
+    text-align: center;
+    background: #F8F8F8;
+    border: 0px;
+    -moz-border-radius-bottomleft: 10px;
+    -webkit-border-bottom-left-radius:10px;
+    -moz-border-radius-bottomright: 10px;
+    -webkit-border-bottom-right-radius:10px;
+    behavior: url(border-radius.htc);
+    border-top: 1px solid #CCC;
+    min-height: 40px;
+    padding-top: 10px;
+}
+
 
 div.balloonPopup {
@@ -4521 +4535 @@
     background-repeat: no-repeat;
     background-position: 0 -19px;
-}
+    opacity: 0.95;
+}
+
+div.yellowBalloon {
+    color: #000;
+    border: 1px solid black;
+    background-color: #ffed92;
+    opacity: 0.95;
+}
+
+div.yellowArrow {
+    background: transparent url('../images/balloon_popup_arrows_yellow.png') scroll no-repeat 0 -19px;
+}
+
 
 div.balloonPopupCloseButton {
@@ -5162 +5189 @@
 }
 
+ul.nobulletsListWrapping
+{
+    position: relative;
+    margin:0px;
+    margin-top: 10px;
+    padding-left: 0px;
+    color: #777;
+}
+
+ul.nobulletsListWrapping li
+{
+    margin-top: 5px;
+    overflow: visible;
+    list-style-type: none;
+}
+
 div.FavoritePeopleListDiv {
     margin-bottom: 10px;
@@ -5686 +5729 @@
     border-right: 1px dotted #999;
 }
+
+label.normal {
+    font-weight: normal;
+}
+
+label.emphasis {
+    font-weight: normal;
+    font-style: italic;
+}
+
+.smallGrey {
+    margin-top: 2px;
+    font-size: 9px;
+    color: #777;
+}
+
+tr.selectedItem td {
+    color: #000;
+}

indico/htdocs/js/indico/Core/Data.js

@@ -186 +186 @@
         // check if the emails given are valid and if valid separators are used
         return exists(emails.toLowerCase().match(/^(?:[ ,;]*)(?:[a-z0-9!#$%&\'*+\/=?\^_`{|}~\-]+(?:\.[a-z0-9!#$%&\'*+\/=?\^_`{|}~\-]+)*@(?:[a-z0-9](?:[a-z0-9\-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9\-]*[a-z0-9])?)(?:[ ,;]+(?:[a-z0-9!#$%&\'*+\/=?\^_`{|}~\-]+(?:\.[a-z0-9!#$%&\'*+\/=?\^_`{|}~\-]+)*@(?:[a-z0-9](?:[a-z0-9\-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9\-]*[a-z0-9])?))*(?:[ ,;]*)$/));
+    },
+    isURL: function(address) {
+        // thanks to Jan Goyvaerts
+        return exists(address.match(/^http\:\/\/(.+)$/));
+    }
+
+
+};
+
+Protection = {
+
+    ParentRestrictionMessages: {
+        '1': $T("(currently restricted to some users, but can change)"),
+        '-1': $T("(currently open to everyone, but can change)") },
+
+    resolveProtection: function(resourceProtection, parentProtection) {
+        if (resourceProtection === 0) {
+            return parentProtection;
+        } else {
+            return resourceProtection;
+        }
     }
 };

indico/htdocs/js/indico/Core/Dialogs/Popup.js

@@ -281 +281 @@
 );
 
+/* ExclusivePopup with a grey bar where buttons can be put */
+type("ButtonBarExclusivePopup", ["ExclusivePopup"],
+     {
+         draw: function(content, style) {
+
+             var menu = Html.div("buttonBar", this._drawButtons());
+
+             var canvas = this.ExclusivePopup.prototype.draw.call(this, content, style);
+             this.container.append(menu);
+
+             return canvas;
+         }
+     },
+     function(title, closeButtonHandler, printable, showPrintButton) {
+         this.ExclusivePopup(title, closeButtonHandler, printable, showPrintButton);
+     });
+
 type("BalloonPopup", ["PopupDialog"], {
     draw: function(x, y) {
@@ -286 +303 @@
 
         this.closeButton = Html.div({className: 'balloonPopupCloseButton'});
-        this.balloonContent = Html.div({className: 'balloonPopup'}, this.closeButton, this.content);
-        this.arrowDiv = Html.div({className: 'balloonPopupArrow', style: {width: this.arrowWidth, height: this.arrowHeight}});
+        this.balloonContent = Html.div({className: this.balloonClass}, this.hasCloseButton ? this.closeButton : '', this.content);
+        this.arrowDiv = Html.div({className: this.arrowClass, style: {width: this.arrowWidth, height: this.arrowHeight}});
         this.mainDiv = Html.div({}, this.balloonContent, this.arrowDiv);
 
@@ -299 +316 @@
 
         this.arrowDiv.dom.style.left = pixels(0);
-        this.closeButton.observeClick(function() {self.close();});
+
+        if (this.hasCloseButton) {
+            this.closeButton.observeClick(function() {self.close();});
+        }
 
         return toReturn;
@@ -387 +407 @@
     }
     },
-     function(content, triggerElement, closeHandler, nonCloseElements) {
+     function(content, triggerElement, closeHandler, nonCloseElements, balloonClass, arrowClass) {
          this.PopupDialog(content, triggerElement, closeHandler, nonCloseElements);
+
+         this.hasCloseButton = exists(closeHandler);
+
+         this.balloonClass = balloonClass || 'balloonPopup';
+         this.arrowClass = arrowClass || 'balloonPopupArrow';
 
          // Constants
@@ -396 +421 @@
      }
 );
+
+/**
+ * Utility function to display a simple notification popup.
+ * @param {XElement} pointElement The element that triggers the event (onClick on it will be ignored)
+ * @param {XElement} content Anything you want to put inside.
+ */
+type("NotificationBalloonPopup", ["BalloonPopup"],
+     {
+     },
+     function(pointElement, content) {
+         this.pointElement = pointElement;
+
+         var canvas = Html.div({style:
+                                {padding: '5px'}}, content);
+
+         this.BalloonPopup(canvas,
+                           pointElement,
+                           null,
+                           null,
+                           'balloonPopup yellowBalloon',
+                           'balloonPopupArrow yellowArrow');
+     });
+
 
 /**

indico/htdocs/js/indico/Core/Widgets/Base.js

@@ -109 +109 @@
 );
 
-type("TabWidget", ["Chooser", "IWidget"],{
+type("TabWidget", ["IWidget"],{
     _titleTemplate: function(text) {
         return text;
     },
 
+    enableTab: function(index) {
+        this.tabs[index].dom.style.display = 'inline';
+    },
+
+    disableTab: function(index) {
+        this.tabs[index].dom.style.display = 'none';
+    },
+
     enable: function() {
         this.disableOverlay.dom.style.display = 'none';
@@ -120 +128 @@
     disable: function() {
         this.disableOverlay.dom.style.display = 'block';
+    },
+
+    _drawContent: function() {
+
+        var self = this;
+
+        try {
+
+            each(this.optionDict,
+                 function(value, key) {
+                     if (key == self.selected.get()) {
+                         value.dom.style.display = 'block';
+                     } else {
+                         value.dom.style.display = 'none';
+                     }
+                 });
+
+        } catch(e) {
+            if (e == "stopDrawing") {
+                // Otherwise stop drawing
+            }
+        }
     },
 
@@ -210 +240 @@
         // this piece of code is sensitive to exceptions
         // coming from the drawing functions (for LookupTabWidget)
-        try {
-            if(dataRetrievalFunc) {
-                dataRetrievalFunc.call(this);
-            }
-
-            // if everything goes OK, replace the canvas
-            this.canvas.set(Widget.block(this));
-
-        } catch(e) {
-            if (e == "stopDrawing") {
-                // Otherwise stop drawing
-            }
-        }
+        if(dataRetrievalFunc) {
+            dataRetrievalFunc.call(this);
+        } else {
+            each(this.optionDict,
+                 function(value, key) {
+                     self.canvas.append(value);
+                 });
+        }
+
+        this._drawContent();
 
         var wrapperStyle = this.width?{width: pixels(this.width)}:{};
@@ -424 +451 @@
 
          if (!exists(initialSelection)) {
-             initialSelection = 0;
+             initialSelection = options[0][0];
          }
 
@@ -435 +462 @@
 
              self.options.append(key);
-             if (value.getParent()) {
-                 value.getParent().dom.removeChild(value.dom);
-                 value.setStyle('display','');
-             }
          });
 
-         this.selected = new WatchValue(this.options.item(initialSelection));
+         this.optionDict = {};
+         each(options, function(item) {
+             self.optionDict[item[0]] = item[1];
+         });
+
+         this.selected = new WatchValue();
 
          this.selected.observe(function(value) {
-             self.set(value);
+             self._drawContent();
          });
 
-         var optionDict = {};
-         each(options, function(item) {
-             optionDict[item[0]] = item[1];
-         });
-
-         this.Chooser(optionDict);
-         this.set(this.selected.get());
+         this.selected.set(initialSelection);
 
          this.initializeDisableOverlay();
@@ -461 +483 @@
 type("LookupTabWidget", ["TabWidget"],
      {
+         _drawContent: function() {
+             var self = this;
+
+             try {
+                 this.canvas.set(this.optionDict[self.selected.get()]());
+
+             } catch(e) {
+                 if (e == "stopDrawing") {
+                     // Otherwise stop drawing
+                 }
+             }
+         },
+
          draw: function() {
              return this.TabWidget.prototype.draw.call(
                  this,
                  function() {
-                     this.set(this.selected.get());
+                     this.canvas.set(Html.div({}));
                  });
          }
      },
+
      function(options, width, height, initialSelection, extraButtons, canvas) {
-
-         var self = this;
-         this.width = width;
-         this.height = height;
-         this.tabs = [];
-         this.leftTabIndex = 0;
-         this.rightTabIndex = 0;
-         this.scrollArrows = {};
-         this.scrollArrowStates = {};
-         this.extraButtons = any(extraButtons, []);
-         this.canvas = canvas || Html.div('canvas');
-
-         this.initializeDisableOverlay();
-
-         if (!exists(initialSelection)) {
-             initialSelection = 0;
-         }
-         this.options = $L(translate(options,
-                                     function(value) {
-                                         return value[0];
-                                     }));
-
-         this.selected = new WatchValue(this.options.item(initialSelection));
-
-         this.selected.observe(function(value) {
-             self.set(value);
-         });
-
-         var optionDict = {};
-         each(options, function(item) {
-             optionDict[item[0]] = item[1];
-         });
-
-         this.Chooser(new Lookup(optionDict));
-
+         this.TabWidget(options, width, height, initialSelection, extraButtons, canvas);
      }
+
     );
 
@@ -742 +745 @@
     }
     },
-    function() {
-        this.canvas = Html.div();
+    function(styleData) {
+        this.canvas = Html.div({style: styleData}||{});
     }
 );

indico/htdocs/js/indico/Core/Widgets/Inline.js

@@ -150 +150 @@
 
 
-type("RadioFieldWidget", ["InlineWidget"],
+type("RadioFieldWidget", ["InlineWidget", "WatchAccessor"],
      {
          draw: function() {
              var self = this;
 
-             return $B(Html.ul(this.cssClassRadios),
-                       this.orderedItems,
-                       function(item) {
-                           var radio = self.radioDict[item.key];
-                           radio.observeClick(function() {
-                               self.select(item.key);
-                           });
-                           self.options.accessor(item.key).observe(
-                               function(value) {
-                                   radio.set(value);
-                               });
-
-                           var itemContent = item.get();
-
-                           if (itemContent.IWidget) {
-                               itemContent = itemContent.draw();
-                           }
-
-                           // create li item, add visibility info too
-                           var liItem = Html.li(self.visibility.get(item.key)?{}:'disabledRadio', keys(self.radioDict).length > 1?radio:'', itemContent);
-                           radio.dom.disabled = !self.visibility.get(item.key);
-
-
-                           // observe future changes in visibility
-                           self.visibility.accessor(item.key).observe(
-                               function(value) {
-                                   if (!value) {
-                                       liItem.dom.className = 'disabledRadio';
-                                       radio.dom.disabled = true;
-                                   } else {
-                                       liItem.dom.className = 'enabledRadio';
-                                       radio.dom.disabled = false;
-                                   }
-                                   if (!value && radio.get()) {
-                                       self.selectLast();
-                                   }
-                               });
-
-
-                           return liItem;
-                       });
+             return $B(
+                 Html.table(
+                     this.cssClassRadios,
+                     Html.tbody({})
+                 ),
+                 this.orderedItems,
+                 function(item) {
+                     var radio = self.radioDict[item.key];
+                     radio.observeClick(function() {
+                         self.select(item.key);
+                     });
+                     self.options.accessor(item.key).observe(
+                         function(value) {
+                             radio.set(value);
+                             if (value) {
+                                 liItem.dom.className = 'selectedItem';
+                             } else {
+                                 liItem.dom.className = '';
+                             }
+                         });
+
+                     var itemContent = item.get();
+
+                     if (itemContent.IWidget) {
+                         itemContent = itemContent.draw();
+                     } else {
+                         itemContent = Html.span({style:{verticalAlign: 'middle'}}, itemContent);
+                     }
+
+                     // create li item, add visibility info too
+                     var liItem = Html.tr(
+                         self.visibility.get(item.key) ? {} : 'disabledRadio',
+                         keys(self.radioDict).length > 1 ? Html.td({}, radio):'',
+                         Html.td( {}, itemContent ));
+                     radio.dom.disabled = !self.visibility.get(item.key);
+
+                     if (self.options.get(item.key)) {
+                         liItem.dom.className = 'selectedItem';
+                     }
+
+
+                     // observe future changes in visibility
+                     self.visibility.accessor(item.key).observe(
+                         function(value) {
+                             if (!value) {
+                                 liItem.dom.className = 'disabledRadio';
+                                 radio.dom.disabled = true;
+                             } else {
+                                 liItem.dom.className = 'enabledRadio';
+                                 radio.dom.disabled = false;
+                             }
+                             if (!value && radio.get()) {
+                                 self.selectLast();
+                             }
+                         });
+
+
+                     return liItem;
+                 });
          },
 
@@ -203 +221 @@
 
          onSelect: function(state) {
+         },
+
+         set: function(state) {
+             this.select(state);
+         },
+
+         get: function() {
+             var selKey = null;
+
+             each(this.options, function(value, key){
+                 if (value) {
+                     selKey = key;
+                 }
+             });
+
+             return selKey;
+         },
+
+         enable: function() {
+             each(this.radioDict,
+                  function(value, key) {
+                      value.dom.disabled = false;
+                  });
+         },
+
+         disable: function() {
+             each(this.radioDict,
+                  function(value, key) {
+                      value.dom.disabled = true;
+                  });
+         },
+
+         observe: function(callback) {
+             this.options.observe(function(value, key){
+                 if (value) {
+                     callback(key);
+                 }
+             });
          },
 
@@ -220 +276 @@
              // set every other option to false
              self.options.each(function(value, key) {
+
                  if (value) {
                      self.options.set(key, false);
@@ -231 +288 @@
 
              });
+
              self.options.set(state, true);
 
@@ -260 +318 @@
      },
 
-     function(items, order, cssClassRadios) {
-         this.items = items;
+     function(items, cssClassRadios) {
+         this.items = {};
          this.radioDict = {};
          this.options = new WatchObject();
@@ -272 +330 @@
          var name = Html.generateId();
 
-         // consider ordering of elements, if specified
-         if (order) {
-             this.orderedItems = $L();
-             each(order,
-                  function(key) {
-                      self.orderedItems.append(new WatchPair(key, items[key]));
-
-                      // add some extra stuff, since we're in the loop
-                      self.visibility.set(key, true);
-                      self.options.set(key, false);
-                      self.radioDict[key] = Html.radio({'name': name});
-                  });
-
-         } else {
-             this.orderedItems = $L(items);
-         }
+         this.orderedItems = $L();
+         each(items,
+              function(item) {
+                  var key = item[0];
+                  self.items[key] = item[1];
+                  self.orderedItems.append(new WatchPair(key, item[1]));
+
+                  // add some extra stuff, since we're in the loop
+                  self.visibility.set(key, true);
+                  self.options.set(key, false);
+                  self.radioDict[key] = Html.radio({'name': name,
+                                                    style: {verticalAlign: 'middle'}});
+              });
 
          this.state = new Chooser(map(items,
@@ -956 +1011 @@
                 return Html.div({}, bind.element(self.select, $L(self.types),
                                           function(value) {
-                                              return Html.option({'value': value}, value);
+                                              return Html.option({'value': value[0]}, value[1]);
                                           }),
                          " ",
@@ -963 +1018 @@
                          Widget.link(command(function() {
                              chooser.set('write');
+                             self.text.dom.focus();
                          }, $T("other"))));
             },
@@ -977 +1033 @@
                                 Widget.link(command(function() {
                                     chooser.set('select');
+                                    self.select.dom.focus();
                                 }, $T("select from list"))));
             }
@@ -988 +1045 @@
         var self = this;
         return self.selected;
+    },
+
+    set: function(value) {
+        if(this.selected){
+            this.select.set(value);
+        } else {
+            this.text.set(value);
+        }
+
+        each(this.observers,
+             function(observer) {
+                 observer(value);
+             });
     },
 
@@ -1000 +1070 @@
     },
 
+    observe: function(callback) {
+        var self = this;
+        this.observers.push(callback);
+
+        this.select.observe(
+            function(value) {
+                if (self.selected) {
+                    callback(value);
+                }
+            });
+
+        this.text.observe(
+            function(value) {
+                if (!self.selected) {
+                    callback(value);
+                }
+            });
+
+    },
+
     getSelectBox: function() {
         return this.select;
     }
 },
-function(parameterManager, types){
-    //var self = this;
-    this.select = Html.select({name: 'materialId', id:Html.generateId()});
-    this.text = Html.edit({name: 'materialId', id:Html.generateId()});
-    this.pm = parameterManager;
-    this.types = types;
-}
-);
+     function(parameterManager, types, params){
+         params = params || {};
+
+         this.select = Html.select(params);
+         params.id = Html.generateId();
+         this.text = Html.edit(params);
+
+         this.selected = true;
+         this.pm = parameterManager;
+         this.types = types;
+
+         this.observers = [];
+     }
+    );
 
 type("InlineEditWidget", ["InlineRemoteWidget"],

indico/htdocs/js/indico/Legacy/Dialogs.js

@@ -121 +121 @@
                            $B(info.accessor('conveners'), convListWidget.getUsers());
 
-                           var sesType = new RadioFieldWidget({'standard':$T('Standard'),'poster':$T('Poster')},['standard','poster'],'nobulletsListInline');
+                           var sesType = new RadioFieldWidget([['standard', $T('Standard')],['poster',$T('Poster')]],'nobulletsListInline');
+                           $B(info.accessor('sessionType'), sesType);
+
                            sesType.select('standard');
-                           $B(info.accessor('sessionType'), sesType.state);
 
                            //Create the list of the days in which the conference is being held

indico/htdocs/js/indico/Legacy/Util.js

@@ -491 +491 @@
                     error = Html.span({}, "List contains invalid e-mail address or invalid separator");
                 }
+                else if (dataType == 'url' && !(allowEmpty && trim(component.get()) === '') && !Util.Validation.isURL(component.get())) {
+                    error = Html.span({}, "Invalid URL");
+                }
                 else if (dataType == 'ip' && !(allowEmpty && trim(component.get()) === '') &&  !Util.Validation.isIPAddress(component.get())) {
                     error = Html.span({}, "That doesn't seem like a valid IP Address. Example of valid IP Address: 132.156.31.38");
@@ -505 +508 @@
                     hasErrors = true;
 
-                    var oList = [];
+                    var oList;
 
                     if (component.dom.type != 'radio') {

indico/htdocs/js/indico/MaterialEditor/Editor.js

@@ -1 @@
-
-type("AddMaterialDialog", ["ExclusivePopup"], {
-    _preload: [
-               function(hook){
-                   var self = this;
-                   var users = indicoSource('material.listAllowedUsers', self.args);
-
-                   users.state.observe(function(state) {
-                       if (state == SourceState.Loaded) {
-                           self.allowedUsers = users.get();
-                           hook.set(true);
-                       }
-                   });
-               }
-           ],
+type("AddMaterialDialog", ["ButtonBarExclusivePopup"], {
+
+    _drawButtons: function() {
+
+        var self = this;
+
+        var buttonDiv = Html.div({},
+            Widget.button(command(function() {
+                self._upload();
+            }, "Create Resource")));
+
+        return buttonDiv;
+    },
 
     _iFrameLoaded : function(iframeId) {
@@ -44 +42 @@
     },
 
-    _makeProtectionRequest: function(value){
-        var self = this;
-
-        self.args['matId'] = value;
-        var protection = indicoSource('material.getProtection', self.args);
-
-        protection.state.observe(function(state) {
-                    self.protectionLabel.set('statusSelection', protection);
-        })
-    },
-
-    _drawFileUpload: function() {
-        var self = this;
-
-        var pm = new IndicoUtil.parameterManager();
-
-        var uploadType = Html.input('hidden', {name: 'uploadType'});
-        var convert = Html.checkbox({}, true);
-        var selectorFile = new TypeSelector(pm, self.types);
-        var selectorF = selectorFile.draw();
+    /*
+     * Draws a pane that switches between a URL input and a file upload dialog.
+     *
+     * pm - A parameter manager
+     * locationSelector - the locationSelector that will 'control' the pane
+     */
+    _drawResourcePathPane: function(locationSelector) {
+
         var file = Html.input('file', {name: 'file'});
-        var description = Html.textarea({name: 'description'});
-        var statusSelection = Html.input('hidden', {name: 'statusSelection'});
-        var visibility = Html.input('hidden', {name: 'visibility'});
-        var password = Html.input('hidden', {name: 'password'});
-        var userList = Html.input('hidden', {name: 'userList'});
-
-        uploadType.set('file');
-
-        // FIX: presentation issue
-        convert.dom.name = 'topdf';
-
-        //pm.add(selectorF, 'text', false);
-        pm.add(file, 'text', false);
-        pm.add(description, 'text', true);
-
-        //make request and save it
-        this._makeProtectionRequest(self.args.materialIdsList.get(selectorFile.getSelectBox().get()));
-
-        selectorFile.getSelectBox().observe(function(value){
-            //make request and save it
-            self._makeProtectionRequest(self.args.materialIdsList.get(value));
-        }
-        )
+        var url = Html.edit({name: 'url'});
+        var toPDFCheckbox = Html.checkbox({name: 'topdf', style: {verticalAlign: 'middle'}}, true);
+
+        var self = this;
+
+        var resourcePathPane = new Chooser(
+            new Lookup({
+                'local':  function() {
+                    self.pm.remove(url);
+                    return Html.div({},
+                                    self.pm.add(file, 'text'),
+                                    Html.div({style:{marginTop: '5px'}},
+                                             toPDFCheckbox,
+                                             Html.label({style: {verticalAlign: 'middle'}, className: 'emphasis'}
+                                                        , $T("Convert to PDF (when applicable)")))
+                                   );
+                },
+                'remote': function() {
+                    self.pm.remove(file);
+                    url.set('http://');
+                    url.dom.focus();
+                    return Html.div({},
+                                    Html.label('popUpLabel', $T("URL")),
+                                    self.pm.add(url, 'url'),
+                                    Html.div("smallGrey", "Example: http://www.example.com/YourPDFFile.pdf"));
+                }
+            }));
+
+        // whenever the user selects a different location,
+        // change between an http link field and an upload box.
+        // This could be done simply with:
+        // $B(resourcePathPane, locationSelector);
+        // but we need to change the focus too, so let's use an observer
+
+        locationSelector.observe(function(value) {
+            // switch to the appropriate panel
+            resourcePathPane.set(value);
+
+            // set the focus
+            if (value == 'local') {
+                file.dom.focus();
+            } else {
+                url.dom.focus();
+            }
+        });
+
+        // change the upload type that will be sent in the request
+        // (bind it with the selection box)
+        $B(this.uploadType,
+           locationSelector,
+           {
+               toSource: function(value) {
+                   // unused;
+               },
+               toTarget: function(value) {
+                   return value=='local'?'file':'link';
+               }
+           });
+
+        // default is 'local' (local file)
+        locationSelector.set('local');
+
+        return resourcePathPane;
+
+    },
+
+    _parentText: function(args) {
+        var text = null;
+
+        if (args.subContId) {
+            text = $T("Same people as parent Subcontribution");
+        } else if (args.contribId) {
+            text = $T("Same people as parent Contribution");
+        } else if (args.sessionId) {
+            text = $T("Same people as parent Session");
+        } else if (args.confId) {
+            text = $T("Same people as parent Conference");
+        } else if (args.categId) {
+            text = $T("Same people as parent Category");
+        }
+
+        text = Html.span({}, text, " ",
+                         Html.span({style: {fontStyle: 'italic'}}," ",
+                                   Protection.ParentRestrictionMessages[args.parentProtected?1:-1]));
+
+        return text;
+    },
+
+    _drawProtectionPane: function(value) {
+
+        var text = null;
+        var entry = this.list.get(value);
+        var selector = null;
+
+        // if the material is already in the tree, protection inheritance must
+        // be resolved
+        if (exists(entry)) {
+
+            this.creationMode = 'resource';
+
+            text = Html.span({}, $T("You're adding a resource to the existing material type"), " ", Html.span({style:{fontWeight: 'bold'}}, entry.get('title')), ". ", $T("Please specify who will be able to access it."));
+
+            // if the material is set to inherit from the parent, display it properly
+            // and set the inherited protection accordingly
+            var protection = Protection.resolveProtection(
+                entry.get('protection'),
+                entry.get('protectedOwner')?1:-1);
+
+            var inheritanceText = Html.span({style: {fontStyle: 'italic'}},
+                                            Protection.ParentRestrictionMessages[protection]);
+
+
+            selector = new RadioFieldWidget([
+                ['inherit', Html.span({}, $T("Same people as the parent material type ")+"\""+entry.get('title')+"\" ", inheritanceText)],
+                ['private', $T("Only me and the users I specify")],
+                ['public', $T("Everyone")]
+            ], 'nobulletsListWrapping');
+
+
+        } else {
+
+            this.creationMode = 'material';
+
+            text = $T("You're about to create a new material type. Please select who can access it.");
+
+            selector = new RadioFieldWidget([
+                ['inherit', this._parentText(this.args)],
+                ['private', $T("Only me and the users I specify")],
+                ['public', $T("Everyone")]
+            ], 'nobulletsListWrapping');
+        }
+
+        this.protectionSelector = selector;
+
+        var self = this;
+
+        this.protectionSelector.observe(function(state) {
+
+            self.userList.userList.clear();
+            self.visibility.set(0);
+            self.password.set('');
+
+            // if 'private' is chosen or 'inherit' was chosen
+            // and the parent resource is protected
+            if (state == 'private') {
+                self.tabWidget.enableTab(1);
+
+                // depending on whether we're creating a new
+                // material or just a result, we will enable/disable
+                // visibility and access key
+                if (self.creationMode == 'material') {
+                    self.visibility.enable();
+                    self.password.enable();
+                } else {
+                    self.visibility.disable();
+                    self.password.disable();
+                }
+
+                // draw a little notification saying that
+                // the added tab can be used
+                self.notification  = new NotificationBalloonPopup(
+                    selector.radioDict[state],
+                    Html.div({style:{width: '120px'}}, $T("You can specify users using this tab")));
+
+                var pos = self.tabWidget.tabs[1].getAbsolutePosition();
+
+                // open it, pointing to tab
+                self.notification.open(pos.x + self.tabWidget.tabs[1].dom.offsetWidth/2, pos.y);
+
+            } else {
+                self.tabWidget.disableTab(1);
+            }
+
+            // set the appropriate data structure behind the scenes
+            self.protectionStatus.set('statusSelection',
+                                      {'private': 1,
+                                       'inherit': 0,
+                                       'public': -1}[state]);
+        });
+
+        // set protection default to 'inherit'
+        if (this.tabWidget) {
+            this.protectionSelector.set('inherit');
+        }
+
+        return Html.div({style:{marginTop: '10px',
+                                height: '150px'
+                               }},
+                        Html.div({style: {textAlign: 'center', fontStyle: 'italic', color: '#881122'}},
+                                 $T(text)),
+                        Html.div({style: {marginTop: '10px'}},
+                                 selector ? selector.draw() : ''));
+    },
+
+    _drawUpload: function() {
+
+        var self = this;
+
+        this.pm = new IndicoUtil.parameterManager();
+        var typeSelector = new TypeSelector(this.pm, this.types, {style:{width: '150px'}});
+        var description = Html.textarea({name: 'description', style:{width:'220px', height: '60px'}});
+
+        // local file vs. url
+        var locationSelector = new RadioFieldWidget([['local',$T('Local file')],['remote',$T('External resource (hyperlink)')]]);
+
+        // draw the resource pane
+        var resourcePathPane = this._drawResourcePathPane(locationSelector);
+        // protection page
+        var protectionPane = $B(
+            Html.div({}),
+            typeSelector,
+            function(value) {
+                return self._drawProtectionPane(value);
+            });
+
+        // make typeSelector available to the object
+        this.typeSelector = typeSelector;
 
         return Html.div({},
                         IndicoUtil.createFormFromMap(
                             [
-                                [$T('Type'), selectorF],
-                                [$T('File'), file],
-                                [$T('Description'), description],
-                                [$T('Convert to PDF'), convert]
+                                [
+                                    $T('Location'),
+                                    Html.div({},
+                                             locationSelector.draw(),
+                                             Html.div({style:{paddingTop: '15px',
+                                                              paddingBottom: '10px',
+                                                              minHeight: '50px'}},
+                                                      Widget.block(resourcePathPane)))
+                                ],
+                                [
+                                    $T('Description'),
+                                    description
+                                ],
+                                [
+                                    $T('Material type'),
+                                    typeSelector.draw()
+                                ]
+
                             ]),
-                        uploadType,
-                        statusSelection,
-                        visibility,
-                        password,
-                        userList,
-                        Html.div({style: {'textAlign': 'center'}},
-                                 Widget.button(command(
-                                     function() {
-                                         if (pm.check()) {
-                                             self.killProgress = IndicoUI.Dialogs.Util.progress($T('Uploading...'));
-                                             self.uploading = true;
-
-                                             userList.set(Json.write(self.userList.getUsers()));
-                                             statusSelection.set(self.protectionLabel.get('statusSelection').get());
-                                             visibility.set(self.protectionLabel.get('visibility'));
-                                             password.set(self.protectionLabel.get('password'));
-                                             self.form.dom.submit();
-
-                                             //if we are adding a custom type and it's not in the list already, then we add it
-                                             if(!selectorFile.isSelect() && !contains(self.types, selectorFile.get())){
-                                                 self.customTypes.append(selectorFile.get());
-                                             }
-                                         }
-                                     }, $T("Upload")))));
-    },
-
-    _drawLinkUpload: function() {
-        var self = this;
-
-        var pm = new IndicoUtil.parameterManager();
-
-        var uploadType = Html.input('hidden', {name: 'uploadType'});
-        var selectorLink = new TypeSelector(pm, self.types);
-        var selectorL = selectorLink.draw();
-        var url = Html.edit({name: 'url'});
-        var description = Html.textarea({name: 'description'});
-        var statusSelection = Html.input('hidden', {name: 'statusSelection'});
-        var visibility = Html.input('hidden', {name: 'visibility'});
-        var password = Html.input('hidden', {name: 'password'});
-        var userList = Html.input('hidden', {name: 'userList'});
-
-        uploadType.set('link');
-
-        //pm.add(selectorL, 'text', false);
-        pm.add(url, 'text', false);
-        pm.add(description, 'text', true);
-
-        //make request and save it
-        this._makeProtectionRequest(self.args.materialIdsList.get(selectorLink.getSelectBox().get()));
-
-        selectorLink.getSelectBox().observe(function(value){
-            //make request and save it
-            self._makeProtectionRequest(self.args.materialIdsList.get(value));
-        }
-        )
-
-        return Html.div({},
-                        IndicoUtil.createFormFromMap(
-                            [
-                                [$T('Type'),selectorL],
-                                [$T('URL'), url],
-                                [$T('Description'), description]
-                            ]),
-                        uploadType,
-                        statusSelection,
-                        visibility,
-                        password,
-                        userList,
-                        Html.div({style: {'textAlign': 'center'}},
-                                 Widget.button(command(
-                                     function() {
-                                         if (pm.check()) {
-                                             self.killProgress = IndicoUI.Dialogs.Util.progress();
-                                             self.uploading = true;
-
-                                             userList.set(Json.write(self.userList.getUsers()));
-                                             statusSelection.set(self.protectionLabel.get('statusSelection').get());
-                                             visibility.set(self.protectionLabel.get('visibility'));
-                                             password.set(self.protectionLabel.get('password'));
-                                             self.form.dom.submit();
-
-                                             //if we are adding a custom type and it's not in the list already, then we add it
-                                             if(!selectorLink.isSelect() && !contains(self.types, selectorLink.get())){
-                                                 self.customTypes.append(selectorLink.get());
-                                             }
-                                         }
-                                     }, $T("Upload")))));
-    },
+                        protectionPane);
+
+   },
+
+    _upload: function() {
+
+        var check = this.pm.check();
+
+        if (check) {
+            this.killProgress = IndicoUI.Dialogs.Util.progress();
+
+            this.uploading = true;
+
+            this.formDict.userList.set(Json.write(this.userList.getUsers()));
+
+            this.formDict.statusSelection.set(this.protectionStatus.get('statusSelection'));
+
+            this.formDict.visibility.set(this.protectionStatus.get('visibility'));
+            this.formDict.password.set(this.protectionStatus.get('password'));
+            this.formDict.uploadType.set(this.uploadType.get());
+
+            // depending on whether we are selecting a material from the list
+            // or adding a new one, we'll send either an id or a name
+
+            this.formDict.materialId.set(this.typeSelector.get());
+
+            this.form.dom.submit();
+
+        }
+    },
+
 
     _drawWidget: function() {
         var self = this;
 
+        this.formDict = {};
         this.frameId = Html.generateId();
 
@@ -203 +341 @@
             this.tabWidget.draw());
 
+        each(['statusSelection', 'visibility', 'password', 'userList', 'uploadType', 'materialId'],
+             function(fieldName) {
+                 var elem = Html.input('hidden', {name: fieldName});
+                 self.formDict[fieldName] = elem;
+                 self.form.append(elem);
+             });
+
         var loadFunc = function() {
             if (self.uploading) {
@@ -213 +358 @@
 
         if (Browser.IE) {
-            // cof! cof!
             iframe.dom.onreadystatechange = loadFunc;
         } else {
@@ -224 +368 @@
         });
 
-        return Html.div({}, this.form, iframe);
-
-    },
-
-    draw: function() {
-        var self = this;
-
-        self.newMaterial = $O();
-
-        var visibility = Html.select(
-                {},
-                Html.option({value: 0},$T('Visible for unauth. users')),
-                Html.option({value: 1},$T('Hidden from unauth. users'))
-            );
-
-        var password = Html.input('password',{});
-
-        self.userList =  new UserListField('ShortPeopleListDiv',
+        return Html.div({},
+                        this.form,
+                        iframe);
+
+    },
+
+    postDraw: function() {
+
+        var selection = "slides";
+
+        // We're not sure that the type "Slides"
+        // will have a "standard" id
+        for (i in this.types) {
+            if (this.types[i][1] == "Slides") {
+                selection = this.types[i][0];
+            }
+        }
+
+        this.typeSelector.set(selection);
+        this.ButtonBarExclusivePopup.prototype.postDraw.call(this);
+    },
+
+    _drawProtectionDiv: function() {
+        this.visibility = new RadioFieldWidget([
+            [0, Html.span({}, $T("This resource is visible to everyone"))],
+            [1, $T("Only people who can access the resource can see it")]]);
+
+        this.password = Html.input('password',{});
+
+        this.userList =  new UserListField('ShortPeopleListDiv',
                 'PluginPeopleList',
-                self.allowedUsers,
+                this.allowedUsers,
                 null,
                 null,
@@ -249 +405 @@
                 userListNothing, userListNothing, userListNothing, true);
 
-        self.privateInfoDiv = Html.div(
-                {style:{padding:pixels(2)}},
-                Html.div({},
-                         Html.label({}, $T('Allowed users')),
-                         self.userList.draw()),
-                Html.div({style:{marginTop: pixels(8)}},
-                         Html.label({}, $T('Visibility: ')),
-                         visibility),
-                Html.div({style:{marginTop: pixels(5)}},
-                         Html.label({}, $T('Access Key: ')),
-                         password)
-            );
-
-        var statusSelection = Widget.select(
-                $L({
-                    0:(self.args.parentProtected?$T('Private'):$T('Public'))+' '+$T('(from parent)'),
-                    1:$T('Private (by itself)'),
-                    '-1':$T('Public (by itself)')
-                })
-            );
-
-        self.protectionLabel.accessor("statusSelection").observe(function(value) {
-                if (value.get() == 0 && self.args.parentProtected || value.get() == 1) {
-                    self.privateInfoDiv.show();
-                }
-                else {
-                    self.privateInfoDiv.hide();
-                }
-        });
-
-        $B(statusSelection, self.protectionLabel.accessor("statusSelection"));
-        $B(self.protectionLabel.accessor("visibility"), visibility);
-        $B(self.protectionLabel.accessor("password"), password);
-
-
-        if ( !self.args.parentProtected)
-            self.privateInfoDiv.hide();
-
-        var protectionDiv = Html.div(
-                {style: {marginTop: pixels(5)}},
-                Html.div({},
-                         Html.label({},$T("Status: ")),
-                         statusSelection
-                        ),
-                self.privateInfoDiv);
-
-        this.tabWidget = new TabWidget([[$T('Upload File'), this._drawFileUpload()],
-                                        [$T('Add Link'), this._drawLinkUpload()],
-                                        [$T("Protection")   , protectionDiv]],
+        // Bind fields to data structure
+        $B(this.protectionStatus.accessor('visibility'), this.visibility);
+        $B(this.protectionStatus.accessor('password'), this.password);
+
+        this.visibility.set(0);
+        this.password.set('');
+
+        var privateInfoDiv = IndicoUtil.createFormFromMap(
+                            [
+                                [
+                                    $T('Allowed users and groups'),
+                                    this.userList.draw()
+                                ],
+                                [
+                                    $T('Visibility'),
+                                    this.visibility.draw()
+                                ],
+                                [
+                                    $T('Access key'),
+                                    this.password
+                                ]
+                            ]);
+
+        return privateInfoDiv;
+    },
+
+    draw: function() {
+        var self = this;
+
+        self.newMaterial = $O();
+
+        var protectionDiv = this._drawProtectionDiv();
+
+        this.tabWidget = new TabWidget([[$T('Upload'), this._drawUpload()],
+                                        [$T("Protection"), protectionDiv]],
                                        400, 300);
 
-        return this.ExclusivePopup.prototype.draw.call(this,
+        return this.ButtonBarExclusivePopup.prototype.draw.call(this,
                                                        this._drawWidget());
-    },
-
-
-}, function(args, list, types, customTypes, uploadAction, onUpload) {
+    }
+
+
+}, function(args, list, types, uploadAction, onUpload) {
+
     var self = this;
     this.list = list;
-    this.customTypes = customTypes;
-    this.types = $L(concat(types, customTypes.allItems()));
+    this.types = types;
     this.uploadAction = uploadAction;
     this.uploading = false;
@@ -317 +459 @@
 //    this.args.materialId = material;
 
-    this.protectionLabel = $O();
-
-    this.ExclusivePopup($T("Upload Material"),
+    this.protectionStatus = $O();
+    this.uploadType = new WatchValue();
+
+    this.ButtonBarExclusivePopup($T("Upload Material"),
                         function() {
                             self.close();
@@ -345 +488 @@
         params.materialInfo = this.newMaterial;
         this.newMaterial.set('userList', this.userList.getUsers());
+
+        // get a list of material titles
+        var matTitles = translate(this.list,
+            function(mat){
+                return mat.get('title');
+            });
+
+        // look for one with the same name
+        var i = -1;
+        for (var j in matTitles) {
+            if (matTitles[i] == params.materialInfo.get('title')) {
+                i = j;
+            }
+        }
+
+        if (i < 0) {
+            this.types.push([params.materialInfo.get('id'), params.materialInfo.get('title')]);
+        }
+
         this.request(params);
-
-        if(this.customTypes.indexOf(this.material.title.get()) != null){
-            //it was in the custom types list, so we just change its name
-            this.customTypes.remove(this.material.title.get());
-            this.customTypes.append(params.materialInfo.get('title'));
-        }
-        else{
-            //it was a predefined material, so we add the new one
-            this.customTypes.append(params.materialInfo.get('title'));
-        }
     },
 
@@ -377 +529 @@
 
         statusSelection.observe(function(value) {
-            if (value === 0 && self.material.get('protectedOwner') ||
+            if (value == 0 && self.material.get('protectedOwner') ||
                 value == 1) {
                 self.privateInfoDiv.show();
@@ -414 +566 @@
                         self.newMaterial.accessor('accessKey')))
         );
-        if ( !self.material.get('protectedOwner'))
+        if ( !self.material.get('protectedOwner')) {
             self.privateInfoDiv.hide();
+        }
 
         var protectionDiv = Html.div(
@@ -430 +583 @@
         var description = Html.textarea({name:'description',style: {width: '250px'}});
         var descDiv = Widget.block([Widget.block(Html.label({},"Description: ")),description]);
+
         var buttonDiv = Widget.block([
             Widget.button(command(function() {
@@ -442 +596 @@
         $B(description, self.newMaterial.accessor('description'));
 
+        statusSelection.notifyObservers();
+
         var tabControl = new TabWidget([
             [$T("Information"), Widget.block([titleDiv,descDiv])],
-            [$T("Protection") , protectionDiv]], 300,300, 0);
+            [$T("Protection") , protectionDiv]], 300,300);
 
         return this.ExclusivePopup.prototype.draw.call(
@@ -454 +610 @@
 },
 
-     function(args, material, list, customTypes, title) {
+     function(args, types, material, list, title) {
          this.material = material;
          this.materialId = this.material.get('id');
+         this.types = types;
          this.list = list;
-         this.customTypes = customTypes;
 
          args = clone(args);
@@ -553 +709 @@
             );
 
-            statusSelection.observe(function(value) {
-                if (value == 0 && isFatherProtected || value == 1) {
-                    self.privateInfoDiv.show();
-                }
-                else {
-                    self.privateInfoDiv.hide();
-                }
-            });
+        statusSelection.observe(function(value) {
+
+            if (value == 0 && isFatherProtected || value == 1) {
+                self.privateInfoDiv.show();
+            }
+            else {
+                self.privateInfoDiv.hide();
+            }
+        });
 
         self.privateInfoDiv = Html.div(
@@ -567 +724 @@
                      Html.label({}, $T('Allowed users')),
                      self.userList.draw()));
-        if ( !isFatherProtected)
+
+        if ( !isFatherProtected) {
             self.privateInfoDiv.hide();
-
+        }
 
         var protectionDiv = Html.div(
@@ -580 +738 @@
         var tabControl = new TabWidget([
             [$T("Information"), Widget.block([nameDiv,this.resource.type=='stored'?[]:urlDiv,descDiv])],
-            [$T("Protection")   , protectionDiv]], 300,200, 0);
+            [$T("Protection")   , protectionDiv]], 300,200);
         tabControl.options = $L([$T("Information"), $T("Protection")]);
         tabControl.selected.set($T("Information"));
+
+        statusSelection.notifyObservers();
+
 
         return this.ExclusivePopup.prototype.draw.call(
@@ -686 +847 @@
                                 self.set(resourceId, null);
                                 //if it's in the custom material list and it's the last resource in it, we delete it
-                                self.customTypes.remove(self.materialName);
                                 killProgress();
                             }
@@ -763 +923 @@
     }
 
-}, function(resources, matParams, customTypes, materialTitle) {
+}, function(resources, matParams, materialTitle) {
     this.matParams = matParams;
     this.resources = resources;
-    this.customTypes = customTypes;
     this.materialName = materialTitle;
     this.ListWidget();
@@ -819 +978 @@
                                 self.set(materialId, null);
                                 //if it's in the custom material list, we delete it
-                                self.customTypes.remove(material.get('title'));
                                 killProgress();
                             }
@@ -846 +1004 @@
                         IndicoUI.Dialogs.Material.editMaterial(
                             self.args,
+                            self.types,
                             material,
-                            self.customTypes,
                             self);
                     },
@@ -870 +1028 @@
         }
 
-        args['materialProtection'] = material.get('protection');
-        var matWidget = new ResourceListWidget(material.get('resources'), args, self.customTypes, material.get('title'));
+        args.materialProtection = material.get('protection');
+        var matWidget = new ResourceListWidget(material.get('resources'), args, material.get('title'));
 
         // check whenever a material gets empty (no resources) and delete it
@@ -937 +1095 @@
     },
 
+    _updateMaterialList: function(material) {
+        // add type to custom list, if not there
+        var i = -1;
+
+        for (var j in this.types) {
+            if (this.types[i][1] == material.get('title')) {
+                i = j;
+                break;
+            }
+        }
+
+        var newElement = [material.get('id'), material.get('title')];
+
+        if (i >= 0) {
+            this.types[i] = newElement;
+        } else {
+            this.types.push(newElement);
+        }
+    },
+
     _loadMaterial: function(id) {
         var self = this;
@@ -946 +1124 @@
 
         source.state.observe(function(state) {
+
             if (state == SourceState.Loaded) {
                 var material = $O($O(source).getAll());
@@ -954 +1133 @@
                          material);
 
+                self._updateMaterialList(material);
 
             }
@@ -968 +1148 @@
         });
 
+        var materialLoadFunction = function(info) {
+            if (self.get(info.material)) {
+                self.get(info.material).get('resources').append(watchize(info));
+            } else {
+                self._loadMaterial(info.material);
+            }
+        };
+
         var link = Widget.link(command(function(){
 
@@ -973 +1161 @@
                                           self,
                                           self.types,
-                                          self.customTypes,
                                           self.uploadAction,
-                                          function(info) {
-                                              if (self.get(info.material)) {
-                                                  self.get(info.material).get('resources').append(watchize(info));
-                                              } else {
-                                                  self._loadMaterial(info.material);
-                                              }
-                                          });
+                                          materialLoadFunction);
         }, $T("Add Material")));
         return Html.div(
@@ -992 +1173 @@
 },
 
-     function(args, types, customTypes, uploadAction, width, height) {
+     function(args, types, uploadAction, width, height) {
          var self = this;
          this.width = width;
@@ -998 +1179 @@
          this.args = args;
          this.types = types;
-         this.customTypes = customTypes;
          this.uploadAction = uploadAction;
          this.ListWidget("materialList");
@@ -1007 +1187 @@
 );
 
-type("MaterialEditorDialog", ["ExclusivePopup"], {
+type("MaterialEditorDialog", ["ButtonBarExclusivePopup"], {
+
+    _drawButtons: function() {
+
+        var self = this;
+        var buttonDiv = Html.div({},
+            Widget.button(command(function() {
+                self.close();
+                window.location.reload(true);
+            }, $T("Close"))));
+
+        return buttonDiv;
+    },
+
+
     draw: function() {
         var self = this;
@@ -1017 +1211 @@
             'sessionId': intToStr(this.sessId),
             'contribId': intToStr(this.contId),
-            'subContId': intToStr(this.subContId)
+            'subContId': intToStr(this.subContId),
+            'parentProtected': this.parentProtected
         };
 
@@ -1027 +1222 @@
         });
 
-        var mlist = new MaterialListWidget(args, this.types, this.customTypes, this.uploadAction, this.width, this.height);
-
-        return this.ExclusivePopup.prototype.draw.call(
+        var mlist = new MaterialListWidget(args, this.types, this.uploadAction, this.width, this.height);
+
+        return this.ButtonBarExclusivePopup.prototype.draw.call(
             this,
             Html.div({style: {width: pixels(this.width),
                               height: pixels(this.height+50)}},
-                     mlist.draw(),
-                     Widget.button(command(function() {
-                         self.close();
-                         window.location.reload(true);
-                     }, $T("Close")))));
+                     mlist.draw()));
     }
 },
 
-     function(confId, sessId, contId, subContId, types, uploadAction, title, width, height, refresh, customTypes) {
+     function(confId, sessId, contId, subContId, parentProtected, types, uploadAction, title, width, height, refresh) {
          this.confId = confId;
          this.sessId = sessId;
@@ -1047 +1238 @@
          this.subContId = subContId;
          this.types = types;
-         this.customTypes = customTypes;
          this.uploadAction = uploadAction;
          this.width = width;
          this.height = height;
          this.refresh = refresh;
-         this.ExclusivePopup(title);
+         this.parentProtected = parentProtected;
+         this.ButtonBarExclusivePopup(title);
      });
 
 IndicoUI.Dialogs.Material = {
 
-    add: function(args, list, types, customTypes, uploadAction, onUpload) {
-        var dialog = new AddMaterialDialog(args, list, types, customTypes, uploadAction, onUpload);
+    add: function(args, list, types, uploadAction, onUpload) {
+        var dialog = new AddMaterialDialog(args, list, types, uploadAction, onUpload);
         dialog.open();
     },
-    editMaterial: function(args, material, customTypes, list) {
-        var dialog = new EditMaterialDialog(args, material, list, customTypes, $T("Edit Material"));
+    editMaterial: function(args, types, material, list) {
+        var dialog = new EditMaterialDialog(args, types, material, list, $T("Edit Material"));
         dialog.execute();
     },
@@ -1071 +1262 @@
     },
 
-    editor: function(confId, sessId, contId, subContId, types, uploadAction, refresh, customTypes) {
-        var dialog = new MaterialEditorDialog(confId, sessId, contId, subContId, types, uploadAction, $T("Edit Materials"), 400, 300, refresh, customTypes);
+    editor: function(confId, sessId, contId, subContId, parentProtected, types, uploadAction, refresh) {
+        var dialog = new MaterialEditorDialog(confId, sessId, contId, subContId, parentProtected, types, uploadAction, $T("Edit Materials"), 400, 300, refresh);
         dialog.open();
     }

indico/htdocs/js/indico/Timetable/Base.js

@@ -300 +300 @@
 
     _followArgs_interval: function(hash, data) {
+
         var m = hash.match(/#(\d{8})(?:\.(s\d+l\d+))?/);
 
         if (m) {
-
-            this.currentDay = m[1];
 
             if (m[2]) {
@@ -319 +318 @@
         var m = hash.match(/#(\d{8}|all)(?:\.(s\d+l\d+))?/);
 
-        if (m) {
-
-            this.currentDay = m[1];
-
-            var tab = 0;
-
-            for (k in this.sortedKeys) {
-                if (this.sortedKeys[k] == this.currentDay) {
-                    return tab;
-                }
-                tab++;
-            }
-            return -1;
-        }
+        var currentDay = m ? m[1] : null;
+
+        return exists(data[currentDay]) ? currentDay : null;
     },
 
@@ -364 +352 @@
     switchToTopLevel : function() {
         this.enable();
-        this.set(this.currentDay);
-        this.canvas.set(Widget.block(this));
+        this.setSelectedTab(this.currentDay);
+        this._drawContent();
         this.menu.dom.style.display = 'block';
         this.timetableDrawer.redraw();
@@ -396 +384 @@
          var todayStr = IndicoUtil.formatDate2(today);
 
+         var originalHash = window.location.hash;
+
          // parse "command line" arguments
-         var initialTab = this._followArgs_day(window.location.hash, data);
+         var initialTab = this._followArgs_day(originalHash, data);
 
          // if nothing is found
-         if (initialTab == -1) {
+         if (initialTab === null) {
              // look for today
-             while (exists(data[todayStr])) {
-                 today.setDate(today.getDate()-1);
-                 todayStr = IndicoUtil.formatDate2(today);
-                 initialTab++;
+             if (exists(data[todayStr])) {
+                 initialTab = todayStr;
+             } else {
+                 // otherwise use the default
+                 initialTab = keys(data)[0];
              }
          }
 
-         // if today not found, set initial tab to the first one
-         if (initialTab == -1) {
-             initialTab = 0;
-         }
+         this.currentDay = initialTab;
 
          this.LookupTabWidget( translate(this.sortedKeys, function(key) {
+
              return [key, function() {
                  self.currentDay = key;
@@ -437 +426 @@
          }), this.width, 100, initialTab, this._functionButtons(), this.canvas);
 
-         this._followArgs_interval(window.location.hash, data);
+         this._followArgs_interval(originalHash, data);
 
      });
@@ -715 +704 @@
 
     _retrieveHistoryState: function(hash) {
-        this._followArgs_day(hash, this.data);
-        this.setSelectedTab(this.currentDay);
+        var currentDay = this._followArgs_day(hash, this.data);
+        this.setSelectedTab(currentDay);
     }
 
@@ -861 +850 @@
 
     _retrieveHistoryState: function(hash) {
-        this._followArgs_day(hash, this.data);
+        var currentDay = this._followArgs_day(hash, this.data) || keys(this.data)[0];
         if (!this._followArgs_interval(hash, this.data)) {
             this.switchToTopLevel();
-            this.setSelectedTab(this.currentDay);
+            this.setSelectedTab(currentDay);
         }
     }