kallithea Changeset - f91d3f9b7230

 {% extends "basic/layout.html" %}
 {% block sidebarlogo %}
 <h3>Support my development effort.</h3>
 <div style="text-align:center">
 	<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
 	<input type="hidden" name="cmd" value="_s-xclick">
 	<input type="hidden" name="hosted_button_id" value="8U2LLRPLBKWDU">
-	<input style="border:0px !important" type="image" src="https://www.paypal.com/en_US/i/btn/btn_donate_SM.gif"
 	<input style="border:0px !important" type="image" src="https://www.paypal.com/en_US/i/btn/btn_donate_SM.gif"
 	border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
 	<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1">
 	</form>
 </div>
 {% endblock %}}

rhodecode/templates/_data_table/_dt_elements.html

➞

Show inline comments

 ## DATA TABLE RE USABLE ELEMENTS
 ## usage:
 ## <%namespace name="dt" file="/_data_table/_dt_elements.html"/>
 <%def name="quick_menu(repo_name)">
   <ul class="menu_items hidden">
     <li style="border-top:1px solid #003367;margin-left:18px;padding-left:-99px"></li>
     <li>
        <a title="${_('Summary')}" href="${h.url('summary_home',repo_name=repo_name)}">
        <span class="icon">
            <img src="${h.url('/images/icons/clipboard_16.png')}" alt="${_('Summary')}" />
        </span>
        <span>${_('Summary')}</span>
        </a>
        <span>${_('Summary')}</span>
        </a>
     </li>
     <li>
        <a title="${_('Changelog')}" href="${h.url('changelog_home',repo_name=repo_name)}">
        <span class="icon">
            <img src="${h.url('/images/icons/time.png')}" alt="${_('Changelog')}" />
        </span>
        <span>${_('Changelog')}</span>
        </a>
        <span>${_('Changelog')}</span>
        </a>
     </li>
     <li>
        <a title="${_('Files')}" href="${h.url('files_home',repo_name=repo_name)}">
        <span class="icon">
            <img src="${h.url('/images/icons/file.png')}" alt="${_('Files')}" />
        </span>
        <span>${_('Files')}</span>
        </a>
        <span>${_('Files')}</span>
        </a>
     </li>
     <li>
        <a title="${_('Fork')}" href="${h.url('repo_fork_home',repo_name=repo_name)}">
        <span class="icon">
            <img src="${h.url('/images/icons/arrow_divide.png')}" alt="${_('Fork')}" />
        </span>
        <span>${_('Fork')}</span>
        </a>
     </li>
        <span>${_('Fork')}</span>
        </a>
     </li>
   </ul>
 </%def>
 <%def name="repo_name(name,rtype,private,fork_of)">
   <div style="white-space: nowrap">
    ##TYPE OF REPO
    %if rtype =='hg':
      <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="${h.url('/images/icons/hgicon.png')}"/>
    %elif rtype =='git':
      <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="${h.url('/images/icons/giticon.png')}"/>
    %endif
    %endif
    ##PRIVATE/PUBLIC
    %if 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
    ##NAME
    ##NAME
    ${h.link_to(name,h.url('summary_home',repo_name=name),class_="repo_name")}
    %if fork_of:
         <a href="${h.url('summary_home',repo_name=fork_of)}">
         <img class="icon" alt="${_('fork')}" title="${_('Fork of')} ${fork_of}" src="${h.url('/images/icons/arrow_divide.png')}"/></a>
    %endif
   </div>
 </%def>
 <%def name="revision(name,rev,tip,author,last_msg)">
   <div>

rhodecode/templates/admin/admin.html

➞

Show inline comments

@@ @@ -15,14 +15,14 @@ @@
 <%def name="main()">
 <div class="box">
 	<!-- box / title -->
 	<div class="title">
 	    ${self.breadcrumbs()}
 	</div>
 	<!-- end box / title -->
 	<div class="table">
 	    <div id="user_log">
 	        ${c.log_data}
 	    </div>
 	</div>
 </div>
 </%def>
@@ \ No newline at end of file @@
 </div>
 </%def>

rhodecode/templates/admin/admin_log.html

➞

Show inline comments

@@ @@ -14,40 +14,40 @@ @@
 		<td>${h.link_to(l.user.username,h.url('edit_user', id=l.user.user_id))}</td>
 		<td>${h.action_parser(l)[0]}
 		  <div class="journal_action_params">
 		  ${h.literal(h.action_parser(l)[1]())}</div>
 		</td>
 		<td>
 		%if l.repository:
 		  ${h.link_to(l.repository.repo_name,h.url('summary_home',repo_name=l.repository.repo_name))}
 		%else:
 		  ${l.repository_name}
 		%endif
 		</td>
 		<td>${l.action_date}</td>
 		<td>${l.user_ip}</td>
 	</tr>
 	%endfor
 </table>
 <script type="text/javascript">
   YUE.onDOMReady(function(){
 	YUE.delegate("user_log","click",function(e, matchedEl, container){
 		ypjax(e.target.href,"user_log",function(){show_more_event();tooltip_activate();});
 		YUE.preventDefault(e);
 	},'.pager_link');
 	YUE.delegate("user_log","click",function(e,matchedEl,container){
 	      var el = e.target;
 	      YUD.setStyle(YUD.get(el.id.substring(1)),'display','');
 	      YUD.setStyle(el.parentNode,'display','none');
 	  },'.show_more');
   });
 </script>
 <div class="pagination-wh pagination-left">
 ${c.users_log.pager('$link_previous ~2~ $link_next')}
 </div>
 %else:
 	${_('No actions yet')}
 %endif
@@ \ No newline at end of file @@
 %else:
 	${_('No actions yet')}
 %endif

rhodecode/templates/admin/ldap/ldap.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('LDAP administration')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_('Admin'),h.url('admin_home'))}
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
-    ${_('Ldap')}
     ${_('Ldap')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
-        ${self.breadcrumbs()}
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('ldap_settings'))}
     <div class="form">
         <div class="fields">
 	  <h3>${_('Connection settings')}</h3>
             <div class="field">
                 <div class="label label-checkbox"><label for="ldap_active">${_('Enable LDAP')}</label></div>
                 <div class="checkboxes"><div class="checkbox">${h.checkbox('ldap_active',True,class_='small')}</div></div>
             </div>
             <div class="field">
                 <div class="label"><label for="ldap_host">${_('Host')}</label></div>
@@ @@ -75,29 +75,21 @@ @@
             <div class="field">
                 <div class="label"><label for="ldap_attr_firstname">${_('First Name Attribute')}</label></div>
                 <div class="input">${h.text('ldap_attr_firstname',class_='small')}</div>
             </div>
             <div class="field">
                 <div class="label"><label for="ldap_attr_lastname">${_('Last Name Attribute')}</label></div>
                 <div class="input">${h.text('ldap_attr_lastname',class_='small')}</div>
             </div>
             <div class="field">
                 <div class="label"><label for="ldap_attr_email">${_('E-mail Attribute')}</label></div>
                 <div class="input">${h.text('ldap_attr_email',class_='small')}</div>
             </div>
             <div class="buttons">
             ${h.submit('save',_('Save'),class_="ui-button")}
-            </div>
             </div>
         </div>
     </div>
     ${h.end_form()}
     </div>
     ${h.end_form()}
 </div>
 </%def>
 </%def>

rhodecode/templates/admin/notifications/notifications.html

➞

Show inline comments

@@ @@ -8,46 +8,46 @@ @@
 <%def name="breadcrumbs_links()">
     ${_('My Notifications')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
-        ${self.breadcrumbs()}
         ${self.breadcrumbs()}
         <ul class="links">
             <li>
               <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span>
             </li>
         </ul>
             </li>
         </ul>
     </div>
     %if c.notifications:
       <div style="padding:10px 15px;text-align: right">
       <span id='mark_all_read' class="ui-btn">${_('Mark all read')}</span>
       </div>
     %endif
   <div id='notification_data'>
     <%include file='notifications_data.html'/>
   </div>
 </div>
 <script type="text/javascript">
 var url_del = "${url('notification', notification_id='__NOTIFICATION_ID__')}";
 YUE.on(YUQ('.delete-notification'),'click',function(e){
  var notification_id = e.currentTarget.id;
  deleteNotification(url_del,notification_id)
 })
  YUE.on('mark_all_read','click',function(e){
 	    var url = "${h.url('notifications_mark_all_read')}";
 	    ypjax(url,'notification_data',function(){
 	    	YUD.get('notification_counter').innerHTML=0;
 	    	YUE.on(YUQ('.delete-notification'),'click',function(e){
 	    		 var notification_id = e.currentTarget.id;
 	    		 deleteNotification(url_del,notification_id)
-	    	})
 	    	})
 	    });
  })
 </script>
-</%def>
 </%def>

rhodecode/templates/admin/notifications/notifications_data.html

➞

Show inline comments

@@ @@ -16,13 +16,13 @@ unread = lambda n:{False:'unread'}.get(n @@
         </div>
         <div class="delete-notifications">
           <span id="${notification.notification.notification_id}" class="delete-notification delete_icon action"></span>
         </div>
       </div>
       <div class="notification-subject">${h.literal(notification.notification.subject)}</div>
     </div>
   %endfor
   </div>
 </div>
 %else:
     <div class="table">${_('No notifications here yet')}</div>
 %endif
@@ \ No newline at end of file @@
 %endif

rhodecode/templates/admin/notifications/show_notification.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Show notification')} ${c.rhodecode_user.username} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Notifications'),h.url('notifications'))}
-    &raquo;
     &raquo;
     ${_('Show notification')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
-        ${self.breadcrumbs()}
         ${self.breadcrumbs()}
         <ul class="links">
             <li>
               <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span>
             </li>
         </ul>
             </li>
         </ul>
     </div>
     <div class="table">
       <div id="notification_${c.notification.notification_id}">
         <div class="notification-header">
           <div class="gravatar">
               <img alt="gravatar" src="${h.gravatar_url(h.email(c.notification.created_by_user.email),24)}"/>
           </div>
           <div class="desc">
               ${c.notification.description}
           </div>
           <div class="delete-notifications">
             <span id="${c.notification.notification_id}" class="delete-notification delete_icon action"></span>
@@ @@ -42,13 +42,13 @@ @@
         <div>${h.rst_w_mentions(c.notification.body)}</div>
       </div>
     </div>
 </div>
 <script type="text/javascript">
 var url = "${url('notification', notification_id='__NOTIFICATION_ID__')}";
 var main = "${url('notifications')}";
    YUE.on(YUQ('.delete-notification'),'click',function(e){
        var notification_id = e.currentTarget.id;
        deleteNotification(url,notification_id,[function(){window.location=main}])
    })
 </script>
-</%def>
 </%def>

rhodecode/templates/admin/permissions/permissions.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Permissions administration')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_('Admin'),h.url('admin_home'))}
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
-    ${_('Permissions')}
     ${_('Permissions')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
-        ${self.breadcrumbs()}
         ${self.breadcrumbs()}
     </div>
     <h3>${_('Default permissions')}</h3>
     ${h.form(url('permission', id='default'),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="anonymous">${_('Anonymous access')}:</label>
                 </div>
                 <div class="checkboxes">
                     <div class="checkbox">
                         ${h.checkbox('anonymous',True)}
                     </div>
                 </div>
-            </div>
             </div>
 			<div class="field">
 				<div class="label label-select">
 					<label for="default_perm">${_('Repository permission')}:</label>
 				</div>
 				<div class="select">
 					${h.select('default_perm','',c.perms_choices)}
 		                ${h.checkbox('overwrite_default','true')}
 		                <label for="overwrite_default">
-		                <span class="tooltip"
 		                <span class="tooltip"
 		                title="${h.tooltip(_('All default permissions on each repository will be reset to choosen permission, note that all custom default permission on repositories will be lost'))}">
 		                ${_('overwrite existing settings')}</span> </label>
 				</div>
 			</div>
 				</div>
 			</div>
 			<div class="field">
 		        <div class="label">
 		            <label for="default_register">${_('Registration')}:</label>
 		        </div>
 				<div class="select">
 					${h.select('default_register','',c.register_choices)}
 				</div>
-			</div>
 			</div>
              <div class="field">
                 <div class="label">
                     <label for="default_create">${_('Repository creation')}:</label>
                 </div>
 				<div class="select">
 					${h.select('default_create','',c.create_choices)}
 				</div>
              </div>
              </div>
 	        <div class="buttons">
 	        ${h.submit('set',_('set'),class_="ui-button")}
-	        </div>
 	        </div>
         </div>
-    </div>
     </div>
     ${h.end_form()}
 </div>
 </%def>
 </%def>

rhodecode/templates/admin/repos/repo_add.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Add repository')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Repositories'),h.url('repos'))}
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Repositories'),h.url('repos'))}
     &raquo;
     ${_('add new')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%def name="main()">
 	<div class="box">
 	    <!-- box / title -->
 	    <div class="title">
-	        ${self.breadcrumbs()}
 	        ${self.breadcrumbs()}
 	    </div>
         <%include file="repo_add_base.html"/>
     </div>
 </%def>
@@ \ No newline at end of file @@
     </div>
 </%def>

rhodecode/templates/admin/repos/repo_add_base.html

➞

Show inline comments

@@ @@ -13,51 +13,51 @@ ${h.form(url('repos'))} @@
                 %if not h.HasPermissionAll('hg.admin')('repo create form'):
                     ${h.hidden('user_created',True)}
                 %endif
             </div>
          </div>
         <div class="field">
             <div class="label">
                 <label for="clone_uri">${_('Clone from')}:</label>
             </div>
             <div class="input">
                 ${h.text('clone_uri',class_="small")}
             </div>
-         </div>
          </div>
          <div class="field">
              <div class="label">
                  <label for="repo_group">${_('Repository group')}:</label>
              </div>
              <div class="input">
                  ${h.select('repo_group','',c.repo_groups,class_="medium")}
              </div>
-         </div>
          </div>
         <div class="field">
             <div class="label">
                 <label for="repo_type">${_('Type')}:</label>
             </div>
             <div class="input">
                 ${h.select('repo_type','hg',c.backends,class_="small")}
             </div>
-         </div>
          </div>
         <div class="field">
             <div class="label label-textarea">
                 <label for="description">${_('Description')}:</label>
             </div>
             <div class="textarea text-area editor">
                 ${h.textarea('description',cols=23,rows=5)}
             </div>
          </div>
         <div class="field">
             <div class="label label-checkbox">
                 <label for="private">${_('Private')}:</label>
             </div>
             <div class="checkboxes">
                 ${h.checkbox('private',value="True")}
             </div>
          </div>
         <div class="buttons">
           ${h.submit('add',_('add'),class_="ui-button")}
-        </div>
         </div>
     </div>
 </div>
 ${h.end_form()}
 </div>
 ${h.end_form()}

rhodecode/templates/admin/repos/repo_add_create_repository.html

➞

Show inline comments

@@ @@ -8,17 +8,17 @@ @@
 <%def name="breadcrumbs_links()">
 	${_('add new repository')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%def name="main()">
     <div class="box">
         <!-- box / title -->
         <div class="title">
-            ${self.breadcrumbs()}
             ${self.breadcrumbs()}
         </div>
         <%include file="repo_add_base.html"/>
     </div>
 </%def>
@@ \ No newline at end of file @@
     </div>
 </%def>

rhodecode/templates/admin/repos/repo_edit.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Edit repository')} ${c.repo_info.repo_name} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Repositories'),h.url('repos'))}
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Repositories'),h.url('repos'))}
     &raquo;
     ${_('edit')} &raquo; ${h.link_to(c.repo_info.just_name,h.url('summary_home',repo_name=c.repo_name))}
 </%def>
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box box-left">
     <!-- box / title -->
     <div class="title">
-        ${self.breadcrumbs()}
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('repo', repo_name=c.repo_info.repo_name),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
             <div class="field">
                 <div class="label">
                     <label for="repo_name">${_('Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('repo_name',class_="medium")}
                 </div>
            </div>
 	       <div class="field">
 	           <div class="label">
 	               <label for="clone_uri">${_('Clone uri')}:</label>
 	           </div>
 	           <div class="input">
 	               ${h.text('clone_uri',class_="medium")}
 	           </div>
-	        </div>
 	        </div>
 	        <div class="field">
 	            <div class="label">
 	                <label for="repo_group">${_('Repository group')}:</label>
 	            </div>
 	            <div class="input">
 	                ${h.select('repo_group','',c.repo_groups,class_="medium")}
 	            </div>
-	        </div>
 	        </div>
             <div class="field">
                 <div class="label">
                     <label for="repo_type">${_('Type')}:</label>
                 </div>
                 <div class="input">
                     ${h.select('repo_type','hg',c.backends,class_="medium")}
                 </div>
-            </div>
             </div>
             <div class="field">
                 <div class="label label-textarea">
                     <label for="description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${h.textarea('description',cols=23,rows=5)}
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="private">${_('Private')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('private',value="True")}
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="enable_statistics">${_('Enable statistics')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('enable_statistics',value="True")}
                 </div>
-            </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="enable_downloads">${_('Enable downloads')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('enable_downloads',value="True")}
                 </div>
-            </div>
             </div>
             <div class="field">
                 <div class="label">
                     <label for="user">${_('Owner')}:</label>
                 </div>
                 <div class="input input-small ac">
                     <div class="perm_ac">
                        ${h.text('user',class_='yui-ac-input')}
                        <div id="owner_container"></div>
                     </div>
                 </div>
              </div>
              </div>
             <div class="field">
                 <div class="label">
                     <label for="input">${_('Permissions')}:</label>
                 </div>
                 <div class="input">
                     <%include file="repo_edit_perms.html"/>
                 </div>
             <div class="buttons">
               ${h.submit('save','Save',class_="ui-button")}
               ${h.reset('reset','Reset',class_="ui-button")}
-            </div>
             </div>
         </div>
     </div>
-    </div>
     </div>
     ${h.end_form()}
 </div>
 <div class="box box-right">
     <div class="title">
-        <h5>${_('Administration')}</h5>
         <h5>${_('Administration')}</h5>
     </div>
         <h3>${_('Statistics')}</h3>
         ${h.form(url('repo_stats', repo_name=c.repo_info.repo_name),method='delete')}
         <div class="form">
            <div class="fields">
                ${h.submit('reset_stats_%s' % c.repo_info.repo_name,_('Reset current statistics'),class_="ui-btn",onclick="return confirm('"+_('Confirm to remove current statistics')+"');")}
                <div class="field" style="border:none;color:#888">
                <ul>
                     <li>${_('Fetched to rev')}: ${c.stats_revision}/${c.repo_last_rev}</li>
                     <li>${_('Percentage of stats gathered')}: ${c.stats_percentage} %</li>
                </ul>
                </div>
            </div>
-        </div>
         </div>
         ${h.end_form()}
         %if c.repo_info.clone_uri:
         <h3>${_('Remote')}</h3>
         ${h.form(url('repo_pull', repo_name=c.repo_info.repo_name),method='put')}
         <div class="form">
            <div class="fields">
                ${h.submit('remote_pull_%s' % c.repo_info.repo_name,_('Pull changes from remote location'),class_="ui-btn",onclick="return confirm('"+_('Confirm to pull changes from remote side')+"');")}
                <div class="field" style="border:none">
                <ul>
                     <li><a href="${c.repo_info.clone_uri}">${c.repo_info.clone_uri}</a></li>
                </ul>
                </div>
                </ul>
                </div>
            </div>
-        </div>
         </div>
         ${h.end_form()}
         %endif
         <h3>${_('Cache')}</h3>
         ${h.form(url('repo_cache', repo_name=c.repo_info.repo_name),method='delete')}
         <div class="form">
            <div class="fields">
                ${h.submit('reset_cache_%s' % c.repo_info.repo_name,_('Invalidate repository cache'),class_="ui-btn",onclick="return confirm('"+_('Confirm to invalidate repository cache')+"');")}
            </div>
-        </div>
         </div>
         ${h.end_form()}
         <h3>${_('Public journal')}</h3>
         ${h.form(url('repo_public_journal', repo_name=c.repo_info.repo_name),method='put')}
         <div class="form">
                 ${h.hidden('auth_token',str(h.get_token()))}
                 <div class="field">
                 %if c.in_public_journal:
                     ${h.submit('set_public_%s' % c.repo_info.repo_name,_('Remove from public journal'),class_="ui-btn")}
                 %else:
 		            ${h.submit('set_public_%s' % c.repo_info.repo_name,_('Add to public journal'),class_="ui-btn")}
 		        %endif
                 </div>
                <div class="field" style="border:none;color:#888">
                <ul>
                     <li>${_('''All actions made on this repository will be accessible to everyone in public journal''')}
                     </li>
                </ul>
-               </div>
                </div>
         </div>
         ${h.end_form()}
         <h3>${_('Delete')}</h3>
         ${h.form(url('repo', repo_name=c.repo_info.repo_name),method='delete')}
         <div class="form">
            <div class="fields">
                ${h.submit('remove_%s' % c.repo_info.repo_name,_('Remove this repository'),class_="ui-btn red",onclick="return confirm('"+_('Confirm to delete this repository')+"');")}
            </div>
            <div class="field" style="border:none;color:#888">
            <ul>
-                <li>${_('''This repository will be renamed in a special way in order to be unaccesible for RhodeCode and VCS systems.
                 <li>${_('''This repository will be renamed in a special way in order to be unaccesible for RhodeCode and VCS systems.
                          If you need fully delete it from filesystem please do it manually''')}
                 </li>
            </ul>
            </div>
         </div>
            </div>
         </div>
         ${h.end_form()}
         <h3>${_('Set as fork')}</h3>
         ${h.form(url('repo_as_fork', repo_name=c.repo_info.repo_name),method='put')}
         <div class="form">
            <div class="fields">
                ${h.select('id_fork_of','',c.repos_list,class_="medium")}
                ${h.submit('set_as_fork_%s' % c.repo_info.repo_name,_('set'),class_="ui-btn",)}
            </div>
                <div class="field" style="border:none;color:#888">
                <ul>
                     <li>${_('''Manually set this repository as a fork of another''')}</li>
                </ul>
                </div>
         </div>
                </div>
         </div>
         ${h.end_form()}
 </div>
-</%def>
 </%def>

rhodecode/templates/admin/repos/repo_edit_perms.html

➞

Show inline comments

 <table id="permissions_manage" class="noborder">
     <tr>
         <td>${_('none')}</td>
         <td>${_('read')}</td>
         <td>${_('write')}</td>
         <td>${_('admin')}</td>
         <td>${_('member')}</td>
         <td></td>
     </tr>
-    ## USERS
     ## USERS
     %for r2p in c.repo_info.repo_to_perm:
         %if r2p.user.username =='default' and c.repo_info.private:
             <tr>
                 <td colspan="4">
                     <span class="private_repo_msg">
                     ${_('private repository')}
                     </span>
                 </td>
                 <td class="private_repo_msg"><img style="vertical-align:bottom" src="${h.url('/images/icons/user.png')}"/>${r2p.user.username}</td>
             </tr>
         %else:
         <tr id="id${id(r2p.user.username)}">
             <td>${h.radio('u_perm_%s' % r2p.user.username,'repository.none')}</td>
             <td>${h.radio('u_perm_%s' % r2p.user.username,'repository.read')}</td>
             <td>${h.radio('u_perm_%s' % r2p.user.username,'repository.write')}</td>
             <td>${h.radio('u_perm_%s' % r2p.user.username,'repository.admin')}</td>
             <td style="white-space: nowrap;">
                 <img style="vertical-align:bottom" src="${h.url('/images/icons/user.png')}"/>${r2p.user.username}
             </td>
             <td>
               %if r2p.user.username !='default':
                 <span class="delete_icon action_button" onclick="ajaxActionUser(${r2p.user.user_id},'${'id%s'%id(r2p.user.username)}')">
                 ${_('revoke')}
                 </span>
-              %endif
               %endif
             </td>
         </tr>
         %endif
     %endfor
     ## USERS GROUPS
     ## USERS GROUPS
     %for g2p in c.repo_info.users_group_to_perm:
         <tr id="id${id(g2p.users_group.users_group_name)}">
             <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.none')}</td>
             <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.read')}</td>
             <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.write')}</td>
             <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.admin')}</td>
             <td style="white-space: nowrap;">
                 <img  style="vertical-align:bottom" src="${h.url('/images/icons/group.png')}"/>${g2p.users_group.users_group_name}
             </td>
             <td>
                 <span class="delete_icon action_button" onclick="ajaxActionUsersGroup(${g2p.users_group.users_group_id},'${'id%s'%id(g2p.users_group.users_group_name)}')">
                 ${_('revoke')}
@@ @@ -83,37 +83,37 @@ function ajaxActionUser(user_id, field_i @@
     var callback = {
         success: function (o) {
             var tr = YUD.get(String(field_id));
             tr.parentNode.removeChild(tr);
         },
         failure: function (o) {
             alert("${_('Failed to remove user')}");
         },
     };
     var postData = '_method=delete&user_id=' + user_id;
     var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, postData);
 };
 function ajaxActionUsersGroup(users_group_id,field_id){
     var sUrl = "${h.url('delete_repo_users_group',repo_name=c.repo_name)}";
-    var callback = {
     var callback = {
     	success:function(o){
     	    var tr = YUD.get(String(field_id));
     		tr.parentNode.removeChild(tr);
     	},
         failure:function(o){
             alert("${_('Failed to remove users group')}");
         },
     };
-    var postData = '_method=delete&users_group_id='+users_group_id;
     var postData = '_method=delete&users_group_id='+users_group_id;
     var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, postData);
 };
 YUE.onDOMReady(function () {
     if (!YUD.hasClass('perm_new_member_name', 'error')) {
         YUD.setStyle('add_perm_input', 'display', 'none');
+    }
     YAHOO.util.Event.addListener('add_perm', 'click', function () {
         YUD.setStyle('add_perm_input', 'display', '');
         YUD.setStyle('add_perm', 'opacity', '0.6');
         YUD.setStyle('add_perm', 'cursor', 'default');
     });
@@ @@ -258,24 +258,24 @@ YAHOO.example.FnMultipleFields = functio @@
                 myAC.getInputEl().value = oData.nname;
                 YUD.get('perm_new_member_type').value = 'user';
             } else {
                 //groups
                 myAC.getInputEl().value = oData.grname;
                 YUD.get('perm_new_member_type').value = 'users_group';
+            }
         };
     membersAC.itemSelectEvent.subscribe(myHandler);
     if(ownerAC.itemSelectEvent){
-    	ownerAC.itemSelectEvent.subscribe(myHandler);
     	ownerAC.itemSelectEvent.subscribe(myHandler);
+    }
     return {
         memberDS: memberDS,
         ownerDS: ownerDS,
         membersAC: membersAC,
         ownerAC: ownerAC,
     };
 }();
 </script>
@@ \ No newline at end of file @@
 </script>

rhodecode/templates/admin/repos/repos.html

➞

Show inline comments

@@ @@ -11,114 +11,114 @@ @@
 </%def>
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
           <li>
             <span>${h.link_to(_(u'ADD REPOSITORY'),h.url('new_repo'))}</span>
           </li>
         </ul>
           </li>
         </ul>
     </div>
     <div class="table">
         <div id='repos_list_wrap' class="yui-skin-sam">
         <%cnt=0%>
         <%namespace name="dt" file="/_data_table/_dt_elements.html"/>
         <table id="repos_list">
          <thead>
           <tr>
             <th class="left"></th>
   	        <th class="left">${_('Name')}</th>
   	        <th class="left">${_('Description')}</th>
   	        <th class="left">${_('Last change')}</th>
   	        <th class="left">${_('Tip')}</th>
   	        <th class="left">${_('Contact')}</th>
             <th class="left">${_('Action')}</th>
           </tr>
          </thead>
           %for cnt,repo in enumerate(c.repos_list,1):
           <tr class="parity${cnt%2}">
               <td class="quick_repo_menu">
                 ${dt.quick_menu(repo['name'])}
               </td>
               <td class="reponame">
                 ${dt.repo_name(repo['name'],repo['dbrepo']['repo_type'],repo['dbrepo']['private'],repo['dbrepo_fork'].get('repo_name'))}
               </td>
               ##DESCRIPTION
               <td><span class="tooltip" title="${h.tooltip(repo['description'])}">
                  ${h.truncate(repo['description'],60)}</span>
               </td>
               ##LAST CHANGE
               <td>
                 <span class="tooltip" title="${repo['last_change']}">${h.age(repo['last_change'])}</span>
               </td>
               ##LAST REVISION
               <td>
-                  ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])}
                   ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])}
               </td>
             <td title="${repo['contact']}">${h.person(repo['contact'])}</td>
               <td>
                 ${h.form(url('repo', repo_name=repo['name']),method='delete')}
                   ${h.submit('remove_%s' % repo['name'],_('delete'),class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this repository: %s') % repo['name']+"');")}
                 ${h.end_form()}
               </td>
           </tr>
           %endfor
         </table>
         </div>
     </div>
-</div>
 </div>
 <script>
   // main table sorting
   var myColumnDefs = [
       {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},
       {key:"name",label:"${_('Name')}",sortable:true,
           sortOptions: { sortFunction: nameSort }},
       {key:"desc",label:"${_('Description')}",sortable:true},
       {key:"last_change",label:"${_('Last Change')}",sortable:true,
           sortOptions: { sortFunction: ageSort }},
       {key:"tip",label:"${_('Tip')}",sortable:true,
           sortOptions: { sortFunction: revisionSort }},
       {key:"owner",label:"${_('Owner')}",sortable:true},
       {key:"action",label:"${_('Action')}",sortable:false},
   ];
   var myDataSource = new YAHOO.util.DataSource(YUD.get("repos_list"));
   myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;
   myDataSource.responseSchema = {
       fields: [
           {key:"menu"},
           {key:"name"},
           {key:"desc"},
           {key:"last_change"},
           {key:"tip"},
           {key:"owner"},
           {key:"action"},
+      ]
   };
   var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,
+          {
             sortedBy:{key:"name",dir:"asc"},
             MSG_SORTASC:"${_('Click to sort ascending')}",
             MSG_SORTDESC:"${_('Click to sort descending')}",
             MSG_EMPTY:"${_('No records found.')}",
             MSG_ERROR:"${_('Data error.')}",
-            MSG_LOADING:"${_('Loading...')}",
             MSG_LOADING:"${_('Loading...')}",
+          }
   );
   myDataTable.subscribe('postRenderEvent',function(oArgs) {
       tooltip_activate();
       quick_repo_menu();
   });
 </script>
 </%def>
   });
 </script>
 </%def>

rhodecode/templates/admin/repos_groups/repos_groups.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Repository group')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs()">
-    <span class="groups_breadcrumbs"> ${_('Groups')}
     <span class="groups_breadcrumbs"> ${_('Groups')}
     %if c.group.parent_group:
         &raquo; ${h.link_to(c.group.parent_group.name,h.url('repos_group_home',group_name=c.group.parent_group.group_name))}
     %endif
     &raquo; "${c.group.name}" ${_('with')}
-    </span>
     </span>
 </%def>
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
 <%def name="main()">
         <%include file="/index_base.html" args="parent=self"/>
-</%def>
 </%def>

rhodecode/templates/admin/repos_groups/repos_groups_add.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Add repos group')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Repos groups'),h.url('repos_groups'))}
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Repos groups'),h.url('repos_groups'))}
     &raquo;
     ${_('add new repos group')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
-        ${self.breadcrumbs()}
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     ${h.form(url('repos_groups'))}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label">
                     <label for="group_name">${_('Group name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('group_name',class_='medium')}
                 </div>
              </div>
             <div class="field">
                 <div class="label label-textarea">
                     <label for="group_description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${h.textarea('group_description',cols=23,rows=5,class_="medium")}
                 </div>
              </div>
              <div class="field">
                  <div class="label">
                      <label for="group_parent_id">${_('Group parent')}:</label>
                  </div>
                  <div class="input">
                      ${h.select('group_parent_id','',c.repo_groups,class_="medium")}
                  </div>
              </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('save'),class_="ui-button")}
-            </div>
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 </%def>
 </div>
 </%def>

rhodecode/templates/admin/repos_groups/repos_groups_edit.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Edit repos group')} ${c.repos_group.name} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Repos groups'),h.url('repos_groups'))}
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Repos groups'),h.url('repos_groups'))}
     &raquo;
     ${_('edit repos group')} "${c.repos_group.name}"
 </%def>
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
-        ${self.breadcrumbs()}
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     ${h.form(url('repos_group',id=c.repos_group.group_id),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label">
                     <label for="group_name">${_('Group name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('group_name',class_='medium')}
                 </div>
              </div>
 	        <div class="field">
 	            <div class="label label-textarea">
 	                <label for="group_description">${_('Description')}:</label>
 	            </div>
 	            <div class="textarea text-area editor">
 	                ${h.textarea('group_description',cols=23,rows=5,class_="medium")}
 	            </div>
 	         </div>
 	         <div class="field">
 	             <div class="label">
 	                 <label for="group_parent_id">${_('Group parent')}:</label>
 	             </div>
 	             <div class="input">
 	                 ${h.select('group_parent_id','',c.repo_groups,class_="medium")}
 	             </div>
 	         </div>
 	         </div>
             <div class="buttons">
               ${h.submit('save',_('save'),class_="ui-button")}
-            </div>
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 </%def>
 </div>
 </%def>

rhodecode/templates/admin/repos_groups/repos_groups_show.html

➞

Show inline comments

@@ @@ -11,58 +11,58 @@ @@
 </%def>
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
           <li>
             <span>${h.link_to(_(u'ADD NEW GROUP'),h.url('new_repos_group'))}</span>
           </li>
         </ul>
           </li>
         </ul>
     </div>
     <!-- end box / title -->
     <div class="table">
            % if c.groups:
             <table class="table_disp">
                 <thead>
                     <tr>
                         <th class="left"><a href="#">${_('Group name')}</a></th>
                         <th class="left"><a href="#">${_('Description')}</a></th>
                         <th class="left"><a href="#">${_('Number of toplevel repositories')}</a></th>
                         <th class="left">${_('action')}</th>
                     </tr>
                 </thead>
                 ## REPO GROUPS
                 % for gr in c.groups:
                   <tr>
                       <td>
                           <div style="white-space: nowrap">
                           <img class="icon" alt="${_('Repositories group')}" src="${h.url('/images/icons/database_link.png')}"/>
                           ${h.link_to(h.literal(' &raquo; '.join([g.name for g in gr.parents+[gr]])),url('edit_repos_group',id=gr.group_id))}
                           </div>
                       </td>
                       <td>${gr.group_description}</td>
                       <td><b>${gr.repositories.count()}</b></td>
 		               <td>
 		                 ${h.form(url('repos_group', id=gr.group_id),method='delete')}
 		                   ${h.submit('remove_%s' % gr.name,'delete',class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this group: %s') % gr.name+"');")}
 		                 ${h.end_form()}
-		               </td>
 		               </td>
                   </tr>
                 % endfor
             </table>
             % else:
                 ${_('There are no repositories groups yet')}
             % endif
     </div>
 </div>
 </%def>
 </div>
 </%def>

rhodecode/templates/admin/settings/hooks.html

➞

Show inline comments

@@ @@ -8,89 +8,89 @@ @@
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))} &raquo; ${_('Settings')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
-        ${self.breadcrumbs()}
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     <h3>${_('Built in hooks - read only')}</h3>
     <div class="form">
         <div class="fields">
           % for hook in c.hooks:
           <div class="field">
 	        <div class="label label">
 	            <label for="${hook.ui_key}">${hook.ui_key}</label>
 	        </div>
 	        <div class="input" style="margin-left:280px">
                   ${h.text(hook.ui_key,hook.ui_value,size=60,readonly="readonly")}
 	        </div>
           </div>
           % endfor
 		</div>
     </div>
     <h3>${_('Custom hooks')}</h3>
     ${h.form(url('admin_setting', setting_id='hooks'),method='put')}
     <div class="form">
         <div class="fields">
           % for hook in c.custom_hooks:
           <div class="field"  id="${'id%s' % hook.ui_id }">
             <div class="label label">
                 <label for="${hook.ui_key}">${hook.ui_key}</label>
             </div>
-            <div class="input" style="margin-left:280px">
             <div class="input" style="margin-left:280px">
                 ${h.hidden('hook_ui_key',hook.ui_key)}
                 ${h.hidden('hook_ui_value',hook.ui_value)}
                 ${h.text('hook_ui_value_new',hook.ui_value,size=60)}
-                <span class="delete_icon action_button"
                 <span class="delete_icon action_button"
                 onclick="ajaxActionHook(${hook.ui_id},'${'id%s' % hook.ui_id }')">
                 ${_('remove')}
                 </span>
             </div>
           </div>
           % endfor
           % endfor
           <div class="field">
             <div class="input" style="margin-left:-180px;position: absolute;">
               <div class="input">
                  ${h.text('new_hook_ui_key',size=30)}
               </div>
             </div>
             <div class="input" style="margin-left:280px">
                 ${h.text('new_hook_ui_value',size=60)}
             </div>
           </div>
           <div class="buttons" style="margin-left:280px">
              ${h.submit('save',_('Save'),class_="ui-button")}
-          </div>
           </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 <script type="text/javascript">
 function ajaxActionHook(hook_id,field_id) {
     var sUrl = "${h.url('admin_setting', setting_id='hooks')}";
     var callback = {
         success: function (o) {
             var elem = YUD.get(""+field_id);
             elem.parentNode.removeChild(elem);
         },
         failure: function (o) {
             alert("${_('Failed to remove hook')}");
         },
     };
     var postData = '_method=delete&hook_id=' + hook_id;
     var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, postData);
 };
 </script>
 </%def>
 </%def>

rhodecode/templates/admin/settings/settings.html

➞

Show inline comments

@@ @@ -8,207 +8,207 @@ @@
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))} &raquo; ${_('Settings')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
-        ${self.breadcrumbs()}
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     <h3>${_('Remap and rescan repositories')}</h3>
     ${h.form(url('admin_setting', setting_id='mapping'),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
 			<div class="field">
 		        <div class="label label-checkbox">
 		            <label for="destroy">${_('rescan option')}:</label>
 		        </div>
 		        <div class="checkboxes">
 		            <div class="checkbox">
 		                ${h.checkbox('destroy',True)}
 		                <label for="destroy">
 		                <span class="tooltip" title="${h.tooltip(_('In case a repository was deleted from filesystem and there are leftovers in the database check this option to scan obsolete data in database and remove it.'))}">
 		                ${_('destroy old data')}</span> </label>
 		            </div>
 		        </div>
 			</div>
             <div class="buttons">
             ${h.submit('rescan',_('Rescan repositories'),class_="ui-button")}
-            </div>
             </div>
         </div>
-    </div>
     </div>
     ${h.end_form()}
     <h3>${_('Whoosh indexing')}</h3>
     ${h.form(url('admin_setting', setting_id='whoosh'),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
             <div class="field">
                 <div class="label label-checkbox">
                     <label>${_('index build option')}:</label>
                 </div>
                 <div class="checkboxes">
                     <div class="checkbox">
                         ${h.checkbox('full_index',True)}
                         <label for="full_index">${_('build from scratch')}</label>
                     </div>
                 </div>
             </div>
             <div class="buttons">
             ${h.submit('reindex',_('Reindex'),class_="ui-button")}
-            </div>
             </div>
         </div>
-    </div>
     </div>
     ${h.end_form()}
     <h3>${_('Global application settings')}</h3>
     <h3>${_('Global application settings')}</h3>
     ${h.form(url('admin_setting', setting_id='global'),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label">
                     <label for="rhodecode_title">${_('Application name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('rhodecode_title',size=30)}
                 </div>
              </div>
             <div class="field">
                 <div class="label">
                     <label for="rhodecode_realm">${_('Realm text')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('rhodecode_realm',size=30)}
                 </div>
             </div>
             <div class="field">
                 <div class="label">
                     <label for="rhodecode_ga_code">${_('GA code')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('rhodecode_ga_code',size=30)}
                 </div>
             </div>
             <div class="buttons">
                 ${h.submit('save',_('Save settings'),class_="ui-button")}
                 ${h.reset('reset',_('Reset'),class_="ui-button")}
-           </div>
            </div>
         </div>
-    </div>
     </div>
     ${h.end_form()}
-    <h3>${_('Mercurial settings')}</h3>
     <h3>${_('Mercurial settings')}</h3>
     ${h.form(url('admin_setting', setting_id='mercurial'),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label label-checkbox">
                     <label>${_('Web')}:</label>
                 </div>
                 <div class="checkboxes">
 					<div class="checkbox">
 						${h.checkbox('web_push_ssl','true')}
 						<label for="web_push_ssl">${_('require ssl for pushing')}</label>
 					</div>
 				</div>
-             </div>
              </div>
              <div class="field">
                 <div class="label label-checkbox">
                     <label>${_('Hooks')}:</label>
                 </div>
                 <div class="checkboxes">
 					<div class="checkbox">
 						${h.checkbox('hooks_changegroup_update','True')}
 						<label for="hooks_changegroup_update">${_('Update repository after push (hg update)')}</label>
 					</div>
 					<div class="checkbox">
 						${h.checkbox('hooks_changegroup_repo_size','True')}
 						<label for="hooks_changegroup_repo_size">${_('Show repository size after push')}</label>
 					</div>
                     <div class="checkbox">
                         ${h.checkbox('hooks_pretxnchangegroup_push_logger','True')}
                         <label for="hooks_pretxnchangegroup_push_logger">${_('Log user push commands')}</label>
                     </div>
                     <div class="checkbox">
                         ${h.checkbox('hooks_preoutgoing_pull_logger','True')}
                         <label for="hooks_preoutgoing_pull_logger">${_('Log user pull commands')}</label>
-                    </div>
                     </div>
 				</div>
                 <div class="input" style="margin-top:10px">
                     ${h.link_to(_('advanced setup'),url('admin_edit_setting',setting_id='hooks'),class_="ui-btn")}
                 </div>
              </div>
                 </div>
              </div>
             <div class="field">
                 <div class="label">
                     <label for="paths_root_path">${_('Repositories location')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('paths_root_path',size=30,readonly="readonly")}
 					<span id="path_unlock" class="tooltip"
                     ${h.text('paths_root_path',size=30,readonly="readonly")}
 					<span id="path_unlock" class="tooltip"
 						title="${h.tooltip(_('This a crucial application setting. If you are really sure you need to change this, you must restart application in order to make this setting take effect. Click this label to unlock.'))}">
 		                ${_('unlock')}</span>
                 </div>
             </div>
             <div class="buttons">
                 ${h.submit('save',_('Save settings'),class_="ui-button")}
                 ${h.reset('reset',_('Reset'),class_="ui-button")}
-           </div>
            </div>
         </div>
-    </div>
     </div>
     ${h.end_form()}
     <script type="text/javascript">
         YAHOO.util.Event.onDOMReady(function(){
             YAHOO.util.Event.addListener('path_unlock','click',function(){
                 YAHOO.util.Dom.get('paths_root_path').removeAttribute('readonly');
             });
         });
     </script>
     <h3>${_('Test Email')}</h3>
     ${h.form(url('admin_setting', setting_id='email'),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
             <div class="field">
                 <div class="label">
                     <label for="test_email">${_('Email to')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('test_email',size=30)}
                 </div>
             </div>
             <div class="buttons">
             ${h.submit('send',_('Send'),class_="ui-button")}
-            </div>
             </div>
         </div>
     </div>
     ${h.end_form()}
     </div>
     ${h.end_form()}
 </div>
-</%def>
 </%def>

rhodecode/templates/admin/users/user_add.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Add user')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Users'),h.url('users'))}
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Users'),h.url('users'))}
     &raquo;
     ${_('add new user')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
-        ${self.breadcrumbs()}
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     ${h.form(url('users'))}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label">
                     <label for="username">${_('Username')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('username',class_='small')}
                 </div>
              </div>
              <div class="field">
                 <div class="label">
                     <label for="password">${_('Password')}:</label>
                 </div>
                 <div class="input">
                     ${h.password('password',class_='small')}
                 </div>
              </div>
              <div class="field">
                 <div class="label">
                     <label for="password_confirmation">${_('Password confirmation')}:</label>
                 </div>
                 <div class="input">
                     ${h.password('password_confirmation',class_="small",autocomplete="off")}
                 </div>
              </div>
              </div>
              <div class="field">
                 <div class="label">
                     <label for="name">${_('First Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('name',class_='small')}
                 </div>
              </div>
              <div class="field">
                 <div class="label">
                     <label for="lastname">${_('Last Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('lastname',class_='small')}
                 </div>
              </div>
              <div class="field">
                 <div class="label">
                     <label for="email">${_('Email')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('email',class_='small')}
                 </div>
              </div>
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="active">${_('Active')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('active',value=True)}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('save'),class_="ui-button")}
-            </div>
             </div>
     	</div>
     </div>
     ${h.end_form()}
 </div>
 </%def>
 </div>
 </%def>

rhodecode/templates/admin/users/user_edit.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Edit user')} ${c.user.username} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Users'),h.url('users'))}
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Users'),h.url('users'))}
     &raquo;
     ${_('edit')} "${c.user.username}"
 </%def>
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box box-left">
     <!-- box / title -->
     <div class="title">
-        ${self.breadcrumbs()}
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     ${h.form(url('update_user', id=c.user.user_id),method='put')}
     <div class="form">
         <div class="field">
            <div class="gravatar_box">
                <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/></div>
                 <p>
                 %if c.use_gravatar:
                 <strong>${_('Change your avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong>
                 <br/>${_('Using')} ${c.user.email}
                 %else:
                 <br/>${c.user.email}
-                %endif
                 %endif
            </div>
         </div>
         <div class="field">
             <div class="label">
                 <label>${_('API key')}</label> ${c.user.api_key}
             </div>
         </div>
         <div class="fields">
              <div class="field">
                 <div class="label">
                     <label for="username">${_('Username')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('username',class_='medium')}
                 </div>
              </div>
              <div class="field">
                 <div class="label">
                     <label for="ldap_dn">${_('LDAP DN')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('ldap_dn',class_='medium')}
                 </div>
              </div>
              <div class="field">
                 <div class="label">
                     <label for="new_password">${_('New password')}:</label>
                 </div>
                 <div class="input">
                     ${h.password('new_password',class_='medium',autocomplete="off")}
                 </div>
              </div>
              <div class="field">
                 <div class="label">
                     <label for="password_confirmation">${_('New password confirmation')}:</label>
                 </div>
                 <div class="input">
                     ${h.password('password_confirmation',class_="medium",autocomplete="off")}
                 </div>
              </div>
              <div class="field">
                 <div class="label">
                     <label for="name">${_('First Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('name',class_='medium')}
                 </div>
              </div>
              <div class="field">
                 <div class="label">
                     <label for="lastname">${_('Last Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('lastname',class_='medium')}
                 </div>
              </div>
              <div class="field">
                 <div class="label">
                     <label for="email">${_('Email')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('email',class_='medium')}
                 </div>
              </div>
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="active">${_('Active')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('active',value=True)}
                 </div>
              </div>
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="admin">${_('Admin')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('admin',value=True)}
                 </div>
-             </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="ui-button")}
               ${h.reset('reset',_('Reset'),class_="ui-button")}
             </div>
     	</div>
             </div>
     	</div>
     </div>
     ${h.end_form()}
 </div>
 <div class="box box-right">
     <!-- box / title -->
     <div class="title">
-        <h5>${_('Permissions')}</h5>
         <h5>${_('Permissions')}</h5>
     </div>
     ${h.form(url('user_perm', id=c.user.user_id),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="create_repo_perm">${_('Create repositories')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('create_repo_perm',value=True)}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="ui-button")}
               ${h.reset('reset',_('Reset'),class_="ui-button")}
             </div>
         </div>
             </div>
         </div>
     </div>
-    ${h.end_form()}
     ${h.end_form()}
 </div>
 </%def>

rhodecode/templates/admin/users/user_edit_my_account.html

➞

Show inline comments

@@ @@ -9,182 +9,182 @@ @@
     ${_('My Account')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box box-left">
     <!-- box / title -->
     <div class="title">
-        ${self.breadcrumbs()}
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     <div>
     ${h.form(url('admin_settings_my_account_update'),method='put')}
 	    <div class="form">
              <div class="field">
                 <div class="gravatar_box">
                     <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/></div>
                     <p>
                     %if c.use_gravatar:
                     <strong>${_('Change your avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong>
                     <br/>${_('Using')} ${c.user.email}
                     %else:
                     <br/>${c.user.email}
-                    %endif
                     %endif
                     </p>
                 </div>
-             </div>
              </div>
 	        <div class="field">
 	            <div class="label">
 	                <label>${_('API key')}</label> ${c.user.api_key}
 	            </div>
-	        </div>
 	        </div>
 	        <div class="fields">
 	             <div class="field">
 	                <div class="label">
 	                    <label for="username">${_('Username')}:</label>
 	                </div>
 	                <div class="input">
 	                    ${h.text('username',class_="medium")}
 	                </div>
 	             </div>
 	             <div class="field">
 	                <div class="label">
 	                    <label for="new_password">${_('New password')}:</label>
 	                </div>
 	                <div class="input">
 	                    ${h.password('new_password',class_="medium",autocomplete="off")}
 	                </div>
 	             </div>
                  <div class="field">
                     <div class="label">
                         <label for="password_confirmation">${_('New password confirmation')}:</label>
                     </div>
                     <div class="input">
                         ${h.password('password_confirmation',class_="medium",autocomplete="off")}
                     </div>
                  </div>
 	             <div class="field">
 	                <div class="label">
 	                    <label for="name">${_('First Name')}:</label>
 	                </div>
 	                <div class="input">
 	                    ${h.text('name',class_="medium")}
 	                </div>
 	             </div>
 	             <div class="field">
 	                <div class="label">
 	                    <label for="lastname">${_('Last Name')}:</label>
 	                </div>
 	                <div class="input">
 	                    ${h.text('lastname',class_="medium")}
 	                </div>
 	             </div>
 	             <div class="field">
 	                <div class="label">
 	                    <label for="email">${_('Email')}:</label>
 	                </div>
 	                <div class="input">
 	                    ${h.text('email',class_="medium")}
 	                </div>
 	             </div>
 	            <div class="buttons">
 	              ${h.submit('save',_('Save'),class_="ui-button")}
 	              ${h.reset('reset',_('Reset'),class_="ui-button")}
-	            </div>
 	            </div>
 	    	</div>
-	    </div>
 	    </div>
     ${h.end_form()}
     </div>
-</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...')}"/>
         <h5>
         <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/>
         ${_('My repositories')}
         </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
            </li>
          </ul>
          %endif
     </div>
     <!-- end box / title -->
     <div class="table">
 	    <table>
 	    <thead>
             <tr>
             <th class="left">${_('Name')}</th>
             <th class="left">${_('revision')}</th>
-            <th colspan="2" class="left">${_('action')}</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
                      %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']}"
 		            	title="${_('Fork of')} ${repo['dbrepo_fork']['repo_name']}"
 		            	src="${h.url('/images/icons/arrow_divide.png')}"/></a>
 		            %endif
 		            </td>
 		            %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: %s') % repo['name']+"');")}
-	                  ${h.end_form()}
 	                  ${h.end_form()}
 		            </td>
 		        </tr>
 		     %endfor
 	     %else:
             <div style="padding:5px 0px 10px 0px;">
-	     	${_('No repositories yet')}
 	     	${_('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-btn")}
 	     	%endif
             </div>
 	     %endif
 	     </tbody>
 	     </table>
     </div>
 </div>
 <script type="text/javascript">
 var nodes = YUQ('div.table tr td a.repo_name');
 var target = 'q_filter';
 var func = function(node){
     return node.parentNode.parentNode;
+}
 q_filter(target,nodes,func);
 </script>
-</%def>
 </%def>

rhodecode/templates/admin/users/users.html

➞

Show inline comments

@@ @@ -13,26 +13,26 @@ @@
 	${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
           <li>
             <span>${h.link_to(_(u'ADD NEW USER'),h.url('new_user'))}</span>
           </li>
         </ul>
         </ul>
     </div>
     <!-- end box / title -->
     <div class="table">
         <table class="table_disp">
         <tr class="header">
         	<th></th>
             <th class="left">${_('username')}</th>
             <th class="left">${_('name')}</th>
             <th class="left">${_('lastname')}</th>
             <th class="left">${_('last login')}</th>
             <th class="left">${_('active')}</th>
             <th class="left">${_('admin')}</th>

rhodecode/templates/admin/users_groups/users_group_add.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Add users group')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Users groups'),h.url('users_groups'))}
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Users groups'),h.url('users_groups'))}
     &raquo;
     ${_('add new users group')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
-        ${self.breadcrumbs()}
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     ${h.form(url('users_groups'))}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label">
                     <label for="users_group_name">${_('Group name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('users_group_name',class_='small')}
                 </div>
              </div>
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="users_group_active">${_('Active')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('users_group_active',value=True)}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('save'),class_="ui-button")}
-            </div>
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 </%def>
 </div>
 </%def>

rhodecode/templates/admin/users_groups/users_group_edit.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Edit users group')} ${c.users_group.users_group_name} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('UsersGroups'),h.url('users_groups'))}
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('UsersGroups'),h.url('users_groups'))}
     &raquo;
     ${_('edit')} "${c.users_group.users_group_name}"
 </%def>
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box box-left">
     <!-- box / title -->
     <div class="title">
-        ${self.breadcrumbs()}
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     ${h.form(url('users_group', id=c.users_group.users_group_id),method='put', id='edit_users_group')}
     <div class="form">
         <!-- fields -->
 	        <div class="fields">
 	             <div class="field">
 	                <div class="label">
 	                    <label for="users_group_name">${_('Group name')}:</label>
 	                </div>
 	                <div class="input">
 	                    ${h.text('users_group_name',class_='small')}
 	                </div>
 	             </div>
 	             <div class="field">
 	                <div class="label label-checkbox">
 	                    <label for="users_group_active">${_('Active')}:</label>
 	                </div>
 	                <div class="checkboxes">
 	                    ${h.checkbox('users_group_active',value=True)}
 	                </div>
 	             </div>
 	            <div class="field">
                     <div class="label">
                         <label for="users_group_active">${_('Members')}:</label>
                     </div>
                     <div class="select">
-	                    <table>
 	                    <table>
 	                            <tr>
 	                                <td>
 	                                    <div>
 	                                        <div style="float:left">
 	                                            <div class="text" style="padding: 0px 0px 6px;">${_('Choosen group members')}</div>
 	                                            ${h.select('users_group_members',[x[0] for x in c.group_members],c.group_members,multiple=True,size=8,style="min-width:210px")}
 	                                           <div  id="remove_all_elements" style="cursor:pointer;text-align:center">
 	                                               ${_('Remove all elements')}
 	                                               <img alt="remove" style="vertical-align:text-bottom" src="${h.url('/images/icons/arrow_right.png')}"/>
 	                                           </div>
 	                                        </div>
 	                                        <div style="float:left;width:20px;padding-top:50px">
 	                                            <img alt="add" id="add_element"
 	                                                style="padding:2px;cursor:pointer"
 	                                            <img alt="add" id="add_element"
 	                                                style="padding:2px;cursor:pointer"
 	                                                src="${h.url('/images/icons/arrow_left.png')}"/>
 	                                            <br />
 	                                            <img alt="remove" id="remove_element"
 	                                                style="padding:2px;cursor:pointer"
 	                                            <img alt="remove" id="remove_element"
 	                                                style="padding:2px;cursor:pointer"
 	                                                src="${h.url('/images/icons/arrow_right.png')}"/>
 	                                        </div>
 	                                        <div style="float:left">
 	                                             <div class="text" style="padding: 0px 0px 6px;">${_('Available members')}</div>
 	                                             ${h.select('available_members',[],c.available_members,multiple=True,size=8,style="min-width:210px")}
 	                                             <div id="add_all_elements" style="cursor:pointer;text-align:center">
 	                                                   <img alt="add" style="vertical-align:text-bottom" src="${h.url('/images/icons/arrow_left.png')}"/>
 	                                                    ${_('Add all elements')}
-	                                             </div>
 	                                             </div>
 	                                        </div>
 	                                    </div>
 	                                </td>
 	                            </tr>
 	                    </table>
                     </div>
 	                                </td>
 	                            </tr>
 	                    </table>
                     </div>
-                </div>
                 </div>
                 <div class="buttons">
                   ${h.submit('save',_('save'),class_="ui-button")}
                 </div>
             </div>
     </div>
 ${h.end_form()}
                 </div>
             </div>
     </div>
 ${h.end_form()}
 </div>
 <script type="text/javascript">
     YAHOO.util.Event.onDOMReady(function(){
             var D = YAHOO.util.Dom;
             var E = YAHOO.util.Event;
             //definition of containers ID's
             var available_container = 'available_members';
             var selected_container = 'users_group_members';
             //form containing containers id
             var form_id = 'edit_users_group';
             //temp container for selected storage.
             var cache = new Array();
             var av_cache = new Array();
             var c =  D.get(selected_container);
             var ac = D.get(available_container);
             //get only selected options for further fullfilment
             for(var i = 0;node =c.options[i];i++){
                 if(node.selected){
                     //push selected to my temp storage left overs :)
                     cache.push(node);
+                }
+            }
             //clear 'selected' select
             //c.options.length = 0;
             //fill it with remembered options
             //for(var i = 0;node = cache[i];i++){
             //   c.options[i]=new Option(node.text, node.value, false, false);
             //}
             //get all available options to cache
             for(var i = 0;node =ac.options[i];i++){
                     //push selected to my temp storage left overs :)
                     av_cache.push(node);
+            }
+            }
             //fill available only with those not in choosen
             ac.options.length=0;
             tmp_cache = new Array();
             for(var i = 0;node = av_cache[i];i++){
             	var add = true;
 	            for(var i2 = 0;node_2 = cache[i2];i2++){
 	                if(node.value == node_2.value){
 	                	add=false;
 	                	break;
+	                }
+	            }
 	            if(add){
 	            	tmp_cache.push(new Option(node.text, node.value, false, false));
+	            }
+            }
+            }
             for(var i = 0;node = tmp_cache[i];i++){
                 ac.options[i] = node;
+            }
             function prompts_action_callback(e){
                 var choosen = D.get(selected_container);
                 var choosen = D.get(selected_container);
                 var available = D.get(available_container);
                 //get checked and unchecked options from field
                 function get_checked(from_field){
                     //temp container for storage.
                     var sel_cache = new Array();
                     var oth_cache = new Array();
                     for(var i = 0;node = from_field.options[i];i++){
                         if(node.selected){
                             //push selected fields :)
                             sel_cache.push(node);
+                        }
                         else{
                         	oth_cache.push(node)
+                        }
+                    }
+                    }
                     return [sel_cache,oth_cache]
+                }
                 //fill the field with given options
                 function fill_with(field,options){
                 	//clear firtst
                 	field.options.length=0;
                     for(var i = 0;node = options[i];i++){
-                            field.options[i]=new Option(node.text, node.value,
                             field.options[i]=new Option(node.text, node.value,
                                     false, false);
+                    }
+                }
                 //adds to current field
                 function add_to(field,options){
                     for(var i = 0;node = options[i];i++){
-                            field.appendChild(new Option(node.text, node.value,
                             field.appendChild(new Option(node.text, node.value,
                                     false, false));
+                    }
+                }
                 // add action
                 if (this.id=='add_element'){
                     var c = get_checked(available);
                     add_to(choosen,c[0]);
                     fill_with(available,c[1]);
+                }
                 // remove action
                 if (this.id=='remove_element'){
                     var c = get_checked(choosen);
                     add_to(available,c[0]);
                     fill_with(choosen,c[1]);
+                }
                     fill_with(choosen,c[1]);
+                }
                 // add all elements
                 if(this.id=='add_all_elements'){
                     for(var i=0; node = available.options[i];i++){
-                            choosen.appendChild(new Option(node.text,
                             choosen.appendChild(new Option(node.text,
                                     node.value, false, false));
+                    }
                     available.options.length = 0;
+                }
                 //remove all elements
                 if(this.id=='remove_all_elements'){
                     for(var i=0; node = choosen.options[i];i++){
-                        available.appendChild(new Option(node.text,
                         available.appendChild(new Option(node.text,
                                 node.value, false, false));
+                    }
-                    choosen.options.length = 0;
                     choosen.options.length = 0;
+                }
+            }
             E.addListener(['add_element','remove_element',
                            'add_all_elements','remove_all_elements'],'click',
                            prompts_action_callback)
             E.addListener(form_id,'submit',function(){
                 var choosen = D.get(selected_container);
                 for (var i = 0; i < choosen.options.length; i++) {
                     choosen.options[i].selected = 'selected';
+                }
-            })
             })
         });
-</script>
 </script>
 <div class="box box-right">
     <!-- box / title -->
     <div class="title">
-        <h5>${_('Permissions')}</h5>
         <h5>${_('Permissions')}</h5>
     </div>
     ${h.form(url('users_group_perm', id=c.users_group.users_group_id), method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="create_repo_perm">${_('Create repositories')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('create_repo_perm',value=True)}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="ui-button")}
               ${h.reset('reset',_('Reset'),class_="ui-button")}
             </div>
         </div>
             </div>
         </div>
     </div>
-    ${h.end_form()}
     ${h.end_form()}
 </div>
-</%def>
 </%def>

rhodecode/templates/admin/users_groups/users_groups.html

➞

Show inline comments

@@ @@ -13,26 +13,26 @@ @@
     ${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
           <li>
             <span>${h.link_to(_(u'ADD NEW USER GROUP'),h.url('new_users_group'))}</span>
           </li>
         </ul>
         </ul>
     </div>
     <!-- end box / title -->
     <div class="table">
         <table class="table_disp">
         <tr class="header">
             <th class="left">${_('group name')}</th>
             <th class="left">${_('members')}</th>
             <th class="left">${_('active')}</th>
             <th class="left">${_('action')}</th>
         </tr>
             %for cnt,u_group in enumerate(c.users_groups_list):
                 <tr class="parity${cnt%2}">

rhodecode/templates/base/base.html

➞

Show inline comments

@@ @@ -8,64 +8,64 @@ @@
          <li class="first">
 			<div id="quick_login" style="display:none">
 			${h.form(h.url('login_home',came_from=h.url.current()))}
 			<div class="form">
 			    <div class="fields">
 			        <div class="field">
 			            <div class="label">
 			                <label for="username">${_('Username')}:</label>
 			            </div>
 			            <div class="input">
 			                ${h.text('username',class_='focus',size=40)}
 			            </div>
 			        </div>
 			        </div>
 			        <div class="field">
 			            <div class="label">
 			                <label for="password">${_('Password')}:</label>
 			            </div>
 			            <div class="input">
 			                ${h.password('password',class_='focus',size=40)}
 			            </div>
 			        </div>
 			        <div class="buttons">
 			            <div class="password_forgoten">${h.link_to(_('Forgot password ?'),h.url('reset_password'))}</div>
                         <div class="register">
                         %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
                          ${h.link_to(_("Don't have an account ?"),h.url('register'))}
-                        %endif
                         %endif
                         </div>
                             ${h.submit('sign_in',_('Sign In'),class_="ui-button")}
 			        </div>
 			    </div>
 			</div>
 			${h.end_form()}
 			</div>
 			</div>
              <div class="gravatar">
                  <img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,20)}" />
              </div>
           <div class="account">
           %if c.rhodecode_user.username == 'default':
               <a href="${h.url('public_journal')}">${_('Public journal')}</a>
           %else:
               <a href="${h.url('public_journal')}">${_('Public journal')}</a>
           %else:
           	<div style="float: left">
             ${h.link_to(c.rhodecode_user.username,h.url('admin_settings_my_account'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))}
             </div>
             <div class="notifications">
             <a id="notification_counter" href="${h.url('notifications')}">${c.unread_notifications}</a>
             </div>
           %endif
-          </div>
           </div>
          </li>
          <li>
             <a href="${h.url('home')}">${_('Home')}</a>
          </li>
          %if c.rhodecode_user.username != 'default':
             <li>
                <a href="${h.url('journal')}">${_('Journal')}</a>
             </li>
             %endif
             %if c.rhodecode_user.username == 'default':
                 <li class="last highlight">${h.link_to(_(u'Login'),h.url('login_home'),id='quick_login_link')}</li>
             %else:
@@ @@ -73,264 +73,264 @@ @@
             %endif
     </ul>
     <!-- end user -->
     <div id="header-inner" class="title">
         <div id="logo">
             <h1><a href="${h.url('home')}">${c.rhodecode_name}</a></h1>
         </div>
         <!-- MENU -->
         ${self.page_nav()}
         <!-- END MENU -->
         ${self.body()}
     </div>
-</div>
 </div>
 <!-- END HEADER -->
 <!-- CONTENT -->
-<div id="content">
 <div id="content">
     <div class="flash_msg">
         <% messages = h.flash.pop_messages() %>
         % if messages:
         <ul id="flash-messages">
             % for message in messages:
             <li class="${message.category}_msg">${message}</li>
             % endfor
         </ul>
         % endif
     </div>
     <div id="main">
     </div>
     <div id="main">
         ${next.main()}
     </div>
-</div>
 </div>
 <!-- END CONTENT -->
 <!-- FOOTER -->
 <div id="footer">
    <div id="footer-inner" class="title">
        <div>
            <p class="footer-link">
                 <a href="${h.url('bugtracker')}">${_('Submit a bug')}</a>
            </p>
 	       <p class="footer-link-right">
-	           <a href="${h.url('rhodecode_official')}">RhodeCode</a>
 	           <a href="${h.url('rhodecode_official')}">RhodeCode</a>
 	           ${c.rhodecode_version} &copy; 2010-${h.datetime.today().year} by Marcin Kuzminski
 	       </p>
        </div>
    </div>
 </div>
 <!-- END FOOTER -->
 ### MAKO DEFS ###
 <%def name="page_nav()">
     ${self.menu()}
 </%def>
 <%def name="breadcrumbs()">
     <div class="breadcrumbs">
     ${self.breadcrumbs_links()}
     </div>
 </%def>
 <%def name="menu(current=None)">
-		<%
 		<%
 		def is_current(selected):
 			if selected == current:
 				return h.literal('class="current"')
 		%>
 		%if current not in ['home','admin']:
 		   ##REGULAR MENU
 		%if current not in ['home','admin']:
 		   ##REGULAR MENU
 	        <ul id="quick">
 				<!-- repo switcher -->
 				<li>
 					<a id="repo_switcher" title="${_('Switch repository')}" href="#">
                     <span class="icon">
                         <img src="${h.url('/images/icons/database.png')}" alt="${_('Products')}" />
                     </span>
-                    <span>&darr;</span>
                     <span>&darr;</span>
 					</a>
 					<ul id="repo_switcher_list" class="repo_switcher">
                         <li>
                             <a href="#">${_('loading...')}</a>
                         </li>
 					</ul>
 				</li>
 	            <li ${is_current('summary')}>
 	               <a title="${_('Summary')}" href="${h.url('summary_home',repo_name=c.repo_name)}">
 	               <span class="icon">
 	                   <img src="${h.url('/images/icons/clipboard_16.png')}" alt="${_('Summary')}" />
 	               </span>
 	               <span>${_('Summary')}</span>
 	               </a>
 	               <span>${_('Summary')}</span>
 	               </a>
 	            </li>
                 ##<li ${is_current('shortlog')}>
                 ##   <a title="${_('Shortlog')}" href="${h.url('shortlog_home',repo_name=c.repo_name)}">
                 ##   <span class="icon">
                 ##       <img src="${h.url('/images/icons/application_view_list.png')}" alt="${_('Shortlog')}" />
                 ##   </span>
                 ##   <span>${_('Shortlog')}</span>
                 ##   </a>
                 ##</li>
                 ##   <span>${_('Shortlog')}</span>
                 ##   </a>
                 ##</li>
                 <li ${is_current('changelog')}>
                    <a title="${_('Changelog')}" href="${h.url('changelog_home',repo_name=c.repo_name)}">
                    <span class="icon">
                        <img src="${h.url('/images/icons/time.png')}" alt="${_('Changelog')}" />
                    </span>
                    <span>${_('Changelog')}</span>
                    </a>
                 </li>
                    <span>${_('Changelog')}</span>
                    </a>
                 </li>
                 <li ${is_current('switch_to')}>
                    <a id="branch_tag_switcher" title="${_('Switch to')}" href="#">
                    <span class="icon">
                        <img src="${h.url('/images/icons/arrow_switch.png')}" alt="${_('Switch to')}" />
                    </span>
                    <span>${_('Switch to')}</span>
                    </a>
                    <span>${_('Switch to')}</span>
                    </a>
                     <ul id="switch_to_list" class="switch_to">
                         <li><a href="#">${_('loading...')}</a></li>
-                    </ul>
                     </ul>
                 </li>
                 <li ${is_current('files')}>
                    <a title="${_('Files')}" href="${h.url('files_home',repo_name=c.repo_name)}">
                    <span class="icon">
                        <img src="${h.url('/images/icons/file.png')}" alt="${_('Files')}" />
                    </span>
                    <span>${_('Files')}</span>
                    </a>
                 </li>
                    <span>${_('Files')}</span>
                    </a>
                 </li>
                 <li ${is_current('options')}>
                    <a title="${_('Options')}" href="#">
                    <span class="icon">
                        <img src="${h.url('/images/icons/table_gear.png')}" alt="${_('Admin')}" />
                    </span>
-                   <span>${_('Options')}</span>
                    <span>${_('Options')}</span>
                    </a>
                    <ul>
                    %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
                      %if h.HasPermissionAll('hg.admin')('access settings on repository'):
                          <li>${h.link_to(_('settings'),h.url('edit_repo',repo_name=c.repo_name),class_='settings')}</li>
                      %else:
                          <li>${h.link_to(_('settings'),h.url('repo_settings_home',repo_name=c.repo_name),class_='settings')}</li>
                      %endif
                    %endif
                    	<li>${h.link_to(_('fork'),h.url('repo_fork_home',repo_name=c.repo_name),class_='fork')}</li>
                    	<li>${h.link_to(_('search'),h.url('search_repo',search_repo=c.repo_name),class_='search')}</li>
                     % if h.HasPermissionAll('hg.admin')('access admin main page'):
                      <li>
-                       ${h.link_to(_('admin'),h.url('admin_home'),class_='admin')}
                        ${h.link_to(_('admin'),h.url('admin_home'),class_='admin')}
                         <%def name="admin_menu()">
                         <ul>
                             <li>${h.link_to(_('journal'),h.url('admin_home'),class_='journal')}</li>
                             <li>${h.link_to(_('repositories'),h.url('repos'),class_='repos')}</li>
                             <li>${h.link_to(_('repositories groups'),h.url('repos_groups'),class_='repos_groups')}</li>
                             <li>${h.link_to(_('users'),h.url('users'),class_='users')}</li>
                             <li>${h.link_to(_('users groups'),h.url('users_groups'),class_='groups')}</li>
                             <li>${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li>
                             <li>${h.link_to(_('ldap'),h.url('ldap_home'),class_='ldap')}</li>
-                            <li class="last">${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}</li>
                             <li class="last">${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}</li>
                         </ul>
                         </%def>
                         ${admin_menu()}
                      </li>
                     % endif
-                   </ul>
                    </ul>
                 </li>
                 <li>
                     <a title="${_('Followers')}" href="${h.url('repo_followers_home',repo_name=c.repo_name)}">
                     <span class="icon_short">
                         <img src="${h.url('/images/icons/heart.png')}" alt="${_('Followers')}" />
                     </span>
                     <span id="current_followers_count" class="short">${c.repository_followers}</span>
                     </a>
                 </li>
                 <li>
                     <a title="${_('Forks')}" href="${h.url('repo_forks_home',repo_name=c.repo_name)}">
                     <span class="icon_short">
                         <img src="${h.url('/images/icons/arrow_divide.png')}" alt="${_('Forks')}" />
                     </span>
                     <span class="short">${c.repository_forks}</span>
                     </a>
-                </li>
                 </li>
 	        </ul>
             <script type="text/javascript">
                YUE.on('repo_switcher','mouseover',function(){
                       function qfilter(){
                           var nodes = YUQ('ul#repo_switcher_list li a.repo_name');
                           var target = 'q_filter_rs';
                           var func = function(node){
                               return node.parentNode;
+                          }
                           q_filter(target,nodes,func);
+                          }
                           q_filter(target,nodes,func);
+                      }
                    var loaded = YUD.hasClass('repo_switcher','loaded');
                    if(!loaded){
                        YUD.addClass('repo_switcher','loaded');
                        ypjax("${h.url('repo_switcher')}",'repo_switcher_list',
                            function(o){qfilter();},
                            function(o){YUD.removeClass('repo_switcher','loaded');}
                            ,null);
+                   }
                    return false;
                });
               YUE.on('branch_tag_switcher','mouseover',function(){
                  var loaded = YUD.hasClass('branch_tag_switcher','loaded');
                  if(!loaded){
                      YUD.addClass('branch_tag_switcher','loaded');
                      ypjax("${h.url('branch_tag_switcher',repo_name=c.repo_name)}",'switch_to_list',
                          function(o){},
                          function(o){YUD.removeClass('branch_tag_switcher','loaded');}
                          ,null);
+                 }
                  return false;
               });
-            </script>
             </script>
 		%else:
 		    ##ROOT MENU
             <ul id="quick">
                 <li>
                     <a title="${_('Home')}"  href="${h.url('home')}">
                     <span class="icon">
                         <img src="${h.url('/images/icons/home_16.png')}" alt="${_('Home')}" />
                     </span>
                     <span>${_('Home')}</span>
                     </a>
                     <span>${_('Home')}</span>
                     </a>
                 </li>
                 % if c.rhodecode_user.username != 'default':
                  <li>
                     <a title="${_('Journal')}"  href="${h.url('journal')}">
                     <span class="icon">
                         <img src="${h.url('/images/icons/book.png')}" alt="${_('Journal')}" />
                     </span>
                     <span>${_('Journal')}</span>
                     </a>
                     <span>${_('Journal')}</span>
                     </a>
                  </li>
                 % endif
                 <li>
                     <a title="${_('Search')}"  href="${h.url('search')}">
                     <span class="icon">
                         <img src="${h.url('/images/icons/search_16.png')}" alt="${_('Search')}" />
                     </span>
                     <span>${_('Search')}</span>
                     </a>
                     <span>${_('Search')}</span>
                     </a>
                 </li>
 				%if h.HasPermissionAll('hg.admin')('access admin main page'):
                 <li ${is_current('admin')}>
                    <a title="${_('Admin')}" href="${h.url('admin_home')}">
                    <span class="icon">
                        <img src="${h.url('/images/icons/cog_edit.png')}" alt="${_('Admin')}" />
                    </span>
-                   <span>${_('Admin')}</span>
                    <span>${_('Admin')}</span>
                    </a>
                     ${admin_menu()}
                 </li>
 				%endif
 			</ul>
 		%endif
 </%def>

rhodecode/templates/base/root.html

➞

Show inline comments

@@ @@ -7,136 +7,136 @@ @@
         <meta name="robots" content="index, nofollow"/>
         <link rel="icon" href="${h.url('/images/icons/database_gear.png')}" type="image/png" />
         ## CSS ###
         <%def name="css()">
             <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css')}" media="screen"/>
             <link rel="stylesheet" type="text/css" href="${h.url('/css/pygments.css')}"/>
             ## EXTRA FOR CSS
             ${self.css_extra()}
         </%def>
         <%def name="css_extra()">
         </%def>
         ${self.css()}
         %if c.ga_code:
         <!-- Analytics -->
 	     <script type="text/javascript">
 	      var _gaq = _gaq || [];
 	      _gaq.push(['_setAccount', '${c.ga_code}']);
 	      _gaq.push(['_trackPageview']);
 	      (function() {
 	        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
 	        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
 	        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
 	      })();
 	     </script>
 	    %endif
         ## JAVASCRIPT ##
         <%def name="js()">
             <script type="text/javascript" src="${h.url('/js/yui.2.9.js')}"></script>
             <!--[if IE]>
                <script language="javascript" type="text/javascript" src="${h.url('/js/excanvas.min.js')}"></script>
             <![endif]-->
             <script type="text/javascript" src="${h.url('/js/yui.flot.js')}"></script>
             <script type="text/javascript" src="${h.url('/js/rhodecode.js')}"></script>
            ## EXTRA FOR JS
            ${self.js_extra()}
             <script type="text/javascript">
             var follow_base_url  = "${h.url('toggle_following')}";
             var stop_follow_text = "${_('Stop following this repository')}";
             var start_follow_text = "${_('Start following this repository')}";
             var start_follow_text = "${_('Start following this repository')}";
             var onSuccessFollow = function(target){
                 var f = YUD.get(target.id);
                 var f_cnt = YUD.get('current_followers_count');
                 if(f.getAttribute('class')=='follow'){
                     f.setAttribute('class','following');
                     f.setAttribute('title',stop_follow_text);
                     if(f_cnt){
                         var cnt = Number(f_cnt.innerHTML)+1;
                         f_cnt.innerHTML = cnt;
+                    }
+                }
                 else{
                     f.setAttribute('class','follow');
                     f.setAttribute('title',start_follow_text);
                     if(f_cnt){
                         var cnt = Number(f_cnt.innerHTML)+1;
                         f_cnt.innerHTML = cnt;
+                    }
+                    }
+                }
+            }
             var toggleFollowingUser = function(target,fallows_user_id,token,user_id){
                 args = 'follows_user_id='+fallows_user_id;
                 args+= '&amp;auth_token='+token;
                 if(user_id != undefined){
                     args+="&amp;user_id="+user_id;
+                }
                 YUC.asyncRequest('POST',follow_base_url,{
                     success:function(o){
                     	onSuccessFollow(target);
+                    }
                 },args);
                 return false;
+            }
             var toggleFollowingRepo = function(target,fallows_repo_id,token,user_id){
                 args = 'follows_repo_id='+fallows_repo_id;
                 args+= '&amp;auth_token='+token;
                 if(user_id != undefined){
                     args+="&amp;user_id="+user_id;
+                }
+                }
                 YUC.asyncRequest('POST',follow_base_url,{
                     success:function(o){
                     	onSuccessFollow(target);
+                    }
-                },args);
                 },args);
                 return false;
+            }
            YUE.onDOMReady(function(){
              tooltip_activate();
              show_more_event();
              show_more_event();
              YUE.on('quick_login_link','click',function(e){
-                 // make sure we don't redirect
                  // make sure we don't redirect
                  YUE.preventDefault(e);
                  if(YUD.hasClass('quick_login_link','enabled')){
                      YUD.setStyle('quick_login','display','none');
                      YUD.removeClass('quick_login_link','enabled');
+                 }
                  else{
                      YUD.setStyle('quick_login','display','');
                      YUD.addClass('quick_login_link','enabled');
                      YUD.get('username').focus();
+                 }
              });
             // hover menu
             // hover menu
             YUE.on(window,'scroll',function(){
                 if(YUD.getDocumentScrollTop() > 45){
                       YUD.addClass('header-inner','hover');
+                }
                 else{
                     YUD.removeClass('header-inner','hover');
+                }
             })
-           })
            })
             </script>
         </%def>
         <%def name="js_extra()"></%def>
         ${self.js()}
     </head>
     <body id="body">
         ${next.body()}
     </body>
 </html>
@@ \ No newline at end of file @@
 </html>

rhodecode/templates/bookmarks/bookmarks.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${c.repo_name} ${_('Bookmarks')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     <input class="q_filter_box" id="q_filter_bookmarks" size="15" type="text" name="filter" value="${_('quick filter...')}"/>
     ${h.link_to(u'Home',h.url('/'))}
-    &raquo;
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
     ${_('bookmarks')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('bookmarks')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
@@ @@ -52,27 +52,27 @@ myDataSource.responseSchema = { @@
         {key:"author"},
         {key:"revision"},
+    ]
 };
 var myDataTable = new YAHOO.widget.DataTable("table_wrap", myColumnDefs, myDataSource,
+        {
          sortedBy:{key:"name",dir:"asc"},
          MSG_SORTASC:"${_('Click to sort ascending')}",
          MSG_SORTDESC:"${_('Click to sort descending')}",
          MSG_EMPTY:"${_('No records found.')}",
          MSG_ERROR:"${_('Data error.')}",
-         MSG_LOADING:"${_('Loading...')}",
          MSG_LOADING:"${_('Loading...')}",
+        }
 );
 myDataTable.subscribe('postRenderEvent',function(oArgs) {
     tooltip_activate();
     var func = function(node){
         return node.parentNode.parentNode.parentNode.parentNode.parentNode;
+    }
     q_filter('q_filter_bookmarks',YUQ('div.table tr td .logbooks .bookbook a'),func);
 });
     q_filter('q_filter_bookmarks',YUQ('div.table tr td .logbooks .bookbook a'),func);
 });
 </script>
 </%def>
@@ \ No newline at end of file @@
 </%def>

rhodecode/templates/bookmarks/bookmarks_data.html

➞

Show inline comments

 %if c.repo_bookmarks:
-   <div id="table_wrap" class="yui-skin-sam">
    <div id="table_wrap" class="yui-skin-sam">
     <table id="bookmarks_data">
       <thead>
     	<tr>
             <th class="left">${_('Name')}</th>
             <th class="left">${_('Date')}</th>
             <th class="left">${_('Author')}</th>
             <th class="left">${_('Revision')}</th>
     	</tr>
       </thead>
 		%for cnt,book in enumerate(c.repo_bookmarks.items()):
-		<tr class="parity${cnt%2}">
 		<tr class="parity${cnt%2}">
             <td>
                 <span class="logbooks">
                     <span class="bookbook">${h.link_to(book[0],
                     h.url('files_home',repo_name=c.repo_name,revision=book[1].raw_id))}</span>
                 </span>
             </td>
-            <td><span class="tooltip" title="${h.age(book[1].date)}">${book[1].date}</span></td>
             <td><span class="tooltip" title="${h.age(book[1].date)}">${book[1].date}</span></td>
 	        <td title="${book[1].author}">${h.person(book[1].author)}</td>
 	        <td>
               <div>
                   <pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=book[1].raw_id)}">r${book[1].revision}:${h.short_id(book[1].raw_id)}</a></pre>
               </div>
-            </td>
             </td>
 		</tr>
 		%endfor
     </table>
     </div>
 %else:
 	${_('There are no bookmarks yet')}
 %endif
@@ \ No newline at end of file @@
 %endif

rhodecode/templates/branches/branches.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${c.repo_name} ${_('Branches')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     <input class="q_filter_box" id="q_filter_branches" size="15" type="text" name="filter" value="${_('quick filter...')}"/>
     ${h.link_to(u'Home',h.url('/'))}
-    &raquo;
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
     ${_('branches')}
 </%def>
 <%def name="page_nav()">
-    ${self.menu('branches')}
     ${self.menu('branches')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     <div class="table">
         <%include file='branches_data.html'/>
     </div>
@@ @@ -52,26 +52,26 @@ myDataSource.responseSchema = { @@
         {key:"author"},
         {key:"revision"},
+    ]
 };
 var myDataTable = new YAHOO.widget.DataTable("table_wrap", myColumnDefs, myDataSource,
+        {
          sortedBy:{key:"name",dir:"asc"},
          MSG_SORTASC:"${_('Click to sort ascending')}",
          MSG_SORTDESC:"${_('Click to sort descending')}",
          MSG_EMPTY:"${_('No records found.')}",
          MSG_ERROR:"${_('Data error.')}",
-         MSG_LOADING:"${_('Loading...')}",
          MSG_LOADING:"${_('Loading...')}",
+        }
 );
 myDataTable.subscribe('postRenderEvent',function(oArgs) {
     tooltip_activate();
     var func = function(node){
         return node.parentNode.parentNode.parentNode.parentNode.parentNode;
+    }
     q_filter('q_filter_branches',YUQ('div.table tr td .logtags .branchtag a'),func);
 });
     q_filter('q_filter_branches',YUQ('div.table tr td .logtags .branchtag a'),func);
 });
 </script>
 </%def>
@@ \ No newline at end of file @@
 </%def>

rhodecode/templates/branches/branches_data.html

➞

Show inline comments

 %if c.repo_branches:
-   <div id="table_wrap" class="yui-skin-sam">
    <div id="table_wrap" class="yui-skin-sam">
     <table id="branches_data">
       <thead>
         <tr>
             <th class="left">${_('name')}</th>
             <th class="left">${_('date')}</th>
             <th class="left">${_('author')}</th>
             <th class="left">${_('revision')}</th>
         </tr>
       </thead>
 		%for cnt,branch in enumerate(c.repo_branches.items()):
 		<tr class="parity${cnt%2}">
             <td>
                 <span class="logtags">
                     <span class="branchtag">${h.link_to(branch[0],
                     h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id))}</span>
-                </span>
                 </span>
             </td>
-            <td><span class="tooltip" title="${h.age(branch[1].date)}">${branch[1].date}</span></td>
             <td><span class="tooltip" title="${h.age(branch[1].date)}">${branch[1].date}</span></td>
             <td title="${branch[1].author}">${h.person(branch[1].author)}</td>
             <td>
                 <div>
                     <pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id)}">r${branch[1].revision}:${h.short_id(branch[1].raw_id)}</a></pre>
-                </div>
                 </div>
             </td>
 		</tr>
 		%endfor
         % if hasattr(c,'repo_closed_branches') and c.repo_closed_branches:
           %for cnt,branch in enumerate(c.repo_closed_branches.items()):
           <tr class="parity${cnt%2}">
               <td>
                   <span class="logtags">
                       <span class="branchtag">${h.link_to(branch[0]+' [closed]',
                       h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id))}</span>
-                  </span>
                   </span>
               </td>
-              <td><span class="tooltip" title="${h.age(branch[1].date)}">${branch[1].date}</span></td>
               <td><span class="tooltip" title="${h.age(branch[1].date)}">${branch[1].date}</span></td>
               <td title="${branch[1].author}">${h.person(branch[1].author)}</td>
               <td>
                 <div>
                     <pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id)}">r${branch[1].revision}:${h.short_id(branch[1].raw_id)}</a></pre>
                 </div>
               </td>
           </tr>
           %endfor
         %endif
     </table>
     </div>
 %else:
     ${_('There are no branches yet')}
 %endif
@@ \ No newline at end of file @@
 %endif

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -2,29 +2,29 @@ @@
 <%inherit file="/base/base.html"/>
 <%def name="title()">
 ${c.repo_name} ${_('Changelog')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
-    ${_('Changelog')} - ${_('showing ')} ${c.size if c.size <= c.total_cs else c.total_cs} ${_('out of')} ${c.total_cs} ${_('revisions')}
     ${_('Changelog')} - ${_('showing ')} ${c.size if c.size <= c.total_cs else c.total_cs} ${_('out of')} ${c.total_cs} ${_('revisions')}
 </%def>
 <%def name="page_nav()">
-	${self.menu('changelog')}
 	${self.menu('changelog')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div class="table">
 		% if c.pagination:
 			<div id="graph">
 				<div id="graph_nodes">
@@ @@ -33,197 +33,197 @@ ${c.repo_name} ${_('Changelog')} - ${c.r @@
 				<div id="graph_content">
 					<div class="container_header">
 				        ${h.form(h.url.current(),method='get')}
 				        <div class="info_box" style="float:left">
 				          ${h.submit('set',_('Show'),class_="ui-btn")}
 				          ${h.text('size',size=1,value=c.size)}
 				          ${_('revisions')}
 				        </div>
 				        ${h.end_form()}
 					<div id="rev_range_container" style="display:none"></div>
                     <div style="float:right">${h.select('branch_filter',c.branch_name,c.branch_filters)}</div>
 					</div>
 				%for cnt,cs in enumerate(c.pagination):
 					<div id="chg_${cnt+1}" class="container ${'tablerow%s' % (cnt%2)}">
 						<div class="left">
 							<div>
 							${h.checkbox(cs.short_id,class_="changeset_range")}
 							<span class="tooltip" title="${h.age(cs.date)}"><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}"><span class="changeset_id">${cs.revision}:<span class="changeset_hash">${h.short_id(cs.raw_id)}</span></span></a></span>
 							</div>
 							<div class="author">
 								<div class="gravatar">
 									<img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),16)}"/>
 								</div>
 								<div title="${cs.author}" class="user">${h.person(cs.author)}</div>
 							</div>
                             <div class="date">${cs.date}</div>
 						</div>
 						<div class="mid">
                             <div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
                             <div class="expand"><span class="expandtext">&darr; ${_('show more')} &darr;</span></div>
-						</div>
 						</div>
 						<div class="right">
 									<div id="${cs.raw_id}_changes_info" class="changes">
                                         <div id="${cs.raw_id}"  style="float:right;" class="changed_total tooltip" title="${_('Affected number of files, click to show more details')}">${len(cs.affected_files)}</div>
                                         <div class="comments-container">
                                         %if len(c.comments.get(cs.raw_id,[])) > 0:
                                             <div class="comments-cnt" title="${('comments')}">
                                               <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
                                                <div class="comments-cnt">${len(c.comments[cs.raw_id])}</div>
                                                <img src="${h.url('/images/icons/comments.png')}">
                                               </a>
                                             </div>
-                                        %endif
                                         %endif
                                         </div>
 									</div>
 								   %if cs.parents:
 									%for p_cs in reversed(cs.parents):
 										<div class="parent">${_('Parent')}
 											<span class="changeset_id">${p_cs.revision}:<span class="changeset_hash">${h.link_to(h.short_id(p_cs.raw_id),
 											h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}</span></span>
 										</div>
 									%endfor
 								   %else:
                                         <div class="parent">${_('No parents')}</div>
                                    %endif
 								   %else:
                                         <div class="parent">${_('No parents')}</div>
                                    %endif
 								<span class="logtags">
 									%if len(cs.parents)>1:
 									<span class="merge">${_('merge')}</span>
 									%endif
 									%if cs.branch:
 									<span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
 									   ${h.link_to(cs.branch,h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
 									%endif
 									%for tag in cs.tags:
 										<span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
 										${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
 									%endfor
 								</span>
 						</div>
 								</span>
 						</div>
 					</div>
 				%endfor
 				<div class="pagination-wh pagination-left">
 					${c.pagination.pager('$link_previous ~2~ $link_next')}
-				</div>
 				</div>
 				</div>
 			</div>
 			<script type="text/javascript" src="${h.url('/js/graph.js')}"></script>
 			<script type="text/javascript">
 				YAHOO.util.Event.onDOMReady(function(){
                     //Monitor range checkboxes and build a link to changesets
-                    //ranges
                     //ranges
                     var checkboxes = YUD.getElementsByClassName('changeset_range');
                     var url_tmpl = "${h.url('changeset_home',repo_name=c.repo_name,revision='__REVRANGE__')}";
-                    YUE.on(checkboxes,'click',function(e){
                     YUE.on(checkboxes,'click',function(e){
                         var checked_checkboxes = [];
                         for (pos in checkboxes){
                             if(checkboxes[pos].checked){
                                 checked_checkboxes.push(checkboxes[pos]);
+                            }
+                        }
                         if(checked_checkboxes.length>1){
                         	var rev_end = checked_checkboxes[0].name;
                         	var rev_start = checked_checkboxes[checked_checkboxes.length-1].name;
                             var url = url_tmpl.replace('__REVRANGE__',
                             		rev_start+'...'+rev_end);
                         var link = "<a href="+url+">${_('Show selected changes __S -> __E')}</a>"
                         link = link.replace('__S',rev_start);
                         link = link.replace('__E',rev_end);
                         YUD.get('rev_range_container').innerHTML = link;
                         YUD.setStyle('rev_range_container','display','');
+                        }
                         else{
                         	YUD.setStyle('rev_range_container','display','none');
+                        }
                     });
                     });
                     var msgs = YUQ('.message');
                     // get first element height
                     var el = YUQ('.container')[0];
                     var row_h = el.clientHeight;
                     for(var i=0;i<msgs.length;i++){
                     	var m = msgs[i];
                     	var h = m.clientHeight;
                     	var pad = YUD.getStyle(m,'padding');
                     	if(h > row_h){
                     		YUD.setStyle(m.nextElementSibling,'display','block');
                     		YUD.setStyle(m.nextElementSibling,'margin-top',row_h-(h+14)+'px');
                     	};
+                    }
                     YUE.on(YUQ('.expand'),'click',function(e){
                     	var elem = e.currentTarget.parentNode.parentNode;
                     	YUD.setStyle(e.currentTarget,'display','none');
                     	YUD.setStyle(elem,'height','auto');
                     	//redraw the graph, max_w and jsdata are global vars
                         set_canvas(max_w);
                         var r = new BranchRenderer();
                         r.render(jsdata,max_w);
                         r.render(jsdata,max_w);
                     })
                     // Fetch changeset details
                     // Fetch changeset details
                     YUE.on(YUD.getElementsByClassName('changed_total'),'click',function(e){
                     	var id = e.currentTarget.id
                     	var url = "${h.url('changelog_details',repo_name=c.repo_name,cs='__CS__')}"
                     	var url = url.replace('__CS__',id);
                     	ypjax(url,id+'_changes_info',function(){tooltip_activate()});
                     });
                     // change branch filter
                     YUE.on(YUD.get('branch_filter'),'change',function(e){
                     	var selected_branch = e.currentTarget.options[e.currentTarget.selectedIndex].value;
                     	var url_main = "${h.url('changelog_home',repo_name=c.repo_name)}";
                     	var url = "${h.url('changelog_home',repo_name=c.repo_name,branch='__BRANCH__')}";
                     	var url = url.replace('__BRANCH__',selected_branch);
                     	if(selected_branch != ''){
                     		window.location = url;
                     	}else{
                     		window.location = url_main;
+                    	}
                     });
 					function set_canvas(heads) {
 						var c = document.getElementById('graph_nodes');
 						var t = document.getElementById('graph_content');
 						canvas = document.getElementById('graph_canvas');
 						var div_h = t.clientHeight;
 						c.style.height=div_h+'px';
 						canvas.setAttribute('height',div_h);
 						c.style.height=max_w+'px';
 						canvas.setAttribute('width',max_w);
 					};
 					var heads = 1;
 					var max_heads = 0;
 					var jsdata = ${c.jsdata|n};
 					for( var i=0;i<jsdata.length;i++){
 					    var m = Math.max.apply(Math, jsdata[i][1]);
 					    if (m>max_heads){
 					        max_heads = m;
+					    }
+					}
 					var max_w = Math.max(100,max_heads*25);
 					set_canvas(max_w);
 					var r = new BranchRenderer();
 					r.render(jsdata,max_w);
 				});
 			</script>
 		%else:
 			${_('There are no changes yet')}
-		%endif
 		%endif
     </div>
-</div>
 </div>
 </%def>

rhodecode/templates/changelog/changelog_details.html

➞

Show inline comments

-% if len(c.cs.affected_files) <= c.affected_files_cut_off:
 % if len(c.cs.affected_files) <= c.affected_files_cut_off:
 <span class="removed tooltip" title="<b>${_('removed')}</b>${h.changed_tooltip(c.cs.removed)}">${len(c.cs.removed)}</span>
 <span class="changed tooltip" title="<b>${_('changed')}</b>${h.changed_tooltip(c.cs.changed)}">${len(c.cs.changed)}</span>
 <span class="added tooltip" title="<b>${_('added')}</b>${h.changed_tooltip(c.cs.added)}">${len(c.cs.added)}</span>
 % else:
  <span class="removed tooltip" title="${_('affected %s files') % len(c.cs.affected_files)}">!</span>
  <span class="changed tooltip" title="${_('affected %s files') % len(c.cs.affected_files)}">!</span>
  <span class="added tooltip"   title="${_('affected %s files') % len(c.cs.affected_files)}">!</span>
 % endif
@@ \ No newline at end of file @@
  <span class="added tooltip"   title="${_('affected %s files') % len(c.cs.affected_files)}">!</span>
 % endif

rhodecode/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -6,25 +6,25 @@ @@
     ${c.repo_name} ${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
     ${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}
 </%def>
 <%def name="page_nav()">
-    ${self.menu('changelog')}
     ${self.menu('changelog')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div class="table">
 		<div class="diffblock">
 			<div class="code-header">
                 <div class="date">
@@ @@ -44,146 +44,146 @@ @@
 	             <div class="left">
 	                 <div class="author">
 	                     <div class="gravatar">
 	                         <img alt="gravatar" src="${h.gravatar_url(h.email(c.changeset.author),20)}"/>
 	                     </div>
 	                     <span>${h.person(c.changeset.author)}</span><br/>
 	                     <span><a href="mailto:${h.email_or_none(c.changeset.author)}">${h.email_or_none(c.changeset.author)}</a></span><br/>
 	                 </div>
 	                 <div class="message">${h.urlify_commit(h.wrap_paragraphs(c.changeset.message),c.repo_name)}</div>
 	             </div>
 	             <div class="right">
 		             <div class="changes">
-                        % if len(c.changeset.affected_files) <= c.affected_files_cut_off:
                         % if len(c.changeset.affected_files) <= c.affected_files_cut_off:
 		                 <span class="removed" title="${_('removed')}">${len(c.changeset.removed)}</span>
 		                 <span class="changed" title="${_('changed')}">${len(c.changeset.changed)}</span>
 		                 <span class="added" title="${_('added')}">${len(c.changeset.added)}</span>
 	                    % else:
                          <span class="removed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>
                          <span class="changed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>
                          <span class="added"   title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>
 	                    % endif
 		             </div>
                          <span class="added"   title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>
 	                    % endif
 		             </div>
 		            %if c.changeset.parents:
 		             %for p_cs in reversed(c.changeset.parents):
 		                 <div class="parent">${_('Parent')}
                      <span class="changeset_id">${p_cs.revision}:<span class="changeset_hash">${h.link_to(h.short_id(p_cs.raw_id),
 		                     h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}</span></span>
 		                 </div>
 		             %endfor
                     %else:
                         <div class="parent">${_('No parents')}</div>
                     %endif
                     %else:
                         <div class="parent">${_('No parents')}</div>
                     %endif
 		         <span class="logtags">
                  %if len(c.changeset.parents)>1:
                  <span class="merge">${_('merge')}</span>
                  %endif
 		             <span class="branchtag" title="${'%s %s' % (_('branch'),c.changeset.branch)}">
 		             ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
 		             %for tag in c.changeset.tags:
 		                 <span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
 		                 ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
 		             %endfor
 		         </span>
 	                </div>
 		         </span>
 	                </div>
 	        </div>
 	        <span>
 	        ${_('%s files affected with %s additions and %s deletions:') % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}
 	        </span>
 	        <div class="cs_files">
 	                %for change,filenode,diff,cs1,cs2,stat in c.changes:
 	                    <div class="cs_${change}">
                             <div class="node">
                             %if change != 'removed':
                                 ${h.link_to(h.safe_unicode(filenode.path),c.anchor_url(filenode.changeset.raw_id,filenode.path)+"_target")}
                             %else:
                                 ${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.FID('',filenode.path)))}
                             %endif
                             </div>
 		                    <div class="changes">${h.fancy_file_stats(stat)}</div>
 	                    </div>
 	                %endfor
 	                % if c.cut_off:
 	                  ${_('Changeset was too big and was cut off...')}
 	                % endif
-	        </div>
 	        </div>
 	    </div>
     </div>
     ## diff block
     ## diff block
     <%namespace name="diff_block" file="/changeset/diff_block.html"/>
     ${diff_block.diff_block(c.changes)}
     ## template for inline comment form
     <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
     ${comment.comment_inline_form(c.changeset)}
     ${comment.comments(c.changeset)}
     <script type="text/javascript">
       var deleteComment = function(comment_id){
           var url = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}".replace('__COMMENT_ID__',comment_id);
           var postData = '_method=delete';
           var success = function(o){
               var n = YUD.get('comment-'+comment_id);
               n.parentNode.removeChild(n);
+          }
           ajaxPOST(url,postData,success);
+      }
       YUE.onDOMReady(function(){
           YUE.on(YUQ('.show-inline-comments'),'change',function(e){
               var show = 'none';
               var target = e.currentTarget;
               if(target.checked){
                   var show = ''
+              }
               var boxid = YUD.getAttribute(target,'id_for');
               var comments = YUQ('#{0} .inline-comments'.format(boxid));
-              for(c in comments){
               for(c in comments){
                  YUD.setStyle(comments[c],'display',show);
+              }
               var btns = YUQ('#{0} .inline-comments-button'.format(boxid));
-              for(c in btns){
               for(c in btns){
                   YUD.setStyle(btns[c],'display',show);
+               }
+               }
           })
           YUE.on(YUQ('.line'),'click',function(e){
               var tr = e.currentTarget;
               injectInlineForm(tr);
           });
           // inject comments into they proper positions
           var file_comments = YUQ('.inline-comment-placeholder');
           for (f in file_comments){
               var box = file_comments[f];
               var inlines = box.children;
               for(var i=0; i<inlines.length; i++){
                   try{
                     var inline = inlines[i];
                     var lineno = YUD.getAttribute(inlines[i],'line');
                     var lineid = "{0}_{1}".format(YUD.getAttribute(inline,'target_id'),lineno);
                     var target_line = YUD.get(lineid);
                     var add = createInlineAddButton(target_line.parentNode,'${_("add another comment")}');
                     YUD.insertAfter(add,target_line.parentNode);
                     var comment = new YAHOO.util.Element(tableTr('inline-comments',inline.innerHTML))
                     YUD.insertAfter(comment,target_line.parentNode);
                   }catch(e){
                 	  console.log(e);
+                  }
+              }
+          }
       })
     </script>
     </script>
     </div>
 </%def>

rhodecode/templates/changeset/changeset_file_comment.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 ## usage:
 ## <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
 ## ${comment.comment_block(co)}
 ##
 <%def name="comment_block(co)">
   <div class="comment" id="comment-${co.comment_id}">
     <div class="comment-wrapp">
   	<div class="meta">
   		<span class="user">
   			<img src="${h.gravatar_url(co.author.email, 20)}" />
   			${co.author.username}
   		</span>
   		<span class="date">
   			${h.age(co.modified_at)}
   		</span>
       %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:
         <span class="buttons">
           <span onClick="deleteComment(${co.comment_id})" class="delete-comment ui-btn">${_('Delete')}</span>
         </span>
       %endif
   	</div>
   	<div class="text">
   		${h.rst_w_mentions(co.text)|n}
   	</div>
     </div>
   </div>
 </%def>
 <%def name="comment_inline_form(changeset)">
 <div id='comment-inline-form-template' style="display:none">
   <div class="comment-inline-form">
   %if c.rhodecode_user.username != 'default':
       ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=changeset.raw_id))}
       <div class="clearfix">
           <div class="comment-help">${_('Commenting on line')} {1}. ${_('Comments parsed using')}
           <a href="${h.url('rst_help')}">RST</a> ${_('syntax')} ${_('with')}
           <span style="color:#003367" class="tooltip" title="${_('Use @username inside this text to send notification to this RhodeCode user')}">@mention</span> ${_('support')}
           </div>
           <textarea id="text_{1}" name="text"></textarea>
       </div>
       <div class="comment-button">
       <input type="hidden" name="f_path" value="{0}">
       <input type="hidden" name="line" value="{1}">
       ${h.submit('save', _('Comment'), class_='ui-btn')}
       ${h.reset('hide-inline-form', _('Hide'), class_='ui-btn hide-inline-form')}
       </div>
       ${h.end_form()}
   %else:
       ${h.form('')}
       <div class="clearfix">
           <div class="comment-help">
             ${'You need to be logged in to comment.'} <a href="${h.url('login_home',came_from=h.url.current())}">${_('Login now')}</a>
           </div>
       </div>
       <div class="comment-button">
       ${h.reset('hide-inline-form', _('Hide'), class_='ui-btn hide-inline-form')}
       </div>
       ${h.end_form()}
   %endif
   </div>
 </div>
 </%def>
 <%def name="comments(changeset)">
 <div class="comments">
     <div class="comments-number">${len(c.comments)} comment(s) (${c.inline_cnt} ${_('inline')})</div>
     %for path, lines in c.inline_comments:
         <div style="display:none" class="inline-comment-placeholder" path="${path}" target_id="${h.FID(changeset.raw_id,path)}">
         % for line,comments in lines.iteritems():
             <div class="inline-comment-placeholder-line" line="${line}" target_id="${h.safeid(h.safe_unicode(path))}">
             %for co in comments:
                 ${comment_block(co)}
             %endfor
             </div>
         %endfor
         </div>
     %endfor
     %for co in c.comments:
         ${comment_block(co)}
     %endfor
     %if c.rhodecode_user.username != 'default':
     <div class="comment-form">
         ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=changeset.raw_id))}
         <strong>${_('Leave a comment')}</strong>
         <div class="clearfix">
             <div class="comment-help">
                 ${_('Comments parsed using')} <a href="${h.url('rst_help')}">RST</a> ${_('syntax')}
                 ${_('with')} <span style="color:#003367" class="tooltip" title="${_('Use @username inside this text to send notification to this RhodeCode user')}">@mention</span> ${_('support')}
             </div>
                 ${h.textarea('text')}
         </div>
         <div class="comment-button">
         ${h.submit('save', _('Comment'), class_='ui-button')}
         </div>
         ${h.end_form()}
     </div>
     %endif
 </div>
 </%def>
 ## -*- coding: utf-8 -*-
 ## usage:
 ## <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
 ## ${comment.comment_block(co)}
 ##
 <%def name="comment_block(co)">
   <div class="comment" id="comment-${co.comment_id}">
     <div class="comment-wrapp">
   	<div class="meta">
   		<span class="user">
   			<img src="${h.gravatar_url(co.author.email, 20)}" />
   			${co.author.username}
   		</span>
   		<span class="date">
   			${h.age(co.modified_at)}
   		</span>
       %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:
         <span class="buttons">
           <span onClick="deleteComment(${co.comment_id})" class="delete-comment ui-btn">${_('Delete')}</span>
         </span>
       %endif
   	</div>
   	<div class="text">
   		${h.rst_w_mentions(co.text)|n}
   	</div>
     </div>
   </div>
 </%def>
 <%def name="comment_inline_form(changeset)">
 <div id='comment-inline-form-template' style="display:none">
   <div class="comment-inline-form">
   %if c.rhodecode_user.username != 'default':
       ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=changeset.raw_id))}
       <div class="clearfix">
           <div class="comment-help">${_('Commenting on line')} {1}. ${_('Comments parsed using')}
           <a href="${h.url('rst_help')}">RST</a> ${_('syntax')} ${_('with')}
           <span style="color:#003367" class="tooltip" title="${_('Use @username inside this text to send notification to this RhodeCode user')}">@mention</span> ${_('support')}
           </div>
           <textarea id="text_{1}" name="text"></textarea>
       </div>
       <div class="comment-button">
       <input type="hidden" name="f_path" value="{0}">
       <input type="hidden" name="line" value="{1}">
       ${h.submit('save', _('Comment'), class_='ui-btn')}
       ${h.reset('hide-inline-form', _('Hide'), class_='ui-btn hide-inline-form')}
       </div>
       ${h.end_form()}
   %else:
       ${h.form('')}
       <div class="clearfix">
           <div class="comment-help">
             ${'You need to be logged in to comment.'} <a href="${h.url('login_home',came_from=h.url.current())}">${_('Login now')}</a>
           </div>
       </div>
       <div class="comment-button">
       ${h.reset('hide-inline-form', _('Hide'), class_='ui-btn hide-inline-form')}
       </div>
       ${h.end_form()}
   %endif
   </div>
 </div>
 </%def>
 <%def name="comments(changeset)">
 <div class="comments">
     <div class="comments-number">${len(c.comments)} comment(s) (${c.inline_cnt} ${_('inline')})</div>
     %for path, lines in c.inline_comments:
         <div style="display:none" class="inline-comment-placeholder" path="${path}" target_id="${h.FID(changeset.raw_id,path)}">
         % for line,comments in lines.iteritems():
             <div class="inline-comment-placeholder-line" line="${line}" target_id="${h.safeid(h.safe_unicode(path))}">
             %for co in comments:
                 ${comment_block(co)}
             %endfor
             </div>
         %endfor
         </div>
     %endfor
     %for co in c.comments:
         ${comment_block(co)}
     %endfor
     %if c.rhodecode_user.username != 'default':
     <div class="comment-form">
         ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=changeset.raw_id))}
         <strong>${_('Leave a comment')}</strong>
         <div class="clearfix">
             <div class="comment-help">
                 ${_('Comments parsed using')} <a href="${h.url('rst_help')}">RST</a> ${_('syntax')}
                 ${_('with')} <span style="color:#003367" class="tooltip" title="${_('Use @username inside this text to send notification to this RhodeCode user')}">@mention</span> ${_('support')}
             </div>
                 ${h.textarea('text')}
         </div>
         <div class="comment-button">
         ${h.submit('save', _('Comment'), class_='ui-button')}
         </div>
         ${h.end_form()}
     </div>
     %endif
 </div>
 </%def>

rhodecode/templates/changeset/changeset_range.html

➞

Show inline comments

@@ @@ -5,37 +5,37 @@ @@
     ${c.repo_name} ${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
     ${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}
 </%def>
 <%def name="page_nav()">
-    ${self.menu('changelog')}
     ${self.menu('changelog')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div class="table">
 		<div id="body" class="diffblock">
 			<div class="code-header cv">
-		        <h3 class="code-header-title">${_('Compare View')}</h3>
 		        <h3 class="code-header-title">${_('Compare View')}</h3>
                 <div>
 				${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}
 				</div>
 			</div>
 		</div>
 	    <div id="changeset_compare_view_content">
 			<div class="container">
 			<table class="compare_view_commits noborder">
             %for cs in c.cs_ranges:
                 <tr>
                 <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),14)}"/></div></td>
                 <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</td>
@@ @@ -44,46 +44,46 @@ @@
                 <td><div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td>
                 </tr>
             %endfor
             </table>
 	        </div>
 	        <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>
 	        <div class="cs_files">
 	               %for cs in c.cs_ranges:
 	                   <div class="cur_cs">r${cs}</div>
 	                %for change,filenode,diff,cs1,cs2,st in c.changes[cs.raw_id]:
 	                    <div class="cs_${change}">${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.FID(cs.raw_id,filenode.path)))}</div>
 	                %endfor
 	               %endfor
 	        </div>
 	               %endfor
 	        </div>
 	    </div>
     </div>
     <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
     <%namespace name="diff_block" file="/changeset/diff_block.html"/>
      %for cs in c.cs_ranges:
-          ##${comment.comment_inline_form(cs)}
           ##${comment.comment_inline_form(cs)}
           ## diff block
           <h3 style="border:none;padding-top:8px;">${'r%s:%s' % (cs.revision,h.short_id(cs.raw_id))}</h3>
           ${diff_block.diff_block(c.changes[cs.raw_id])}
           ##${comment.comments(cs)}
-     %endfor
      %endfor
      <script type="text/javascript">
       YUE.onDOMReady(function(){
           YUE.on(YUQ('.diff-menu-activate'),'click',function(e){
               var act = e.currentTarget.nextElementSibling;
               if(YUD.hasClass(act,'active')){
                   YUD.removeClass(act,'active');
                   YUD.setStyle(act,'display','none');
               }else{
                   YUD.addClass(act,'active');
                   YUD.setStyle(act,'display','');
+              }
           });
       })
-    </script>
     </script>
     </div>
 </%def>
@@ \ No newline at end of file @@
 </%def>

rhodecode/templates/changeset/diff_block.html

➞

Show inline comments

@@ @@ -22,20 +22,20 @@ @@
                   ${c.ignorews_url(h.FID(filenode.changeset.raw_id,filenode.path))}
                   ${c.context_url(h.FID(filenode.changeset.raw_id,filenode.path))}
                 </div>
                 <span style="float:right;margin-top:-3px">
                   <label>
                   ${_('show inline comments')}
                   ${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=h.FID(filenode.changeset.raw_id,filenode.path))}
                   </label>
                 </span>
             </div>
         </div>
         <div class="code-body">
-            <div class="full_f_path" path="${h.safe_unicode(filenode.path)}"></div>
             <div class="full_f_path" path="${h.safe_unicode(filenode.path)}"></div>
             ${diff|n}
         </div>
     </div>
     %endif
 %endfor
 </%def>
@@ \ No newline at end of file @@
 </%def>

rhodecode/templates/changeset/raw_changeset.html

➞

Show inline comments

 # ${c.scm_type.upper()} changeset patch
 # User ${c.changeset.author|n}
 # Date ${c.changeset.date}
 # Node ID ${c.changeset.raw_id}
 ${c.parent_tmpl}
 ${c.changeset.message}
 ${c.diffs|n}
@@ \ No newline at end of file @@
 ${c.diffs|n}

rhodecode/templates/email_templates/changeset_comment.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="main.html"/>
 <h4>${subject}</h4>
 ${body}
@@ \ No newline at end of file @@
 ${body}

rhodecode/templates/email_templates/default.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="main.html"/>
 ${body}
@@ \ No newline at end of file @@
 ${body}

rhodecode/templates/email_templates/main.html

➞

Show inline comments

 ${self.body()}
 <div>
 --
 <br/>
 <br/>
 <b>${_('This is an notification from RhodeCode.')}</b>
 </div>
@@ \ No newline at end of file @@
 </div>

rhodecode/templates/email_templates/password_reset.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="main.html"/>
 Hello ${user}
 We received a request to create a new password for your account.
 You can generate it by clicking following URL:
 ${reset_url}
 If you didn't request new password please ignore this email.
@@ \ No newline at end of file @@
 If you didn't request new password please ignore this email.

rhodecode/templates/email_templates/registration.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="main.html"/>
 A new user have registered in RhodeCode
 ${body}
 View this user here :${registered_user_url}
@@ \ No newline at end of file @@
 View this user here :${registered_user_url}

rhodecode/templates/errors/error_document.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>Error - ${c.error_message}</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 	    %if c.redirect_time:
 	        <meta http-equiv="refresh" content="${c.redirect_time}; url=${c.url_redirect}"/>
-	    %endif
 	    %endif
         <link rel="icon" href="${h.url("/images/hgicon.png")}" type="image/png" />
         <meta name="robots" content="index, nofollow"/>
         <!-- stylesheets -->
         <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css')}" media="screen" />
 	    <style type="text/css">
 	     #main_div{
 	       border: 0px solid #000;
 	       width: 500px;
 	       margin: auto;
 	       text-align: center;
 	       margin-top: 200px;
 	       font-size: 1.6em;
+	     }
 	     .error_message{
 	        text-align: center;
 	        color:#003367;
 	        font-size: 1.6em;
 	        margin:10px;
+	     }
 	    </style>
     </head>
     <body>
         <div id="login">
-            <div class="table">
             <div class="table">
 				<div id="main_div">
 				    <div style="font-size:2.0em;margin: 10px">${c.rhodecode_name}</div>
 					<h1 class="error_message">${c.error_message}</h1>
 					<p>${c.error_explanation}</p>
 			        %if c.redirect_time:
 			            <p>${_('You will be redirected to %s in %s seconds') % (c.redirect_module,c.redirect_time)}</p>
 				    %endif
 				    %endif
 				</div>
             </div>
             <!-- end login -->
         </div>
     </body>
 </html>

rhodecode/templates/files/file_diff.html

➞

Show inline comments

@@ @@ -4,46 +4,44 @@ @@
     ${c.repo_name} ${_('File diff')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
     ${_('File diff')} r${c.changeset_1.revision}:${h.short_id(c.changeset_1.raw_id)} &rarr; r${c.changeset_2.revision}:${h.short_id(c.changeset_2.raw_id)}
 </%def>
 <%def name="page_nav()">
-    ${self.menu('files')}
     ${self.menu('files')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div>
-    ## diff block
     ## diff block
     <%namespace name="diff_block" file="/changeset/diff_block.html"/>
-    ${diff_block.diff_block(c.changes)}
     ${diff_block.diff_block(c.changes)}
     </div>
-</div>
 </div>
 <script>
 YUE.onDOMReady(function(){
     YUE.on(YUQ('.diff-menu-activate'),'click',function(e){
         var act = e.currentTarget.nextElementSibling;
         if(YUD.hasClass(act,'active')){
             YUD.removeClass(act,'active');
             YUD.setStyle(act,'display','none');
         }else{
             YUD.addClass(act,'active');
             YUD.setStyle(act,'display','');
+        }
     });
 })
 </script>
 </%def>
@@ \ No newline at end of file @@
 </%def>

rhodecode/templates/files/files.html

➞

Show inline comments

@@ @@ -3,46 +3,46 @@ @@
 <%def name="title()">
     ${c.repo_name} ${_('Files')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
     ${h.link_to(c.repo_name,h.url('files_home',repo_name=c.repo_name))}
     &raquo;
     ${_('files')}
     %if c.file:
         @ r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}
-    %endif
     %endif
 </%def>
 <%def name="page_nav()">
-    ${self.menu('files')}
     ${self.menu('files')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
 	    <ul class="links">
 		    <li>
 		      <span style="text-transform: uppercase;"><a href="#">${_('branch')}: ${c.changeset.branch}</a></span>
 	        </li>
 	    </ul>
 	        </li>
 	    </ul>
     </div>
     <div class="table">
 		<div id="files_data">
 			<%include file='files_ypjax.html'/>
-		</div>
 		</div>
     </div>
-</div>
 </div>
 <script type="text/javascript">
 var YPJAX_TITLE = "${c.repo_name} ${_('Files')} - ${c.rhodecode_name}";
 var current_url = "${h.url.current()}";
 var node_list_url = '${h.url("files_home",repo_name=c.repo_name,revision=c.changeset.raw_id,f_path='__FPATH__')}';
 var url_base = '${h.url("files_nodelist_home",repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.file.path)}';
 var truncated_lbl = "${_('search truncated')}";
 var nomatch_lbl = "${_('no matching files')}";
 fileBrowserListeners(current_url, node_list_url, url_base, truncated_lbl, nomatch_lbl);
 </script>
 </%def>
@@ \ No newline at end of file @@
 </%def>

rhodecode/templates/files/files_add.html

➞

Show inline comments

@@ @@ -11,82 +11,82 @@ @@
 <link rel="stylesheet" type="text/css" href="${h.url('/css/codemirror.css')}"/>
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
     ${_('add file')} @ R${c.cs.revision}:${h.short_id(c.cs.raw_id)}
 </%def>
 <%def name="page_nav()">
-		${self.menu('files')}
 		${self.menu('files')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
             <li>
               <span style="text-transform: uppercase;">
               <a href="#">${_('branch')}: ${c.cs.branch}</a></span>
             </li>
         </ul>
             </li>
         </ul>
     </div>
     <div class="table">
 		<div id="files_data">
 		  ${h.form(h.url.current(),method='post',id='eform',enctype="multipart/form-data")}
             <h3>${_('Add new file')}</h3>
             <div class="form">
               <div class="fields">
                   <div id="filename_container" class="field file">
                       <div class="label">
                           <label for="filename">${_('File Name')}:</label>
                       </div>
                       <div class="input">
                           <input type="text" value="" size="30" name="filename" id="filename">
                           ${_('or')} <span class="ui-btn" id="upload_file_enable">${_('Upload file')}</span>
                       </div>
-                  </div>
                   </div>
                   <div id="upload_file_container" class="field" style="display:none">
                     <div class="label">
                         <label for="location">${_('Upload file')}</label>
                     </div>
                     <div class="file">
                         <input type="file"  size="30" name="upload_file" id="upload_file">
-                        ${_('or')} <span class="ui-btn" id="file_enable">${_('Create new file')}</span>
                         ${_('or')} <span class="ui-btn" id="file_enable">${_('Create new file')}</span>
                     </div>
                   </div>
                    <div class="field">
                       <div class="label">
                           <label for="location">${_('Location')}</label>
                       </div>
                       <div class="input">
                           <input type="text" value="${c.f_path}" size="30" name="location" id="location">
                           ${_('use / to separate directories')}
                       </div>
-                   </div>
                    </div>
               </div>
-            </div>
             </div>
 			<div id="body" class="codeblock">
-			    <div id="editor_container">
 			    <div id="editor_container">
                     <pre id="editor_pre"></pre>
 				    <textarea id="editor" name="content" style="display:none"></textarea>
                 </div>
 				<div style="padding: 10px;color:#666666">${_('commit message')}</div>
 				<textarea id="commit" name="message" style="height: 100px;width: 99%;margin-left:4px"></textarea>
 			</div>
 			<div style="text-align: l;padding-top: 5px">
             ${h.submit('commit',_('Commit changes'),class_="ui-btn")}
             ${h.reset('reset',_('Reset'),class_="ui-btn")}
 			</div>
 			${h.end_form()}
 			<script type="text/javascript">
 			var reset_url = "${h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path)}";
-		    initCodeMirror('editor',reset_url);
 		    initCodeMirror('editor',reset_url);
 			</script>
-		</div>
 		</div>
     </div>
 </div>
 </%def>
@@ \ No newline at end of file @@
 </div>
 </%def>

rhodecode/templates/files/files_annotate.html

➞

Show inline comments

@@ @@ -4,133 +4,133 @@ @@
     ${c.repo_name} ${_('File annotate')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
     ${_('annotate')} @ R${c.cs.revision}:${h.short_id(c.cs.raw_id)}
 </%def>
 <%def name="page_nav()">
-		${self.menu('files')}
 		${self.menu('files')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
             <li>
               <span style="text-transform: uppercase;"><a href="#">${_('branch')}: ${c.cs.branch}</a></span>
             </li>
         </ul>
             </li>
         </ul>
     </div>
     <div class="table">
 		<div id="files_data">
 			<h3 class="files_location">${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cs.revision,c.file.path)}</h3>
 			<dl>
 			    <dt style="padding-top:10px;font-size:16px">${_('History')}</dt>
 			    <dd>
 			        <div>
 			        ${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}
 			        ${h.hidden('diff2',c.file.last_changeset.raw_id)}
 			        ${h.select('diff1',c.file.last_changeset.raw_id,c.file_history)}
 			        ${h.submit('diff','diff to revision',class_="ui-btn")}
 			        ${h.submit('show_rev','show at revision',class_="ui-btn")}
 			        ${h.end_form()}
 			        </div>
-			    </dd>
 			    </dd>
 			</dl>
 			<div id="body" class="codeblock">
                 <div class="code-header">
                     <div class="stats">
                         <div class="left"><img src="${h.url('/images/icons/file.png')}"/></div>
-                        <div class="left item">${h.link_to("r%s:%s" % (c.file.last_changeset.revision,h.short_id(c.file.last_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id))}</div>
                         <div class="left item">${h.link_to("r%s:%s" % (c.file.last_changeset.revision,h.short_id(c.file.last_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id))}</div>
                         <div class="left item">${h.format_byte_size(c.file.size,binary=True)}</div>
                         <div class="left item last">${c.file.mimetype}</div>
                         <div class="buttons">
                           ${h.link_to(_('show source'),h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
-                          ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
                           ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
                           ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
-                          % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
                           % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
                            % if not c.file.is_binary:
                             ${h.link_to(_('edit'),h.url('files_edit_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
                            % endif
-                          % endif
                           % endif
                         </div>
                     </div>
                     <div class="author">
                         <div class="gravatar">
                             <img alt="gravatar" src="${h.gravatar_url(h.email(c.cs.author),16)}"/>
                         </div>
                         <div title="${c.cs.author}" class="user">${h.person(c.cs.author)}</div>
                     </div>
                     <div class="commit">${c.file.last_changeset.message}</div>
                 </div>
 				<div class="code-body">
 			       %if c.file.is_binary:
 			           ${_('Binary file (%s)') % c.file.mimetype}
-			       %else:
 			       %else:
 					% if c.file.size < c.cut_off_limit:
 						${h.pygmentize_annotation(c.repo_name,c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
 					%else:
 						${_('File is too big to display')} ${h.link_to(_('show as raw'),
 						h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.revision,f_path=c.f_path))}
 					%endif
 			       <script type="text/javascript">
 			           function highlight_lines(lines){
 			               for(pos in lines){
-			                 YUD.setStyle('L'+lines[pos],'background-color','#FFFFBE');
 			                 YUD.setStyle('L'+lines[pos],'background-color','#FFFFBE');
+			               }
+			           }
+			           }
 			           page_highlights = location.href.substring(location.href.indexOf('#')+1).split('L');
 			           if (page_highlights.length == 2){
 			              highlight_ranges  = page_highlights[1].split(",");
 			              var h_lines = [];
 			              for (pos in highlight_ranges){
 			                   var _range = highlight_ranges[pos].split('-');
 			                   if(_range.length == 2){
 			                       var start = parseInt(_range[0]);
 			                       var end = parseInt(_range[1]);
 			                       if (start < end){
 			                           for(var i=start;i<=end;i++){
 			                               h_lines.push(i);
+			                           }
+			                       }
+			                       }
+			                   }
 			                   else{
 			                       h_lines.push(parseInt(highlight_ranges[pos]));
+			                   }
+			             }
 			           highlight_lines(h_lines);
 			           //remember original location
 			           //remember original location
 			           var old_hash  = location.href.substring(location.href.indexOf('#'));
 			           // this makes a jump to anchor moved by 3 posstions for padding
 			           // this makes a jump to anchor moved by 3 posstions for padding
 			           window.location.hash = '#L'+Math.max(parseInt(h_lines[0])-3,1);
 			           //sets old anchor
 			           //sets old anchor
 			           window.location.hash = old_hash;
+			           }
 			       </script>
 				   %endif
 			       </script>
 				   %endif
 				</div>
 			</div>
             <script type="text/javascript">
             YAHOO.util.Event.onDOMReady(function(){
                 YUE.on('show_rev','click',function(e){
                     YAHOO.util.Event.preventDefault(e);
                     var cs = YAHOO.util.Dom.get('diff1').value;
                     var url = "${h.url('files_annotate_home',repo_name=c.repo_name,revision='__CS__',f_path=c.f_path)}".replace('__CS__',cs);
                     window.location = url;
                     });
                });
             </script>
 		</div>
             </script>
 		</div>
     </div>
 </div>
 </%def>
 </div>
 </%def>

rhodecode/templates/files/files_browser.html

➞

Show inline comments

 <%def name="file_class(node)">
 	%if node.is_file():
 		<%return "browser-file" %>
 	%else:
 		<%return "browser-dir"%>
 	%endif
 </%def>
 <div id="body" class="browserblock">
     <div class="browser-header">
 		<div class="browser-nav">
 			${h.form(h.url.current())}
 			<div class="info_box">
-	          <span class="rev">${_('view')}@rev</span>
 	          <span class="rev">${_('view')}@rev</span>
 	          <a class="ui-btn" href="${c.url_prev}" title="${_('previous revision')}">&laquo;</a>
 	          ${h.text('at_rev',value=c.changeset.revision,size=5)}
 	          <a class="ui-btn" href="${c.url_next}" title="${_('next revision')}">&raquo;</a>
 	          ## ${h.submit('view',_('view'),class_="ui-btn")}
-		    </div>
 		    </div>
 			${h.end_form()}
 		</div>
 	    <div class="browser-branch">
 	       ${h.checkbox('stay_at_branch',c.changeset.branch,c.changeset.branch==c.branch)}
 	       <label>${_('follow current branch')}</label>
 	    </div>
         <div class="browser-search">
               <div id="search_activate_id" class="search_activate">
                   <a class="ui-btn" id="filter_activate" href="#">${_('search file list')}</a>
               </div>
-              % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
               % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
                     <div id="add_node_id" class="add_node">
                         <a class="ui-btn" href="${h.url('files_add_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path)}">${_('add new file')}</a>
                     </div>
-              % endif
               % endif
         <div>
             <div id="node_filter_box_loading" style="display:none">${_('Loading file list...')}</div>
             <div id="node_filter_box" style="display:none">
             ${h.files_breadcrumbs(c.repo_name,c.changeset.raw_id,c.file.path)}/<input class="init" type="text" value="type to search..." name="filter" size="25" id="node_filter" autocomplete="off">
             </div>
             </div>
         </div>
         </div>
         </div>
     </div>
 	<div class="browser-body">
 		<table class="code-browser">
 		         <thead>
 		             <tr>
 		                 <th>${_('Name')}</th>
 		                 <th>${_('Size')}</th>
 		                 <th>${_('Mimetype')}</th>
 		                 <th>${_('Revision')}</th>
 		                 <th>${_('Last modified')}</th>
 		                 <th>${_('Last commiter')}</th>
 		             </tr>
 		         </thead>
                 <tbody id="tbody">
           		%if c.file.parent:
          		<tr class="parity0">
-	          		<td>
 	          		<td>
 	          			${h.link_to('..',h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.file.parent.path),class_="browser-dir ypjax-link")}
 	          		</td>
 	          		<td></td>
 	          		<td></td>
 	          		<td></td>
 	          		<td></td>
 	          		<td></td>
 				</tr>
           		%endif
 		    %for cnt,node in enumerate(c.file):
 				<tr class="parity${cnt%2}">
 		             <td>
 						${h.link_to(node.name,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=h.safe_unicode(node.path)),class_=file_class(node)+" ypjax-link")}
 		             </td>
 		             <td>
 		             %if node.is_file():
 		             	${h.format_byte_size(node.size,binary=True)}
-		             %endif
 		             %endif
 		             </td>
 		             <td>
 		              %if node.is_file():
 		                  ${node.mimetype}
 		              %endif
 		             </td>
 		             <td>
 		             	%if node.is_file():
 		             		<div class="tooltip" title="${node.last_changeset.message}">
 		             		<pre>${'r%s:%s' % (node.last_changeset.revision,node.last_changeset.short_id)}</pre>
                             </div>
 		             	%endif
 		             </td>
 		             <td>
 		             	%if node.is_file():
 		             		<span class="tooltip" title="${node.last_changeset.date}">
                             ${h.age(node.last_changeset.date)}</span>
 		             	%endif
 		             </td>
 		             <td>
 		             	%if node.is_file():
 		             		<span title="${node.last_changeset.author}">
                             ${h.person(node.last_changeset.author)}
                             </span>
-		             	%endif
 		             	%endif
 		             </td>
 				</tr>
 			%endfor
                 </tbody>
                 <tbody id="tbody_filtered" style="display:none">
-                </tbody>
                 </tbody>
 		</table>
 	</div>
 </div>
@@ \ No newline at end of file @@
 </div>

rhodecode/templates/files/files_edit.html

➞

Show inline comments

@@ @@ -11,68 +11,68 @@ @@
 <link rel="stylesheet" type="text/css" href="${h.url('/css/codemirror.css')}"/>
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
     ${_('edit file')} @ R${c.cs.revision}:${h.short_id(c.cs.raw_id)}
 </%def>
 <%def name="page_nav()">
-		${self.menu('files')}
 		${self.menu('files')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
             <li>
               <span style="text-transform: uppercase;">
               <a href="#">${_('branch')}: ${c.cs.branch}</a></span>
             </li>
         </ul>
             </li>
         </ul>
     </div>
     <div class="table">
 		<div id="files_data">
 			<h3 class="files_location">${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cs.revision,c.file.path)}</h3>
 			${h.form(h.url.current(),method='post',id='eform')}
 			<div id="body" class="codeblock">
             <div class="code-header">
                 <div class="stats">
                     <div class="left"><img src="${h.url('/images/icons/file.png')}"/></div>
-                    <div class="left item">${h.link_to("r%s:%s" % (c.file.last_changeset.revision,h.short_id(c.file.last_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id))}</div>
                     <div class="left item">${h.link_to("r%s:%s" % (c.file.last_changeset.revision,h.short_id(c.file.last_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id))}</div>
                     <div class="left item">${h.format_byte_size(c.file.size,binary=True)}</div>
                     <div class="left item last">${c.file.mimetype}</div>
                     <div class="buttons">
                       ${h.link_to(_('show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
-                      ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
                       ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
                       ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
-                      % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
                       % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
                        % if not c.file.is_binary:
                         ${h.link_to(_('source'),h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
                        % endif
-                      % endif
                       % endif
                     </div>
                 </div>
                 <div class="commit">${_('Editing file')}: ${c.file.path}</div>
-            </div>
             </div>
 			    <pre id="editor_pre"></pre>
 				<textarea id="editor" name="content" style="display:none">${h.escape(c.file.content)|n}</textarea>
 				<div style="padding: 10px;color:#666666">${_('commit message')}</div>
 				<textarea id="commit" name="message" style="height: 60px;width: 99%;margin-left:4px"></textarea>
 			</div>
 			<div style="text-align: left;padding-top: 5px">
             ${h.submit('commit',_('Commit changes'),class_="ui-btn")}
             ${h.reset('reset',_('Reset'),class_="ui-btn")}
 			</div>
 			${h.end_form()}
 			<script type="text/javascript">
 			var reset_url = "${h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.file.path)}";
 			initCodeMirror('editor',reset_url);
 			</script>
-		</div>
 		</div>
     </div>
 </div>
 </%def>
@@ \ No newline at end of file @@
 </div>
 </%def>

rhodecode/templates/files/files_source.html

➞

Show inline comments

@@ @@ -2,101 +2,101 @@ @@
 	<dt style="padding-top:10px;font-size:16px">${_('History')}</dt>
 	<dd>
 		<div>
 		${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}
 		${h.hidden('diff2',c.file.last_changeset.raw_id)}
 		${h.select('diff1',c.file.last_changeset.raw_id,c.file_history)}
 		${h.submit('diff','diff to revision',class_="ui-btn")}
 		${h.submit('show_rev','show at revision',class_="ui-btn")}
 		${h.end_form()}
 		</div>
 	</dd>
 </dl>
 <div id="body" class="codeblock">
 	<div class="code-header">
         <div class="stats">
             <div class="left"><img src="${h.url('/images/icons/file.png')}"/></div>
-            <div class="left item"><pre>${h.link_to("r%s:%s" % (c.file.last_changeset.revision,h.short_id(c.file.last_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id))}</pre></div>
             <div class="left item"><pre>${h.link_to("r%s:%s" % (c.file.last_changeset.revision,h.short_id(c.file.last_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id))}</pre></div>
             <div class="left item">${h.format_byte_size(c.file.size,binary=True)}</div>
             <div class="left item last">${c.file.mimetype}</div>
             <div class="buttons">
               ${h.link_to(_('show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
-              ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
               ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
               ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
-              % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
               % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
                % if not c.file.is_binary:
                 ${h.link_to(_('edit'),h.url('files_edit_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
                % endif
-              % endif
               % endif
             </div>
         </div>
         <div class="author">
             <div class="gravatar">
                 <img alt="gravatar" src="${h.gravatar_url(h.email(c.changeset.author),16)}"/>
             </div>
             <div title="${c.changeset.author}" class="user">${h.person(c.changeset.author)}</div>
         </div>
 		<div class="commit">${c.file.last_changeset.message}</div>
 	</div>
 	<div class="code-body">
 	   %if c.file.is_binary:
 	       ${_('Binary file (%s)') % c.file.mimetype}
 	   %else:
 		% if c.file.size < c.cut_off_limit:
 			${h.pygmentize(c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
 		%else:
 			${_('File is too big to display')} ${h.link_to(_('show as raw'),
 			h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path))}
 		%endif
        <script type="text/javascript">
            function highlight_lines(lines){
                for(pos in lines){
-                 YUD.setStyle('L'+lines[pos],'background-color','#FFFFBE');
                  YUD.setStyle('L'+lines[pos],'background-color','#FFFFBE');
+               }
+           }
+           }
            page_highlights = location.href.substring(location.href.indexOf('#')+1).split('L');
            if (page_highlights.length == 2){
               highlight_ranges  = page_highlights[1].split(",");
               var h_lines = [];
               for (pos in highlight_ranges){
                    var _range = highlight_ranges[pos].split('-');
                    if(_range.length == 2){
                        var start = parseInt(_range[0]);
                        var end = parseInt(_range[1]);
                        if (start < end){
                            for(var i=start;i<=end;i++){
                                h_lines.push(i);
+                           }
+                       }
+                       }
+                   }
                    else{
                        h_lines.push(parseInt(highlight_ranges[pos]));
+                   }
+             }
            highlight_lines(h_lines);
            //remember original location
            //remember original location
            var old_hash  = location.href.substring(location.href.indexOf('#'));
            // this makes a jump to anchor moved by 3 posstions for padding
            // this makes a jump to anchor moved by 3 posstions for padding
            window.location.hash = '#L'+Math.max(parseInt(h_lines[0])-3,1);
            //sets old anchor
            //sets old anchor
            window.location.hash = old_hash;
+           }
        </script>
-     %endif
      %endif
 	</div>
 </div>
 <script type="text/javascript">
 YUE.onDOMReady(function(){
     YUE.on('show_rev','click',function(e){
     	YUE.preventDefault(e);
         var cs = YUD.get('diff1').value;
         var url = "${h.url('files_home',repo_name=c.repo_name,revision='__CS__',f_path=c.f_path)}".replace('__CS__',cs);
         window.location = url;
     });
     YUE.on('hlcode','mouseup',getSelectionLink("${_('Selection link')}"))

rhodecode/templates/files/files_ypjax.html

➞

Show inline comments

 %if c.file:
     <h3 class="files_location">
         ${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.changeset.raw_id,c.file.path)}
     </h3>
         %if c.file.is_dir():
             <%include file='files_browser.html'/>
         %else:
             <%include file='files_source.html'/>
         %endif
             <%include file='files_source.html'/>
         %endif
 %else:
     <h2>
         <a href="#" onClick="javascript:parent.history.back();" target="main">${_('Go back')}</a>
         ${_('No files at given path')}: "${c.f_path or "/"}"
         <a href="#" onClick="javascript:parent.history.back();" target="main">${_('Go back')}</a>
         ${_('No files at given path')}: "${c.f_path or "/"}"
     </h2>
 %endif

rhodecode/templates/followers/followers.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${c.repo_name} ${_('Followers')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
-    &raquo;
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
     ${_('followers')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('followers')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     <div class="table">
         <div id="followers">
             ${c.followers_data}
-        </div>
         </div>
     </div>
 </div>
 </%def>
@@ \ No newline at end of file @@
 </div>
 </%def>

rhodecode/templates/followers/followers_data.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 % for f in c.followers_pager:
     <div>
         <div class="follower_user">
             <div class="gravatar">
                 <img alt="gravatar" src="${h.gravatar_url(f.user.email,24)}"/>
             </div>
             <span style="font-size: 20px"> <b>${f.user.username}</b> (${f.user.name} ${f.user.lastname})</span>
         </div>
         <div style="clear:both;padding-top: 10px"></div>
-        <div class="follower_date">${_('Started following')} -
         <div class="follower_date">${_('Started following')} -
         <span class="tooltip" title="${f.follows_from}"> ${h.age(f.follows_from)}</span></div>
         <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div>
     </div>
 % endfor
     </div>
 % endfor
 <div class="pagination-wh pagination-left">
 <script type="text/javascript">
 YUE.onDOMReady(function(){
     YUE.delegate("followers","click",function(e, matchedEl, container){
         ypjax(e.target.href,"followers",function(){show_more_event();tooltip_activate();});
         YUE.preventDefault(e);
     },'.pager_link');
 });
 </script>
 ${c.followers_pager.pager('$link_previous ~2~ $link_next')}
 </div>
@@ \ No newline at end of file @@
 </div>

rhodecode/templates/forks/fork.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${c.repo_name} ${_('Fork')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
-    ${h.link_to(c.repo_info.repo_name,h.url('summary_home',repo_name=c.repo_info.repo_name))}
     ${h.link_to(c.repo_info.repo_name,h.url('summary_home',repo_name=c.repo_info.repo_name))}
     &raquo;
     ${_('fork')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
-        ${self.breadcrumbs()}
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('repo_fork_create_home',repo_name=c.repo_info.repo_name))}
     <div class="form">
         <!-- fields -->
         <div class="fields">
             <div class="field">
               <div class="label">
                   <label for="repo_name">${_('Fork name')}:</label>
               </div>
               <div class="input">
                   ${h.text('repo_name',class_="small")}
                   ${h.hidden('repo_type',c.repo_info.repo_type)}
                   ${h.hidden('fork_parent_id',c.repo_info.repo_id)}
               </div>
             </div>
             <div class="field">
                  <div class="label">
                      <label for="repo_group">${_('Repository group')}:</label>
                  </div>
                  <div class="input">
                      ${h.select('repo_group','',c.repo_groups,class_="medium")}
                  </div>
-            </div>
             </div>
             <div class="field">
                 <div class="label label-textarea">
                     <label for="description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${h.textarea('description',cols=23,rows=5)}
                 </div>
              </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="private">${_('Private')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('private',value="True")}
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="private">${_('Copy permissions')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('copy_permissions',value="True")}
                 </div>
-             </div>
              </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="private">${_('Update after clone')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('update_after_clone',value="True")}
                 </div>
-             </div>
              </div>
 	        <div class="buttons">
 	          ${h.submit('',_('fork this repository'),class_="ui-button")}
-	        </div>
 	        </div>
         </div>
     </div>
     ${h.end_form()}
     </div>
     ${h.end_form()}
 </div>
-</%def>
 </%def>

rhodecode/templates/forks/forks.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${c.repo_name} ${_('Forks')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
-    &raquo;
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
     ${_('forks')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('forks')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     <div class="table">
         <div id="forks">
             ${c.forks_data}
-        </div>
         </div>
     </div>
 </div>
 </%def>
@@ \ No newline at end of file @@
 </div>
 </%def>

rhodecode/templates/forks/forks_data.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 % if c.forks_pager:
 	% for f in c.forks_pager:
 	    <div>
 	        <div class="fork_user">
 	            <div class="gravatar">
 	                <img alt="gravatar" src="${h.gravatar_url(f.user.email,24)}"/>
 	            </div>
 	            <span style="font-size: 20px">
-	             <b>${f.user.username}</b> (${f.user.name} ${f.user.lastname}) /
 	             <b>${f.user.username}</b> (${f.user.name} ${f.user.lastname}) /
 	              ${h.link_to(f.repo_name,h.url('summary_home',repo_name=f.repo_name))}
 	             </span>
 	             <div style="padding:5px 3px 3px 42px;">${f.description}</div>
 	        </div>
 	        <div style="clear:both;padding-top: 10px"></div>
-	        <div class="follower_date">${_('forked')} -
 	        <div class="follower_date">${_('forked')} -
 	        <span class="tooltip" title="${f.created_on}"> ${h.age(f.created_on)}</span></div>
-	        <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div>
 	        <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div>
 	    </div>
 	% endfor
   <div class="pagination-wh pagination-left">
   <script type="text/javascript">
   YUE.onDOMReady(function(){
       YUE.delegate("forks","click",function(e, matchedEl, container){
           ypjax(e.target.href,"forks",function(){show_more_event();tooltip_activate();});
           YUE.preventDefault(e);
       },'.pager_link');
   });
   </script>
   ${c.forks_pager.pager('$link_previous ~2~ $link_next')}
-  </div>
   </div>
 % else:
 	${_('There are no forks yet')}
 % endif
@@ \ No newline at end of file @@
 	${_('There are no forks yet')}
 % endif

rhodecode/templates/index.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="base/base.html"/>
 <%def name="title()">${_('Dashboard')} - ${c.rhodecode_name}</%def>
 <%def name="breadcrumbs()"></%def>
 <%def name="page_nav()">${self.menu('home')}</%def>
 <%def name="main()">
     	<%include file="index_base.html" args="parent=self"/>
-</%def>
 </%def>

rhodecode/templates/index_base.html

➞

Show inline comments

-<%page args="parent" />
 <%page args="parent" />
     <div class="box">
         <!-- box / title -->
         <div class="title">
             <h5>
-            <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/> ${parent.breadcrumbs()} <span id="repo_count">0</span> ${_('repositories')}
             <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/> ${parent.breadcrumbs()} <span id="repo_count">0</span> ${_('repositories')}
             </h5>
             %if c.rhodecode_user.username != 'default':
                 %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>
                   </li>
                 </ul>
                 %endif
             %endif
         </div>
         <!-- end box / title -->
         <div class="table">
            % if c.groups:
             <div id='groups_list_wrap' class="yui-skin-sam">
               <table id="groups_list">
                   <thead>
                       <tr>
                           <th class="left"><a href="#">${_('Group name')}</a></th>
                           <th class="left"><a href="#">${_('Description')}</a></th>
                           ##<th class="left"><a href="#">${_('Number of repositories')}</a></th>
                       </tr>
                   </thead>
                   ## REPO GROUPS
                   % for gr in c.groups:
                     <tr>
                         <td>
                             <div style="white-space: nowrap">
                             <img class="icon" alt="${_('Repositories group')}" src="${h.url('/images/icons/database_link.png')}"/>
                             ${h.link_to(gr.name,url('repos_group_home',group_name=gr.group_name))}
                             </div>
                         </td>
                         <td>${gr.group_description}</td>
                         ##<td><b>${gr.repositories.count()}</b></td>
                     </tr>
                   % endfor
               </table>
             </div>
             <div style="height: 20px"></div>
             % endif
             <div id="welcome" style="display:none;text-align:center">
                 <h1><a href="${h.url('home')}">${c.rhodecode_name} ${c.rhodecode_version}</a></h1>
             </div>
             <div id='repos_list_wrap' class="yui-skin-sam">
             <%cnt=0%>
             <%namespace name="dt" file="/_data_table/_dt_elements.html"/>
             <table id="repos_list">
             <thead>
                 <tr>
                     <th class="left"></th>
                     <th class="left">${_('Name')}</th>
                     <th class="left">${_('Description')}</th>
                     <th class="left">${_('Last change')}</th>
                     <th class="left">${_('Tip')}</th>
                     <th class="left">${_('Owner')}</th>
                     <th class="left">${_('RSS')}</th>
                     <th class="left">${_('Atom')}</th>
                 </tr>
@@ @@ -78,118 +78,118 @@ @@
                       ${dt.repo_name(repo['name'],repo['dbrepo']['repo_type'],repo['dbrepo']['private'],repo['dbrepo_fork'].get('repo_name'))}
                     </td>
                     ##DESCRIPTION
                     <td><span class="tooltip" title="${h.tooltip(repo['description'])}">
                        ${h.truncate(repo['description'],60)}</span>
                     </td>
                     ##LAST CHANGE DATE
                     <td>
                       <span class="tooltip" title="${repo['last_change']}">${h.age(repo['last_change'])}</span>
                     </td>
                     ##LAST REVISION
                     <td>
-                        ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])}
                         ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])}
                     </td>
                     ##
                     <td title="${repo['contact']}">${h.person(repo['contact'])}</td>
                     <td>
                       %if c.rhodecode_user.username != 'default':
                         <a title="${_('Subscribe to %s rss feed')%repo['name']}" class="rss_icon"  href="${h.url('rss_feed_home',repo_name=repo['name'],api_key=c.rhodecode_user.api_key)}"></a>
                       %else:
                         <a title="${_('Subscribe to %s rss feed')%repo['name']}" class="rss_icon"  href="${h.url('rss_feed_home',repo_name=repo['name'])}"></a>
                       %endif:
                     </td>
                       %endif:
                     </td>
                     <td>
                       %if c.rhodecode_user.username != 'default':
                         <a title="${_('Subscribe to %s atom feed')%repo['name']}"  class="atom_icon" href="${h.url('atom_feed_home',repo_name=repo['name'],api_key=c.rhodecode_user.api_key)}"></a>
                       %else:
                         <a title="${_('Subscribe to %s atom feed')%repo['name']}"  class="atom_icon" href="${h.url('atom_feed_home',repo_name=repo['name'])}"></a>
                       %endif:
                     </td>
                 </tr>
             %endfor
             </tbody>
             </table>
             </div>
         </div>
     </div>
     <script>
-      YUD.get('repo_count').innerHTML = ${cnt};
       YUD.get('repo_count').innerHTML = ${cnt};
       var func = function(node){
           return node.parentNode.parentNode.parentNode.parentNode;
+      }
       // groups table sorting
       var myColumnDefs = [
           {key:"name",label:"${_('Group Name')}",sortable:true,
               sortOptions: { sortFunction: groupNameSort }},
           {key:"desc",label:"${_('Description')}",sortable:true},
       ];
       var myDataSource = new YAHOO.util.DataSource(YUD.get("groups_list"));
       myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;
       myDataSource.responseSchema = {
           fields: [
               {key:"name"},
               {key:"desc"},
+          ]
       };
       var myDataTable = new YAHOO.widget.DataTable("groups_list_wrap", myColumnDefs, myDataSource,
+              {
                sortedBy:{key:"name",dir:"asc"},
                MSG_SORTASC:"${_('Click to sort ascending')}",
                MSG_SORTDESC:"${_('Click to sort descending')}"
+              }
       );
       // main table sorting
       var myColumnDefs = [
           {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},
           {key:"name",label:"${_('Name')}",sortable:true,
               sortOptions: { sortFunction: nameSort }},
           {key:"desc",label:"${_('Description')}",sortable:true},
           {key:"last_change",label:"${_('Last Change')}",sortable:true,
               sortOptions: { sortFunction: ageSort }},
           {key:"tip",label:"${_('Tip')}",sortable:true,
         	  sortOptions: { sortFunction: revisionSort }},
           {key:"owner",label:"${_('Owner')}",sortable:true},
           {key:"rss",label:"",sortable:false},
           {key:"atom",label:"",sortable:false},
       ];
       var myDataSource = new YAHOO.util.DataSource(YUD.get("repos_list"));
       myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;
       myDataSource.responseSchema = {
           fields: [
               {key:"menu"},
               {key:"name"},
               {key:"desc"},
               {key:"last_change"},
               {key:"tip"},
               {key:"owner"},
               {key:"rss"},
               {key:"atom"},
+          ]
       };
       var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,
+              {
                sortedBy:{key:"name",dir:"asc"},
                MSG_SORTASC:"${_('Click to sort ascending')}",
                MSG_SORTDESC:"${_('Click to sort descending')}",
                MSG_EMPTY:"${_('No records found.')}",
                MSG_ERROR:"${_('Data error.')}",
-               MSG_LOADING:"${_('Loading...')}",
                MSG_LOADING:"${_('Loading...')}",
+              }
       );
       myDataTable.subscribe('postRenderEvent',function(oArgs) {
           tooltip_activate();
           quick_repo_menu();
           q_filter('q_filter',YUQ('div.table tr td a.repo_name'),func);
       });
     </script>
@@ \ No newline at end of file @@
           q_filter('q_filter',YUQ('div.table tr td a.repo_name'),func);
       });
     </script>

rhodecode/templates/journal/journal.html

➞

Show inline comments

 ## -*- 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>
              <ul class="links">
                <li>
                  <span><a id="refresh" href="${h.url('journal')}"><img class="icon" title="${_('Refresh')}" alt="${_('Refresh')}" src="${h.url('/images/icons/arrow_refresh.png')}"/>
                  </a></span>
                </li>
              </ul>
 	    </div>
                </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...')}"/>
             <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 repos')}</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'),h.url('admin_settings_create_repository'))}</span>
                </li>
              </ul>
              %endif
                </li>
              </ul>
              %endif
         </div>
         <!-- end box / title -->
         <div id="my" class="table">
             %if c.user_repos:
             <div id='repos_list_wrap' class="yui-skin-sam">
             <table id="repos_list">
              <thead>
                   <tr>
                   <th></th>
                   <th class="left">${_('Name')}</th>
                   <th class="left">${_('Tip')}</th>
                   <th class="left">${_('Action')}</th>
-                  <th class="left">${_('Action')}</th>
                   <th class="left">${_('Action')}</th>
              </thead>
              <tbody>
                  <%namespace name="dt" file="/_data_table/_dt_elements.html"/>
                  %for repo in c.user_repos:
                     <tr>
                         ##QUICK MENU
                         <td class="quick_repo_menu">
                           ${dt.quick_menu(repo['name'])}
                         </td>
                         ##REPO NAME AND ICONS
                         <td class="reponame">
                           ${dt.repo_name(repo['name'],repo['dbrepo']['repo_type'],repo['dbrepo']['private'],repo['dbrepo_fork'].get('repo_name'))}
                         </td>
                         ##LAST REVISION
                         <td>
-                            ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])}
                             ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])}
                         </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()}
                           ${h.end_form()}
                         </td>
                     </tr>
                  %endfor
              </tbody>
              </table>
              </div>
              %else:
                 <div style="padding:5px 0px 10px 0px;">
-                ${_('No repositories yet')}
                 ${_('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-btn")}
                 %endif
                 </div>
-             %endif
              %endif
         </div>
         <div id="watched" class="table" style="display:none">
           %if c.following:
             <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>
                         </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
                          %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
             </tbody>
             </table>
           %else:
               <div style="padding:5px 0px 10px 0px;">
               ${_('You are not following any users or repositories')}
               </div>
           %endif
         </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.parentNode.parentNode;
+        }
         q_filter(target,nodes,func);
+        }
         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);
         q_filter(target,nodes,func);
         YUE.preventDefault(e);
     })
     YUE.on('refresh','click',function(e){
         ypjax(e.currentTarget.href,"journal",function(){show_more_event();tooltip_activate();});
         YUE.preventDefault(e);
     });
     // main table sorting
     var myColumnDefs = [
         {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},
         {key:"name",label:"${_('Name')}",sortable:true,
             sortOptions: { sortFunction: nameSort }},
         {key:"tip",label:"${_('Tip')}",sortable:true,
             sortOptions: { sortFunction: revisionSort }},
         {key:"action1",label:"",sortable:false},
         {key:"action2",label:"",sortable:false},
     ];
     var myDataSource = new YAHOO.util.DataSource(YUD.get("repos_list"));
     myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;
     myDataSource.responseSchema = {
         fields: [
             {key:"menu"},
             {key:"name"},
             {key:"tip"},
             {key:"action1"},
             {key:"action2"}
+        ]
     };
     var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,
+            {
               sortedBy:{key:"name",dir:"asc"},
               MSG_SORTASC:"${_('Click to sort ascending')}",
               MSG_SORTDESC:"${_('Click to sort descending')}",
               MSG_EMPTY:"${_('No records found.')}",
               MSG_ERROR:"${_('Data error.')}",
-              MSG_LOADING:"${_('Loading...')}",
               MSG_LOADING:"${_('Loading...')}",
+            }
     );
     myDataTable.subscribe('postRenderEvent',function(oArgs) {
         tooltip_activate();
         quick_repo_menu();
         var func = function(node){
             return node.parentNode.parentNode.parentNode.parentNode;
+        }
+        }
         q_filter('q_filter',YUQ('#my tr td a.repo_name'),func);
     });
     </script>
 </%def>
     });
     </script>
 </%def>

rhodecode/templates/journal/journal_data.html

➞

Show inline comments

@@ @@ -11,39 +11,39 @@ @@
 	            <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
 		                %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>
 %else:
   <div style="padding:5px 0px 10px 10px;">
       ${_('No entries yet')}
   </div>
 %endif
@@ \ No newline at end of file @@
   </div>
 %endif

rhodecode/templates/journal/public_journal.html

➞

Show inline comments

 ## -*- 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 / title -->
 	    <div class="title">
 	        <h5>${_('Public Journal')}</h5>
                 <ul class="links">
                   <li>
                     <span>${h.link_to(_('RSS'),h.url('public_journal_rss'),class_='rss_icon')}</span>
                   </li>
                   <li>
                     <span>${h.link_to(_('Atom'),h.url('public_journal_atom'),class_='atom_icon')}</span>
                   </li>
                 </ul>
                   </li>
                 </ul>
 	    </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>
 		</script>
 	    <div id="journal">${c.journal_data}</div>
     </div>
 </%def>
 </%def>

rhodecode/templates/login.html

➞

Show inline comments

@@ @@ -6,69 +6,69 @@ @@
 </%def>
 <div id="login">
 <div class="flash_msg">
     <% messages = h.flash.pop_messages() %>
     % if messages:
     <ul id="flash-messages">
         % for message in messages:
         <li class="${message.category}_msg">${message}</li>
         % endfor
     </ul>
     % endif
-</div>
 </div>
     <!-- login -->
     <div class="title top-left-rounded-corner top-right-rounded-corner">
         <h5>${_('Sign In to')} ${c.rhodecode_name}</h5>
     </div>
-    <div class="inner">
     <div class="inner">
         ${h.form(h.url.current(came_from=c.came_from))}
         <div class="form">
             <!-- fields -->
             <div class="fields">
                 <div class="field">
                     <div class="label">
                         <label for="username">${_('Username')}:</label>
                     </div>
                     <div class="input">
                         ${h.text('username',class_='focus',size=40)}
                     </div>
                 </div>
                 </div>
                 <div class="field">
                     <div class="label">
                         <label for="password">${_('Password')}:</label>
                     </div>
                     <div class="input">
                         ${h.password('password',class_='focus',size=40)}
                     </div>
                 </div>
                 <div class="field">
                     <div class="checkbox">
                         <input type="checkbox" id="remember" name="remember" />
                         <label for="remember">${_('Remember me')}</label>
                     </div>
                 </div>
                 <div class="buttons">
                     ${h.submit('sign_in',_('Sign In'),class_="ui-button")}
                 </div>
             </div>
             <!-- end fields -->
             <!-- links -->
             <div class="links">
                 ${h.link_to(_('Forgot your password ?'),h.url('reset_password'))}
                 %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
+                  /
+                  /
                  ${h.link_to(_("Don't have an account ?"),h.url('register'))}
                 %endif
             </div>
             <!-- end links -->
         </div>
         ${h.end_form()}
         <script type="text/javascript">
         YUE.onDOMReady(function(){
         	YUD.get('username').focus();
         })
         </script>

rhodecode/templates/password_reset.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="base/root.html"/>
 <%def name="title()">
     ${_('Reset your password')} - ${c.rhodecode_name}
 </%def>
 <div id="register">
 	<div class="title top-left-rounded-corner top-right-rounded-corner">
 		<h5>${_('Reset your password to')} ${c.rhodecode_name}</h5>
 	</div>
 	<div class="inner">
 	    ${h.form(url('password_reset'))}
 	    <div class="form">
 	        <!-- fields -->
 	        <div class="fields">
 	             <div class="field">
 	                <div class="label">
 	                    <label for="email">${_('Email address')}:</label>
 	                </div>
 	                <div class="input">
 	                    ${h.text('email')}
 	                </div>
 	             </div>
 	            <div class="buttons">
 		            <div class="nohighlight">
 		              ${h.submit('send',_('Reset my password'),class_="ui-button")}
 					  	<div class="activation_msg">${_('Password reset link will be send to matching email address')}</div>
 		            </div>
-	            </div>
 	            </div>
 	    	</div>
 	    </div>
 	    ${h.end_form()}
         <script type="text/javascript">
         YUE.onDOMReady(function(){
             YUD.get('email').focus();
         })
         </script>
 	</div>
         </script>
 	</div>
    </div>

rhodecode/templates/register.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="base/root.html"/>
 <%def name="title()">
     ${_('Sign Up')} - ${c.rhodecode_name}
 </%def>
 <div id="register">
 	<div class="title top-left-rounded-corner top-right-rounded-corner">
 		<h5>${_('Sign Up to')} ${c.rhodecode_name}</h5>
 	</div>
 	<div class="inner">
 	    ${h.form(url('register'))}
 	    <div class="form">
 	        <!-- fields -->
 	        <div class="fields">
 	             <div class="field">
 	                <div class="label">
 	                    <label for="username">${_('Username')}:</label>
 	                </div>
 	                <div class="input">
 	                    ${h.text('username',class_="medium")}
 	                </div>
 	             </div>
 	             <div class="field">
 	                <div class="label">
 	                    <label for="password">${_('Password')}:</label>
 	                </div>
 	                <div class="input">
 	                    ${h.password('password',class_="medium")}
 	                </div>
 	             </div>
                        <div class="field">
                           <div class="label">
                               <label for="password">${_('Re-enter password')}:</label>
                           </div>
                           <div class="input">
                               ${h.password('password_confirmation',class_="medium")}
                           </div>
                        </div>
 	             <div class="field">
 	                <div class="label">
 	                    <label for="name">${_('First Name')}:</label>
 	                </div>
 	                <div class="input">
 	                    ${h.text('name',class_="medium")}
 	                </div>
 	             </div>
 	             <div class="field">
 	                <div class="label">
 	                    <label for="lastname">${_('Last Name')}:</label>
 	                </div>
 	                <div class="input">
 	                    ${h.text('lastname',class_="medium")}
 	                </div>
 	             </div>
 	             <div class="field">
 	                <div class="label">
 	                    <label for="email">${_('Email')}:</label>
 	                </div>
 	                <div class="input">
 	                    ${h.text('email',class_="medium")}
 	                </div>
 	             </div>
 	            <div class="buttons">
 		            <div class="nohighlight">
 		              ${h.submit('sign_up',_('Sign Up'),class_="ui-button")}
 		              %if c.auto_active:
 					  	<div class="activation_msg">${_('Your account will be activated right after registration')}</div>
 					  %else:
 					  	<div class="activation_msg">${_('Your account must wait for activation by administrator')}</div>
 					  %endif
 		            </div>
-	            </div>
 	            </div>
 	    	</div>
 	    </div>
 	    ${h.end_form()}
         <script type="text/javascript">
         YUE.onDOMReady(function(){
             YUD.get('username').focus();
         })
         </script>
 	</div>
         </script>
 	</div>
  </div>

rhodecode/templates/repo_switcher_list.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <li class="qfilter_rs">
     <input type="text" style="border:0" value="quick filter..." name="filter" size="15" id="q_filter_rs" />
 </li>
 %for repo in c.repos_list:
       %if repo['dbrepo']['private']:
          <li>
              <img src="${h.url('/images/icons/lock.png')}" alt="${_('Private repository')}" class="repo_switcher_type"/>
              ${h.link_to(repo['name'],h.url('summary_home',repo_name=repo['name']),class_="repo_name %s" % repo['dbrepo']['repo_type'])}
           </li>
       %else:
          <li>
              <img src="${h.url('/images/icons/lock_open.png')}" alt="${_('Public repository')}" class="repo_switcher_type" />
              ${h.link_to(repo['name'],h.url('summary_home',repo_name=repo['name']),class_="repo_name %s" % repo['dbrepo']['repo_type'])}
          </li>
       %endif
 %endfor
@@ \ No newline at end of file @@
       %endif
 %endfor

rhodecode/templates/search/search.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
    ${_('Search')}
-   ${'"%s"' % c.cur_query if c.cur_query else None}
    ${'"%s"' % c.cur_query if c.cur_query else None}
 	%if c.repo_name:
 		${_('in repository: ') + c.repo_name}
 	%else:
-		${_('in all repositories')}
 		${_('in all repositories')}
 	%endif
 	- ${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 / title -->
 	<div class="title">
 		<h5>${_('Search')}
 		%if c.repo_name:
 			${_('in repository: ') + c.repo_name}
 		%else:
 			${_('in all repositories')}
-		%endif
 		%endif
 		</h5>
 	</div>
 	<!-- end box / title -->
 	%if c.repo_name:
-		${h.form(h.url('search_repo',search_repo=c.repo_name),method='get')}
 		${h.form(h.url('search_repo',search_repo=c.repo_name),method='get')}
 	%else:
 		${h.form(h.url('search'),method='get')}
 	%endif
 	<div class="form">
 		<div class="fields">
 			<div class="field field-first field-noborder">
              <div class="label">
                  <label for="q">${_('Search term')}</label>
-             </div>
              </div>
 				<div class="input">${h.text('q',c.cur_query,class_="small")}
 					<div class="button highlight">
 						<input type="submit" value="${_('Search')}" class="ui-button"/>
 					</div>
 				</div>
-				<div style="font-weight: bold;clear:Both;margin-left:200px">${c.runtime}</div>
 				<div style="font-weight: bold;clear:Both;margin-left:200px">${c.runtime}</div>
 			</div>
 			<div class="field">
 	            <div class="label">
 	                <label for="type">${_('Search in')}</label>
 	            </div>
                 <div class="select">
                     ${h.select('type',c.cur_type,[('content',_('File contents')),
                         ##('commit',_('Commit messages')),
                         ('path',_('File names')),
                         ##('repository',_('Repository names')),
-                        ])}
                         ])}
                 </div>
              </div>
 		</div>
 	</div>
 	${h.end_form()}
     %if c.cur_search == 'content':
         <%include file='search_content.html'/>
     %elif c.cur_search == 'path':
         <%include file='search_path.html'/>
     %elif c.cur_search == 'commit':
         <%include file='search_commit.html'/>
     %elif c.cur_search == 'repository':
         <%include file='search_repository.html'/>
-    %endif
     %endif
 </div>
-</%def>
 </%def>

rhodecode/templates/search/search_content.html

➞

Show inline comments

@@ @@ -10,22 +10,22 @@ @@
             </div>
             <div class="code-body">
                 <pre>${h.literal(sr['content_short_hl'])}</pre>
             </div>
         </div>
     </div>
     %else:
         %if cnt == 0:
         <div class="table">
             <div id="body${cnt}" class="codeblock">
                 <div class="error">${_('Permission denied')}</div>
             </div>
-        </div>
         </div>
         %endif
     %endif
     %endif
 %endfor
 %if c.cur_query and c.formated_results:
 <div class="pagination-wh pagination-left">
     ${c.formated_results.pager('$link_previous ~2~ $link_next')}
 </div>
 %endif
@@ \ No newline at end of file @@
 </div>
 %endif

rhodecode/templates/search/search_path.html

➞

Show inline comments

 ##path search
 %for cnt,sr in enumerate(c.formated_results):
     %if h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(sr['repository'],'search results check'):
 	    <div class="search_path">
 	        <div class="link">
 	            ${h.link_to(h.literal('%s &raquo; %s' % (sr['repository'],sr['f_path'])),
-	                h.url('files_home',repo_name=sr['repository'],revision='tip',f_path=sr['f_path']))}
 	                h.url('files_home',repo_name=sr['repository'],revision='tip',f_path=sr['f_path']))}
 	        </div>
 	    </div>
     %else:
         %if cnt == 0:
 		    <div class="error">
 		        <div class="link">
-		            ${_('Permission denied')}
 		            ${_('Permission denied')}
 		        </div>
-		    </div>
 		    </div>
         %endif
     %endif
     %endif
 %endfor
 %if c.cur_query and c.formated_results:
 <div class="pagination-wh pagination-left">
     ${c.formated_results.pager('$link_previous ~2~ $link_next')}
-</div>
 </div>
 %endif

rhodecode/templates/settings/repo_settings.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${c.repo_name} ${_('Settings')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
     ${h.link_to(c.repo_info.repo_name,h.url('summary_home',repo_name=c.repo_info.repo_name))}
     &raquo;
     ${_('Settings')}
     ${h.link_to(c.repo_info.repo_name,h.url('summary_home',repo_name=c.repo_info.repo_name))}
     &raquo;
     ${_('Settings')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('settings')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
-        ${self.breadcrumbs()}
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('repo_settings_update', repo_name=c.repo_info.repo_name),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
             <div class="field">
                 <div class="label">
                     <label for="repo_name">${_('Name')}:</label>
                 </div>
                 <div class="input input-medium">
                     ${h.text('repo_name',class_="small")}
                 </div>
              </div>
             <div class="field">
                 <div class="label">
                     <label for="repo_group">${_('Repository group')}:</label>
                 </div>
                 <div class="input">
                     ${h.select('repo_group','',c.repo_groups,class_="medium")}
                 </div>
-            </div>
             </div>
             <div class="field">
                 <div class="label label-textarea">
                     <label for="description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${h.textarea('description',cols=23,rows=5)}
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="private">${_('Private')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('private',value="True")}
                 </div>
             </div>
              <div class="field">
                 <div class="label">
                     <label for="">${_('Permissions')}:</label>
                 </div>
                 <div class="input">
                     <%include file="../admin/repos/repo_edit_perms.html"/>
                 </div>
             <div class="buttons">
               ${h.submit('save','Save',class_="ui-button")}
               ${h.reset('reset','Reset',class_="ui-button")}
-            </div>
             </div>
         </div>
-    </div>
     </div>
     ${h.end_form()}
 </div>
 </div>
 </%def>
 </%def>

rhodecode/templates/shortlog/shortlog.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${c.repo_name} ${_('Shortlog')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
-    &raquo;
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
     ${_('shortlog')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('shortlog')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     <div class="table">
 	    <div id="shortlog_data">
 	        ${c.shortlog_data}
 	    </div>
     </div>
 </div>
 </%def>
@@ \ No newline at end of file @@
 </div>
 </%def>

rhodecode/templates/shortlog/shortlog_data.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 %if c.repo_changesets:
 <table class="table_disp">
 	<tr>
-	    <th class="left">${_('revision')}</th>
 	    <th class="left">${_('revision')}</th>
         <th class="left">${_('commit message')}</th>
 		<th class="left">${_('age')}</th>
 		<th class="left">${_('author')}</th>
 		<th class="left">${_('branch')}</th>
 		<th class="left">${_('tags')}</th>
 	</tr>
 %for cnt,cs in enumerate(c.repo_changesets):
 	<tr class="parity${cnt%2}">
         <td>
             <div><pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id)}">r${cs.revision}:${h.short_id(cs.raw_id)}</a></pre></div>
-        </td>
         </td>
         <td>
             ${h.link_to(h.truncate(cs.message,50),
             h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id),
             title=cs.message)}
         </td>
         <td><span class="tooltip" title="${cs.date}">
                       ${h.age(cs.date)}</span>
-        </td>
         </td>
 		<td title="${cs.author}">${h.person(cs.author)}</td>
 		<td>
 			<span class="logtags">
 				<span class="branchtag">${cs.branch}</span>
 			</span>
 		</td>
 		<td>
 			<span class="logtags">
 				%for tag in cs.tags:
 					<span class="tagtag">${tag}</span>
 				%endfor
 			</span>
 		</td>
 	</tr>
 %endfor
 </table>
 <script type="text/javascript">
   YUE.onDOMReady(function(){
     YUE.delegate("shortlog_data","click",function(e, matchedEl, container){
         ypjax(e.target.href,"shortlog_data",function(){tooltip_activate();});
         YUE.preventDefault(e);
-    },'.pager_link');
     },'.pager_link');
   });
 </script>
 <div class="pagination-wh pagination-left">
 ${c.repo_changesets.pager('$link_previous ~2~ $link_next')}
 </div>
 %else:
 %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
 <h4>${_('Add or upload files directly via RhodeCode')}</h4>
 <div style="margin: 20px 30px;">
   <div id="add_node_id" class="add_node">
       <a class="ui-btn" href="${h.url('files_add_home',repo_name=c.repo_name,revision=0,f_path='')}">${_('add new file')}</a>
   </div>
 </div>
 %endif
-<h4>${_('Push new repo')}</h4>
 <h4>${_('Push new repo')}</h4>
 <pre>
     ${c.rhodecode_repo.alias} clone ${c.clone_repo_url}
     ${c.rhodecode_repo.alias} add README # add first file
     ${c.rhodecode_repo.alias} commit -m "Initial" # commit with message
     ${c.rhodecode_repo.alias} push # push changes back
 </pre>
 <h4>${_('Existing repository?')}</h4>
 <pre>
     ${c.rhodecode_repo.alias} push ${c.clone_repo_url}
-</pre>
 </pre>
 %endif

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)