Changeset 9b6bab in indico


Ignore:
Timestamp:
03/02/11 14:03:38 (2 years ago)
Author:
Jose Benito <jose.benito.gonzalez@…>
Branches:
master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1
Children:
b7b536
Parents:
665616
git-author:
Alexis Castilla Hernandez <alexis.castilla.hernandez@…> (02/24/11 10:00:13)
git-committer:
Jose Benito <jose.benito.gonzalez@…> (03/02/11 14:03:38)
Message:

[IMP] Improvements after meeting

  • Fixed bug in send paper button
  • Included some links
  • Changed some texts
  • Adapted Abstract Reviewing Team page to IE7
  • Minor improvements in assign papers page
  • Removed UNDO Sending button
  • Included steps in contribution display to upload and submit material
Location:
indico
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • indico/MaKaC/review.py

    r6ed0cd r9b6bab  
    13341334        for trl in self._trackReallocations.values() : 
    13351335            for newtrack in conference.getTrackList(): 
    1336                 if newTrack.getTitle() == trl.getTrack().getTitle() : 
     1336                if newtrack.getTitle() == trl.getTrack().getTitle() : 
    13371337                    newtrl = trl.clone(newtrack) 
    13381338                    abs._addTrackReallocation(newtrl) 
    … …  
    20232023        jud.setComment( comment ) 
    20242024        self._addTrackAcceptance( jud ) 
     2025        # Update the rating of the abstract 
     2026        self.updateRating() 
    20252027        #We trigger the state transition 
    20262028        self.getCurrentStatus().proposeToAccept() 
    … …  
    20422044        jud.setComment( comment ) 
    20432045        self._addTrackRejection( jud ) 
     2046        # Update the rating of the abstract 
     2047        self.updateRating() 
    20442048        #We trigger the state transition 
    20452049        self.getCurrentStatus().proposeToReject() 
    … …  
    23252329    # Rating methods 
    23262330    def getRating(self): 
    2327         '''Get the average rating of the abstract which is calculated with the average of each judgement ''' 
     2331        ''' Get the average rating of the abstract ''' 
     2332        return self._rating 
     2333 
     2334    def updateRating(self): 
     2335        '''Update the average rating of the abstract which is calculated with the average of each judgement ''' 
    23282336        self._rating = None 
    23292337        # calculate the total valoration 
    … …  
    23382346        if judNum != 0: 
    23392347            self._rating = "%.2f" % (ratingSum/judNum) 
    2340         return self._rating 
    23412348 
    23422349    def getQuestionsAverage(self): 
    … …  
    24852492            if ans.getQuestion().getId() == questionId: 
    24862493                self._answers.remove(ans) 
     2494                self._notifyModification() 
     2495 
     2496    def _notifyModification(self): 
     2497        self._p_changed = 1 
    24872498 
    24882499 

  • indico/MaKaC/services/implementation/material.py

    rb41a57 r9b6bab  
    219219 
    220220        rev = self._target.getReviewing() 
    221         if (rev != None): 
     221        if (rev != None and len(rev._Material__resources) != 0): 
    222222            matList[rev.getId()] = rev.fossilize(IMaterialFossil) 
    223223 

  • indico/MaKaC/webinterface/displayMgr.py

    r53b88f r9b6bab  
    880880                "parent": "paperreviewing"}, \ 
    881881            "assigncontributions": { \ 
    882                 "caption": _("Assign contributions"), \ 
     882                "caption": _("Assign papers"), \ 
    883883                "URL": str(str(urlHandlers.UHConfModifReviewingAssignContributionsList.getURL(conf))), \ 
    884884                "staticURL": "", \ 

  • indico/MaKaC/webinterface/pages/abstractReviewing.py

    r7caa81 r9b6bab  
    7979            trackIdsList.append(track.getId()) 
    8080            coordinatorsByTrack[track.getId()] = track.getCoordinatorList() 
    81         vars["conf"] = self._conf.getId() 
     81        vars["conf"] = self._conf 
    8282        vars["trackIds"] = trackIdsList 
    8383        vars["coordinatorsByTrack"] = coordinatorsByTrack 

  • indico/MaKaC/webinterface/pages/contributionReviewing.py

    r6e9e95 r9b6bab  
    120120 
    121121    def _getTabContent( self, pars ): 
    122         wc=wcomponents.WShowExistingReviewingMaterial(self._target, False, False) 
     122        showSendButton = False 
     123        wc=wcomponents.WShowExistingReviewingMaterial(self._target, False, showSendButton) 
    123124        return wc.getHTML( pars ) 
    124125 

  • indico/MaKaC/webinterface/pages/reviewing.py

    r53b88f r9b6bab  
    6363 
    6464        if self._showAssignContributions: 
    65             self._tabAssignContributions = self._tabCtrl.newTab( "assignContributions", "Assign Contributions",\ 
     65            self._tabAssignContributions = self._tabCtrl.newTab( "assignContributions", "Assign papers",\ 
    6666                    urlHandlers.UHConfModifReviewingAssignContributionsList.getURL( self._conf ) ) 
    6767 
    … …  
    344344                                                params["removeReviewerURL"]) 
    345345 
    346             return """<table width="100%%" class="Revtab"><tr><td>%s%s</td></tr></table>"""%(rcPRM, rc) 
     346            return """<table width="100%%" class="Revtab"><tr><td>%s</td></tr><tr><td>%s</td></tr></table>"""%(rcPRM, rc) 
    347347 
    348348 

  • indico/MaKaC/webinterface/tpls/AbstractReviewingSetup.tpl

    r53b88f r9b6bab  
    88    <tr> 
    99        <td class="subGroupTitle" colspan="3"><%= _("Add the questions that the abstract reviewers must answer")%> 
    10         <% inlineContextHelp(_('The questions you add here will be show to the reviewers when they propose to accept/reject an abstract.')) %></td> 
     10        <% inlineContextHelp(_('The questions you add here will be shown to the reviewers when they propose to accept/reject an abstract.')) %></td> 
    1111    </tr> 
    1212    <tr> 

  • indico/MaKaC/webinterface/tpls/AbstractReviewingTeam.tpl

    r7caa81 r9b6bab  
    11<% declareTemplate(newTemplateStyle=True) %> 
    22<% from MaKaC.common.fossilize import fossilize %> 
     3<% import MaKaC.webinterface.urlHandlers as urlHandlers %> 
    34<table width="90%" align="left" border="0" style="padding-top:10px;"> 
    45    <tr> 
    … …  
    1213                <% end %> 
    1314                <% else: %> 
    14                     <span class="collShowBookingsText"><%=_("There are no tracks created yet")%></span> 
     15                    <span class="collShowBookingsText"><%=_("There are no tracks created yet. Please go to the menu ")%><a href="<%= urlHandlers.UHConfModifProgram.getURL(conf) %>"><%= _("Programme")%></a><%=_(" to create tracks.")%></span> 
    1516                <% end %> 
    1617            </div> 
    … …  
    5051                'abstractReviewing.team.addReviewer', 
    5152                { 
    52                     conference: '<%= conf %>', 
     53                    conference: '<%= conf.getId() %>', 
    5354                    track: '<%= i %>', 
    5455                    user: user[0]['id'] 
    … …  
    6970                'abstractReviewing.team.removeReviewer', 
    7071                { 
    71                     conference: '<%= conf %>', 
     72                    conference: '<%= conf.getId() %>', 
    7273                    track: '<%= i %>', 
    7374                    user: user.get('id') 

  • indico/MaKaC/webinterface/tpls/Abstracts.tpl

    r4e858d0 r9b6bab  
    228228    <% if (totalNumberAbstracts == "0"): %> 
    229229    <tr> 
    230         <td style="padding:5px 0px 5px 10px;"><span class="collShowBookingsText"><%=_("There are no abstracts submitted yet")%></span></td> 
     230        <td style="padding:15px 0px 15px 15px;"><span class="collShowBookingsText"><%=_("There are no abstracts submitted yet")%></span></td> 
    231231    </tr> 
    232232    <% end %> 
    233233    <% elif (filteredNumberAbstracts == "0"): %> 
    234         <td style="padding:5px 0px 5px 10px;"><span class="collShowBookingsText"><%=_("There are no abstracts with the filters criteria selected")%></span></td> 
     234        <td style="padding:15px 0px 15px 15px;"><span class="collShowBookingsText"><%=_("There are no abstracts with the filters criteria selected")%></span></td> 
    235235    <% end %> 
    236236    <% else: %> 

  • indico/MaKaC/webinterface/tpls/AbstractsReviewingNotifTpl.tpl

    rbf90e6 r9b6bab  
    77    <tr> 
    88        <td style="padding-top:5px; padding-left:5px;"> 
    9             <span class="collShowBookingsText"><%= _("Add the templates for the emails which will be sent to the primary authors or submitters.")%></em> 
     9            <span class="collShowBookingsText"><%= _("Add the templates for the emails which will be sent to the primary authors or submitters when their abstracts change the status to Accepted, Rejected or Merged.")%></em> 
    1010        </td> 
    1111    </tr> 

  • indico/MaKaC/webinterface/tpls/ConfModAbstractBook.tpl

    r9ac2af7 r9b6bab  
    1 <table width="90%" align="left" border="0"> 
     1<table width="90%" align="left" border="0" style="padding-top:15px;"> 
    22    <tr> 
    33        <td class="dataCaptionTD"><span class="dataCaptionFormat"> <%= _("Additional text")%></span></td> 

  • indico/MaKaC/webinterface/tpls/ConfModifUserCompetences.tpl

    r53b88f r9b6bab  
    1111    <tr> 
    1212        <td nowrap class="groupTitle" colspan=5> 
    13             <%= _("Paper Reviewing Team competences")%> 
     13            <%= _("Team competences")%> 
    1414            <span id="competencesHelp"></span> 
    1515        </td> 
    … …  
    4747    <% end %> 
    4848    <tr><td colspan=5 style="padding-top: 15px;"> 
    49        <em><%= _("To assign contributions for paper reviewing, please click on ") %><a href="<%=urlHandlers.UHConfModifReviewingAssignContributionsList.getURL(ConfReview.getConference())%>"><%= _("Assign Contributions")%></a></em> 
     49       <em><%= _("Once this step is done you may want to assign papers to review. Please click on the next tab ") %><a href="<%=urlHandlers.UHConfModifReviewingAssignContributionsList.getURL(ConfReview.getConference())%>"><%= _("Assign Papers")%></a><%= _(" to continue the process.")%></em> 
    5050   </td></tr> 
    5151</table> 

  • indico/MaKaC/webinterface/tpls/ConfModificationReviewingFrame.tpl

    r53b88f r9b6bab  
    44 
    55<table width="90%" align="left" border="0"> 
     6    <tbody> 
    67    <tr> 
    78        <td id="revControlRefereeEditorReviewerHelp"  colspan="3" class="groupTitle"  style="padding-top: 10px;"> 
    … …  
    2829    </tr> 
    2930    <tr> 
     31    </tbody> 
    3032</table> 
    31  
    32 <table align="left" border="0" style="padding-left:20px;"> 
     33<tr><td> 
     34<table align="left" border="0" width="60%" style="padding-left:20px;"> 
     35<tbody> 
    3336<% if ConfReview.getChoice() == 3 or ConfReview.getChoice() == 1:%> 
    3437<% pass %> 
    … …  
    252255    <tr><td style="padding-top: 15px;"></td></tr> 
    253256    <tr><td colspan="5" style="padding-top: 15px;"> 
    254      <em><%= _("You can define paper reviewers competences by clicking on ") %><a href="<%=urlHandlers.UHConfModifUserCompetences.getURL(ConfReview.getConference())%>"><%= _("Competences")%></a></em> 
    255         </td> 
    256     </tr> 
     257     <em><%= _("Once this step is done you may want to assign competences for the members of the team. Please click on the next tab ") %><a href="<%=urlHandlers.UHConfModifUserCompetences.getURL(ConfReview.getConference())%>"><%= _("Competences")%></a><%= _(" to continue the process.")%></em> 
     258        </td> 
     259    </tr> 
     260    </tbody> 
    257261</table> 
     262</td></tr> 
    258263<% end %> 
    259264<br> 

  • indico/MaKaC/webinterface/tpls/ConfModificationReviewingFramePRM.tpl

    r7caa81 r9b6bab  
    33 
    44<table width="90%" align="left" border="0" style="padding-top:10px;"> 
     5    <tbody> 
    56    <tr> 
    67        <td id="revControlPRMHelp"  colspan="3" class="groupTitle"><%= _("Step 1 - Assign managers of paper reviewing")%></td> 
    … …  
    1617        </td> 
    1718    </tr> 
     19    </tbody> 
    1820</table> 
    19 <table style="padding-left:20px; width:570px;"> 
     21<tr><td> 
     22<table width="60%" style="padding-left:20px;"> 
     23    <tbody> 
    2024    <tr> 
    2125        <td class="subGroupTitle"><%= _("Managers") %></td> 
    … …  
    2933        <td width="80%" style="padding-top: 5px; padding-left:3px;"><div id="PRMList"></div></td> 
    3034    </tr> 
     35    </tbody> 
    3136</table> 
     37</td></tr> 
    3238<br> 
    3339 

  • indico/MaKaC/webinterface/tpls/ConfModificationReviewingSettings.tpl

    r53b88f r9b6bab  
    411411    <tr><td style="padding-bottom:15px;"></td></tr> 
    412412        <tr><td colspan="5" style="padding-top: 20px;"> 
    413             <em><%= _("To assign team for Paper Review Module, please click on ") %><a href="<%=urlHandlers.UHConfModifReviewingControl.getURL(ConfReview.getConference())%>"><%= _("Team")%></a><%= _(" and follow the steps")%></em> 
     413            <em><%= _("Once this step is done you may want to assign the team for paper reviewing. Please click on the next tab ") %><a href="<%=urlHandlers.UHConfModifReviewingControl.getURL(ConfReview.getConference())%>"><%= _("Team")%></a><%= _(" and follow the steps")%></em> 
    414414        </td></tr> 
    415415</table> 

  • indico/MaKaC/webinterface/tpls/ConfReviewingAssignContributions.tpl

    r665616 r9b6bab  
    1010<% else: %> 
    1111<% if len(Conference.getContributionListSortedById()) == 0: %> 
    12 <p style="padding-left: 25px;"><font color="gray"><%= _("There are no contributions to assign.")%></font></p> 
     12<p style="padding-left: 25px;"><font color="gray"><%= _("There are no papers to assign.")%></font></p> 
    1313<% end %> 
    1414<%else:%> 
    … …  
    2525        </td> 
    2626        <td align="bottom" style="padding-left:10px; padding-top:27px;"> 
    27            <div><%= _("Displaying  ")%><span id="contributionsToShow" style="font-size:15px; font-weight: bold;"></span></div> 
     27           <div><%= _("Displaying  ")%><span id="contributionsToShow" style="font-size:15px; font-weight: bold;"></span> 
     28                <span id="contributionText"></span> 
     29           </div> 
    2830        </td> 
    2931        <td align="bottom" style="padding-top:27px;"> 
    … …  
    213215            <td colspan="8" style="border-bottom: 1px solid grey"></td> 
    214216        </tr> 
     217        <tr> 
     218            <td id="noFilteredContribution" colspan="8" style="padding:15px 0px 15px 15px; display:none;"> 
     219                <span><%= _("There are no papers with the selected filters criteria.")%></span> 
     220                <% if IsOnlyReferee: %> 
     221                    <span><%= _("It is also possible you do not have any assigned paper for the review yet.")%></span> 
     222                <% end %> 
     223            </td> 
     224        </tr> 
    215225    </thead> 
    216226 
    … …  
    11531163        $E('resetFilters').dom.style.display = 'none'; 
    11541164    } 
    1155     //alert(appliedFilter); 
    11561165 
    11571166    contributions.clear(); 
    … …  
    11801189                } 
    11811190                $E('contributionsToShow').dom.innerHTML = result.length; 
    1182                 var totalContributions = <%= len(Conference.getContributionListSortedById()) %>; 
    1183                 if (totalContributions == result.length) { 
    1184                     $E('totalContributions').dom.style.display = 'none'; 
     1191                if (result.length == 0) { 
     1192                    $E('noFilteredContribution').dom.style.display = ''; 
     1193                } 
     1194                else { 
     1195                    $E('noFilteredContribution').dom.style.display = 'none'; 
     1196                } 
     1197                if (result.length == 1) { 
     1198                    $E('contributionText').dom.innerHTML = $T('paper'); 
    11851199                } else { 
    1186                     $E('totalContributions').dom.style.display = ''; 
     1200                    $E('contributionText').dom.innerHTML = $T('papers'); 
    11871201                } 
    11881202            } else { 
    … …  
    15871601bind.element($E("tablebody"), contributions, contributionTemplate); 
    15881602 
    1589 $E('btnReset').observeClick(function(){window.location = "<%= urlHandlers.UHConfModifReviewingAssignContributionsList.getURL(Conference) %>";}); 
     1603$E('btnReset').observeClick(function(){ 
     1604    window.location = "<%= urlHandlers.UHConfModifReviewingAssignContributionsList.getURL(Conference) %>"; 
     1605    $E('totalContributions').dom.style.display = 'none'; 
     1606}); 
    15901607 
    15911608var appliedFilter = false; 
    … …  
    15961613    appliedFilter = true; 
    15971614    fetchContributions(); 
     1615    <% if not IsOnlyReferee: %> 
     1616        $E('totalContributions').dom.style.display = ''; 
     1617    <% end %> 
    15981618}); 
    15991619 

  • indico/MaKaC/webinterface/tpls/ContributionDisplayFull.tpl

    r53b88f r9b6bab  
    151151                                    <% end %> 
    152152                                <% end %> 
    153                                 <tr> 
    154                                 <td>&nbsp;</td> 
    155                                         <td colspan="2" align="left"> 
    156                                             <form action="<%=urlHandlers.UHContributionRemoveSubmittedMarkForReviewing.getURL(Contribution)%>" method="POST" style="display:<%=display%>"> 
    157                                                 <input type="submit" class="btn" value="UNDO sending" > 
    158                                                 <% inlineContextHelp(_('Press this button only if you made some mistake when submitting the materials.The reviewing team will be notified and the reviewing process will be stopped until you mark the materials as submitted again')) %> 
    159                                             </form> 
    160                                         </td> 
    161                                 </tr> 
    162153                          <% end %> 
    163154                          <% else: %> 
    … …  
    165156                                <td></td> 
    166157                                <td> 
    167                                     <div id="reviewingWarning"> 
    168                                         <span class="collaborationWarning">You must send the reviewing material to start the reviewing process</span> 
    169                                     </div> 
     158 
    170159                                </td> 
    171160                            </tr> 

  • indico/MaKaC/webinterface/tpls/ShowExistingReviewingMaterial.tpl

    r53b88f r9b6bab  
    11<% import MaKaC.webinterface.urlHandlers as urlHandlers %> 
    22<% from MaKaC.webinterface.rh.conferenceBase import RHSubmitMaterialBase %> 
     3<div id="showStep1" class="groupTitleSmallPaper"><span><%= _("Step 1 - Upload paper") %></span></div> 
    34<%= existingMaterialsTitle %> 
    45<div id="reviewingMaterialListPlace"><!-- DOM-filled materials list --></div> 
    … …  
    1011    <% display = 'form' %> 
    1112<% end %> 
     13<div id="showStep2" class="groupTitleSmallPaper"><span><%= _("Step 2 - Submit the paper") %></span></div> 
    1214<form id="SendBtnForm" action="<%=urlHandlers.UHContributionSubmitForRewiewing.getURL(self._target)%>" method="POST" style="disabled:true; display:<%=display%>"> 
    13     <input id="SendBtn" type="submit" class="btn" value="Send" disabled="disabled" style="display:<%=display%>"> 
     15    <div id="reviewingWarning" style="padding-bottom:3px; padding-left:3px;"> 
     16        <span class="collaborationWarning">Note that you cannot modify the reviewing materials after submitting them.</span> 
     17    </div> 
     18    <input id="SendBtn" type="submit" class="btn" value="Submit" disabled="disabled" style="display:<%=display%>"> 
    1419    <span id="SendHelp" style="display:<%=display%>"> 
    15         <% inlineContextHelp(_('First you should add the materials and then by clicking on this button you will send them for reviewing. They will be locked until the end of the process')) %> 
     20        <% inlineContextHelp(_('First you should add the materials and then by clicking on this button you will submit them for reviewing. They will be locked until the end of the process')) %> 
    1621    </span> 
    1722</form> 
    … …  
    3338     <% if  self._target.getConference().getConfPaperReview().getChoice() == 3: %> 
    3439        <% if not self._target.getReviewManager().getLastReview().isAuthorSubmitted() and not self._target.getReviewManager().getLastReview().getEditorJudgement().isSubmitted():%> 
    35             visibility = 'visible'; 
     40            <% if showSendButton: %> 
     41                visibility = 'visible'; 
     42            <% end %> 
     43            <% else: %> 
     44                visibility = 'hidden'; 
     45            <% end %> 
    3646        <% end %> 
    3747        <% else: %> 
    … …  
    4151    <% if self._target.getConference().getConfPaperReview().getChoice() == 2: %> 
    4252        <% if not self._target.getReviewManager().getLastReview().isAuthorSubmitted() and not (self._target.getReviewManager().getLastReview().getRefereeJudgement().isSubmitted() or self._target.getReviewManager().getLastReview().anyReviewerHasGivenAdvice()): %> 
    43             visibility = 'visible'; 
     53            <% if showSendButton: %> 
     54                visibility = 'visible'; 
     55            <% end %> 
     56            <% else: %> 
     57                visibility = 'hidden'; 
     58            <% end %> 
    4459        <% end %> 
    4560        <% else: %> 
    … …  
    4964    <% if  self._target.getConference().getConfPaperReview().getChoice() == 4: %> 
    5065        <% if not self._target.getReviewManager().getLastReview().isAuthorSubmitted() and not (self._target.getReviewManager().getLastReview().getRefereeJudgement().isSubmitted() or self._target.getReviewManager().getLastReview().anyReviewerHasGivenAdvice() or self._target.getReviewManager().getLastReview().getEditorJudgement().isSubmitted()): %> 
    51             visibility = 'visible'; 
     66            <% if showSendButton: %> 
     67                visibility = 'visible'; 
     68            <% end %> 
     69            <% else: %> 
     70                visibility = 'hidden'; 
     71            <% end %> 
    5272        <% end %> 
    5373        <% else: %> 
    … …  
    7191<% end %> 
    7292 
     93if (visibility == 'visible') { 
     94    $E('showStep1').dom.style.display = ''; 
     95    $E('showStep2').dom.style.display = ''; 
     96} else { 
     97    $E('showStep1').dom.style.display = 'none'; 
     98    $E('showStep2').dom.style.display = 'none'; 
     99} 
     100 
    73101</script> 

  • indico/htdocs/css/Default.css

    r53b88f r9b6bab  
    67606760} 
    67616761 
     6762.groupTitleSmallPaper { 
     6763   font-weight: bold; 
     6764   font-size: 12px; 
     6765   color: #444444; 
     6766   padding: 3px 0 3px 0; 
     6767   font-style: italic; 
     6768} 
Note: See TracChangeset for help on using the changeset viewer.