Browse Source

hide search form if the user is not authenticated

Damien Accorsi 11 years ago
parent
commit
ff12ee7cb2
2 changed files with 10 additions and 9 deletions
  1. 1 1
      pboard/pboard/model/data.py
  2. 9 8
      pboard/pboard/templates/master.mak

+ 1 - 1
pboard/pboard/model/data.py View File

355
   def getTruncatedContentAsText(self, piCharNb):
355
   def getTruncatedContentAsText(self, piCharNb):
356
     lsPlainText = ''.join(bs4.BeautifulSoup(self.data_content).findAll(text=True))
356
     lsPlainText = ''.join(bs4.BeautifulSoup(self.data_content).findAll(text=True))
357
     lsTruncatedContent = ''
357
     lsTruncatedContent = ''
358
-    
358
+
359
     liMaxLength = int(piCharNb)
359
     liMaxLength = int(piCharNb)
360
     if len(lsPlainText)>liMaxLength:
360
     if len(lsPlainText)>liMaxLength:
361
       lsTruncatedContent = lsPlainText[0:liMaxLength-1]+'…'
361
       lsTruncatedContent = lsPlainText[0:liMaxLength-1]+'…'

+ 9 - 8
pboard/pboard/templates/master.mak View File

168
                 <li><a href="${tg.url('/debug/identity')}"><i class="fa fa-user-md"></i>  request.identity</a></li>
168
                 <li><a href="${tg.url('/debug/identity')}"><i class="fa fa-user-md"></i>  request.identity</a></li>
169
               </ul>
169
               </ul>
170
             </li>
170
             </li>
171
-            
171
+            <li>
172
+              <form class="navbar-search  form-search" action="${tg.url('/search')}">
173
+                <div class="input-append">
174
+                  <input name="keywords" type="text" class="span2 search-query" placeholder="Search" value="${context.get('search_string', '')}">
175
+                  <button title="${_('Search')}" class="btn" type="submit"><i class="fa fa-search"></i></button>
176
+                </div>
177
+              </form>
178
+            </li>
179
+
172
             
180
             
173
             
181
             
174
           % endif
182
           % endif
209
                     <p></p>
217
                     <p></p>
210
                  </ul>
218
                  </ul>
211
               </li>
219
               </li>
212
-              
213
             % endif
220
             % endif
214
           </ul>
221
           </ul>
215
-          <form class="navbar-search pull-right form-search" action="${tg.url('/search')}">
216
-            <div class="input-append">
217
-              <input name="keywords" type="text" class="span2 search-query" placeholder="Search" value="${context.get('search_string', '')}">
218
-              <button title="${_('Search')}" class="btn" type="submit"><i class="fa fa-search"></i></button>
219
-            </div>
220
-          </form>
221
 
222
 
222
         </div><!-- /.nav-collapse -->
223
         </div><!-- /.nav-collapse -->
223
       </div><!-- /.container -->
224
       </div><!-- /.container -->