Changeset c60e4da in indico

Timestamp:

04/23/12 14:39:56 (13 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

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

Children:

61ed1b

Parents:

9ca792

git-author:

Claude Bossy <claude.bossy@…> (02/21/12 17:04:08)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (04/23/12 14:39:56)

Message:

[IMP] Added a tag in the search to precise where it will search

Location:

indico

Files:

• MaKaC/webinterface/pages/search.py (modified) (1 diff)
• MaKaC/webinterface/tpls/Search.tpl (modified) (4 diffs)
• MaKaC/webinterface/tpls/SearchBox.tpl (modified) (3 diffs)
• MaKaC/webinterface/wcomponents.py (modified) (3 diffs)
• htdocs/css/Default.css (modified) (3 diffs)

indico/MaKaC/webinterface/pages/search.py

@@ -27 +27 @@
         params['confId'] = None
         params['categId'] = self._target.getId()
+        params['categName'] = self._target.getTitle()
 
     def _getNavigationDrawer(self):

indico/MaKaC/webinterface/tpls/Search.tpl

@@ -33 +33 @@
 
 % if categId:
-  <input type="hidden" name="categId" value="${ categId }"/>
+  <input type="hidden" id="categId" name="categId" value="${ categId }"/>
 % endif
 % if confId:
@@ -40 +40 @@
 
 
-
-<div>
-  <input style="width: 300px; height:20px; font-size:17px; vertical-align: middle;" type="text" name="p" value="${ p }" />
-  <input type="submit" value="${ _('Search')}" style="vertical-align: middle;"/>
-</div>
+<div id="UISearch">
+    <div id="searchControls">
+        <div class="yellowButton searchButton" id="searchButton2">
+            <input style="background-color: transparent;" class="button" type="submit" value="${ _('Search')}" onclick="javascript: return verifyForm();" id="searchSubmit"/>
+        </div>
+        <div style="background: white; padding: 2px;">
+            <input style="background-color: transparent; margin-top: -1px;" type="text" id="searchText2" name="p" value="${ p }"/>
+        </div>
+    </div>
+</div>
+
 <div style="padding-top: 4px;"><span id="advancedOptionsText"><span class='fakeLink' onclick='toogleAdvancedOptions()'>${_("Show advanced options") }</span></span></div>
 <div id="advancedOptions" style="overflow: hidden; visibility: hidden;">
@@ -175 +181 @@
 }
 
+function hideCategory2()
+{
+    $('#categId').attr('value', 0);
+    $('#cross2').fadeOut();
+    $('#inCategory2').fadeOut();
+}
+
 IndicoUI.executeOnLoad(function(){
 
@@ -200 +213 @@
 startDate.set('${ startDate }');
 endDate.set('${ endDate }');
+
+var box = $('<div id="cross2" class="searchCategoryCross" onclick="hideCategory2()">x</div>'+
+        '<div id="inCategory2" class="searchCategory">in ${categName}</div>');
+if ($('#categId').attr('value')!=0){
+$('#searchText2').before(box);
+}
+
 });
 

indico/MaKaC/webinterface/tpls/SearchBox.tpl

@@ -6 +6 @@
             <input style="background-color: transparent;" class="button" type="submit" value="${ _('Search')}" onclick="javascript: return verifyForm();" id="searchSubmit"/>
         </div>
-    <div style="background: white; padding: 2px;">
-      <div id="yoo" class="${ moreOptionsClass }" onclick="javascript:return expandMenu(this);"></div>
-      <input style="background-color: transparent; margin-top: -1px;" type="text" id="searchText" name="p" />
-        </div>
+        <div style="background: white; padding: 2px;">
+        <div id="yoo" class="${ moreOptionsClass }" onclick="javascript:return expandMenu(this);"></div>
+        <input style="background-color: transparent; margin-top: -1px;" type="text" id="searchText" name="p" />
     </div>
+</div>
 
     <div id="extraOptions">
@@ -82 +82 @@
 }
 
+function hideCategory()
+{
+    $('#searchCategId').attr('value', 0);
+    $('#cross1').fadeOut();
+    $("#inCategory1").fadeOut();
+}
+
 function resetForm()
 {
@@ -118 +125 @@
          intelligentSearchBox.draw()
      );
+
+  var box = $('<div id="cross1" class="searchCategoryCross" onclick="hideCategory()">x</div>'+
+          '<div id="inCategory1" class="searchCategory">in ${categName}</div>');
+  if ($('#searchCategId').attr('value')!=0){
+      $('#yoo').after(box);
+  }
+
 });
+
 </script>

indico/MaKaC/webinterface/wcomponents.py

@@ -32 +32 @@
 from MaKaC.common.db import DBMgr
 import MaKaC.conference as conference
+from MaKaC.conference import CategoryManager
 import MaKaC.user as user
 import MaKaC.schedule as schedule
@@ -6588 +6589 @@
         return vars
 
-    def getHTML(self, params=None):
-        minfo = info.HelperMaKaCInfo.getMaKaCInfoInstance()
-        if minfo.getRoomBookingModuleActive():
-            return WTemplated.getHTML(self, params)
-        else:
-            return _("The Room Booking module is disabled")
-
-
 
 class WRoomBookingAdminLocation( WTemplated ):
@@ -6716 +6709 @@
         vars = WBaseSearchBox.getVars( self )
         vars["categId"] = self._categId
+        vars["categName"] = CategoryManager().getById(self._categId).getTitle()
         vars['moreOptionsClass'] = self._moreOptionsClass
         return vars

indico/htdocs/css/Default.css

@@ -2247 +2247 @@
 div#UISearchBox #searchControls
 {
-    width: 250px;
+    width: 350px;
     border: 1px solid #888;
     height: 21px;
@@ -2263 +2263 @@
 div#UISearchBox #searchText
 {
-    width: 130px;
+    width: 160px;
 }
 
@@ -2308 +2308 @@
 }
 
+div#UISearch
+{
+    position:relative;
+    border: none;
+    font-size: 13px;
+    z-index: 1;
+}
+
+div#UISearch .searchButton
+{
+    float:right;
+    border-left: 1px solid #888;
+    width: auto;
+}
+
+div#UISearch #searchText
+{
+    width: 130px;
+}
+
+div#UISearch #searchControls
+{
+    width: 350px;
+    border: 1px solid #888;
+    height: 21px;
+    overflow: hidden;
+    background-color: white;
+}
+
+div#UISearch #searchControls input
+{
+    border: 0;
+    color: black;
+    font-weight: normal;
+}
+
+.searchCategory
+{
+    background-color: #9AA0FE;
+    border-radius: 2px;
+    font-weight:normal;
+    color: #FFFFFF;
+    vertical-align: middle;
+    margin-right: -2px;
+    padding-right: 5px;
+    padding-left:5px;
+    height: 17px;
+    float: right;
+    cursor: pointer;
+    max-width: 75px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
+.searchCategoryCross
+{
+    background-color: #9AA0FE;
+    font-weight: bold;
+    border-radius: 2px;
+    color: #FFFFFF;
+    vertical-align: middle;
+    margin-right: 2px;
+    padding-left: 5px;
+    padding-right: 5px;
+    height: 17px;
+    float: right;
+    cursor: pointer;
+}
 
 .arrowExpandIcon