Journal refresh button

rhodecode/templates/journal/journal.html

@@ -1,173 +1,177 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Journal')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs()">
 	${c.rhodecode_name}
 </%def>
 <%def name="page_nav()">
 	${self.menu('home')}
 </%def>
 <%def name="main()">
 	
     <div class="box box-left">
 	    <!-- box / title -->
 	    <div class="title">
 	        <h5>${_('Journal')}</h5>
-	    </div>
-		<script type="text/javascript">
-		function show_more_event(){
-		YUE.on(YUD.getElementsByClassName('show_more'),'click',function(e){
-		    var el = e.target;
-		    YUD.setStyle(YUD.get(el.id.substring(1)),'display','');
-		    YUD.setStyle(el.parentNode,'display','none');
-		});
-		}
-		</script> 	    
+             <ul class="links">
+               <li>
+                 <span><a href="#"><img id="refresh" class="icon" title="${_('Refresh')}" alt="${_('Refresh')}" src="${h.url('/images/icons/arrow_refresh.png')}"/>
+                 </a></span>
+               </li>          
+             </ul>            
+	    </div>    
 	    <div id="journal">${c.journal_data}</div>
     </div>
     <div class="box box-right">
         <!-- box / title -->
         <div class="title">
             <h5> 
             <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/>        
             <a id="show_my" class="link-white" href="#my">${_('My repositories')}</a> / <a id="show_watched" class="link-white" href="#watched">${_('Watched')}</a>
             </h5>
              %if h.HasPermissionAny('hg.admin','hg.create.repository')():
              <ul class="links">
                <li>
                  <span>${h.link_to(_('ADD REPOSITORY'),h.url('admin_settings_create_repository'))}</span>
                </li>          
              </ul>           
              %endif        
         </div>
         <!-- end box / title -->
         <div id="my" class="table">
+            %if c.user_repos:
             <table>
             <thead>
                 <tr>
                 <th class="left">${_('Name')}</th>
                 <th class="left">${_('revision')}</th>
                 <th colspan="2" class="left">${_('action')}</th>            
             </thead>
              <tbody>
-             %if c.user_repos:
                  %for repo in c.user_repos:
                     <tr>
                         <td>
                          %if repo['dbrepo']['repo_type'] =='hg':
                            <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="${h.url('/images/icons/hgicon.png')}"/>
                          %elif repo['dbrepo']['repo_type'] =='git':
                            <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="${h.url('/images/icons/giticon.png')}"/>
                          %else:
                            
                          %endif                     
                          %if repo['dbrepo']['private']:
                             <img class="icon" alt="${_('private')}" src="${h.url('/images/icons/lock.png')}"/>
                          %else:
                             <img class="icon" alt="${_('public')}" src="${h.url('/images/icons/lock_open.png')}"/>
                          %endif
                                                          
                         ${h.link_to(repo['name'], h.url('summary_home',repo_name=repo['name']),class_="repo_name")}
                         %if repo['dbrepo_fork']:
                             <a href="${h.url('summary_home',repo_name=repo['dbrepo_fork']['repo_name'])}">
                             <img class="icon" alt="${_('public')}"
                             title="${_('Fork of')} ${repo['dbrepo_fork']['repo_name']}" 
                             src="${h.url('/images/icons/arrow_divide.png')}"/></a>
                         %endif                  
                         </td> 
                         <td><span class="tooltip" title="${repo['last_change']}">${("r%s:%s") % (repo['rev'],h.short_id(repo['tip']))}</span></td>
                         <td><a href="${h.url('repo_settings_home',repo_name=repo['name'])}" title="${_('edit')}"><img class="icon" alt="${_('private')}" src="${h.url('/images/icons/application_form_edit.png')}"/></a></td>
                         <td>
                           ${h.form(url('repo_settings_delete', repo_name=repo['name']),method='delete')}
                             ${h.submit('remove_%s' % repo['name'],'',class_="delete_icon action_button",onclick="return confirm('Confirm to delete this repository');")}
                           ${h.end_form()}               
                         </td>
                     </tr>
                  %endfor
+             </tbody>
+             </table>
              %else:
                 <div style="padding:5px 0px 10px 0px;">
                 ${_('No repositories yet')} 
                 %if h.HasPermissionAny('hg.admin','hg.create.repository')():
                     ${h.link_to(_('create one now'),h.url('admin_settings_create_repository'),class_="ui-button-small")}
                 %endif
                 </div>
-             %endif
-             </tbody>
-             </table>
+             %endif             
         </div>
     
         <div id="watched" class="table" style="display:none">
-          <table>
-          <thead>
-              <tr>
-              <th class="left">${_('Name')}</th>
-          </thead>
-           <tbody>        
           %if c.following:
-              %for entry in c.following:
-              <tr>
-                <td>
+            <table>
+            <thead>
+                <tr>
+                <th class="left">${_('Name')}</th>
+            </thead>
+             <tbody>
+                %for entry in c.following:
+                  <tr>
+                    <td>
                       %if entry.follows_user_id:
                         <img title="${_('following user')}" alt="${_('user')}" src="${h.url('/images/icons/user.png')}"/>
                         ${entry.follows_user.full_contact}
                       %endif
                       
                       %if entry.follows_repo_id:
-                        
                         <div style="float:right;padding-right:5px">
                         <span id="follow_toggle_${entry.follows_repository.repo_id}" class="following" title="${_('Stop following this repository')}"
                               onclick="javascript:toggleFollowingRepo(this,${entry.follows_repository.repo_id},'${str(h.get_token())}')">
                         </span>                   
                         </div>
                         
                          %if entry.follows_repository.repo_type == 'hg':
                            <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="${h.url('/images/icons/hgicon.png')}"/>
                          %elif entry.follows_repository.repo_type == 'git':
                            <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="${h.url('/images/icons/giticon.png')}"/>
                          %endif                        
                         
                         %if entry.follows_repository.private:
                           <img class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="${h.url('/images/icons/lock.png')}"/>
                         %else:
                           <img class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="${h.url('/images/icons/lock_open.png')}"/>
                         %endif
                         <span class="watched_repo">
                             ${h.link_to(entry.follows_repository.repo_name,h.url('summary_home',repo_name=entry.follows_repository.repo_name))}
                         </span>
                       %endif
-                </td>
-              </tr>
-              %endfor
+                    </td>
+                  </tr>
+                %endfor
+            </tbody>
+            </table>
           %else:
-          </tbody>
+              <div style="padding:5px 0px 10px 0px;">
               ${_('You are not following any users or repositories')}
-          %endif   
-          </table>     
+              </div>
+          %endif                  
         </div> 
+    </div>
+    
     <script type="text/javascript">
     YUE.on('show_my','click',function(e){
         YUD.setStyle('watched','display','none');
         YUD.setStyle('my','display','');
         var nodes = YUQ('#my tr td a.repo_name');
         var target = 'q_filter';
         var func = function(node){
             return node.parentNode.parentNode;
         }
         q_filter(target,nodes,func);        
         YUE.preventDefault(e);
     })
     YUE.on('show_watched','click',function(e){
         YUD.setStyle('my','display','none');
         YUD.setStyle('watched','display','');
         var nodes = YUQ('#watched .watched_repo a');
         var target = 'q_filter';
         var func = function(node){
             return node.parentNode.parentNode;
         }
         q_filter(target,nodes,func);        
         YUE.preventDefault(e);        
     })
+    YUE.on('refresh','click',function(e){
+        ypjax(e.target.href,"journal",function(){show_more_event();tooltip_activate();});
+        YUE.preventDefault(e);
+    })
     </script>    
 </%def>    

rhodecode/templates/journal/journal_data.html

@@ -1,47 +1,49 b''
 ## -*- coding: utf-8 -*-
 
 %if c.journal_day_aggreagate:
     %for day,items in c.journal_day_aggreagate:
     <div class="journal_day">${day}</div>
         % for user,entries in items:
 	        <div class="journal_container">
 	            <div class="gravatar">
 	                <img alt="gravatar" src="${h.gravatar_url(user.email,24)}"/>
 	            </div>
 	            <div class="journal_user">${user.name} ${user.lastname}</div>
 	            <div class="journal_action_container">
 	            % for entry in entries:
 		            <div class="journal_icon"> ${h.action_parser_icon(entry)}</div>
 		            <div class="journal_action">${h.action_parser(entry)[0]}</div>
 		            <div class="journal_repo">
 		                <span class="journal_repo_name">
 		                %if entry.repository is not None:
 		                  ${h.link_to(entry.repository.repo_name,
 		                              h.url('summary_home',repo_name=entry.repository.repo_name))}
 		                %else:
 		                  ${entry.repository_name}
 		                %endif             
 		                </span>
 		            </div>
 		            <div class="journal_action_params">${h.literal(h.action_parser(entry)[1]())}</div>
 		            <div class="date"><span class="tooltip" title="${entry.action_date}">${h.age(entry.action_date)}</span></div>
 	            %endfor
 	            </div>
 	        </div>
         %endfor
     %endfor
     
-<div class="pagination-wh pagination-left">
-<script type="text/javascript">
-YUE.onDOMReady(function(){
-    YUE.delegate("journal","click",function(e, matchedEl, container){
-    	ypjax(e.target.href,"journal",function(){show_more_event();tooltip_activate();});
-        YUE.preventDefault(e);
-    },'.pager_link');
-});
-</script>
-${c.journal_pager.pager('$link_previous ~2~ $link_next')}
-</div>
+  <div class="pagination-wh pagination-left">
+    <script type="text/javascript">
+    YUE.onDOMReady(function(){
+        YUE.delegate("journal","click",function(e, matchedEl, container){
+        	ypjax(e.target.href,"journal",function(){show_more_event();tooltip_activate();});
+            YUE.preventDefault(e);
+        },'.pager_link');
+    });
+    </script>
+  ${c.journal_pager.pager('$link_previous ~2~ $link_next')}
+  </div>
 %else:
-    ${_('No entries yet')}
+  <div style="padding:5px 0px 10px 10px;">
+      ${_('No entries yet')}
+  </div>    
 %endif
  No newline at end of file