rhodecode-enterprise-ce Files · rhodecode/templates/admin/admin.html

vcs: Return merge reference in merge response....

vcs: Return merge reference in merge response. Previously we returned only the merge commit id. Now we set a bookmark(hg) or branch reference(git) to point to the merge commit. By returning a merge reference we have both informations available (id and name)

marcink - - Load All Authors

File last commit:

r1:854a839a default


                r1051:668a5e47

default

Download file

             admin.html
        
                    40 lines
            
             | 1.2 KiB
            
                | text/html
            
             |
                HtmlLexer
            
             / rhodecode / templates / admin / admin.html
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      ## -*- coding: utf-8 -*-

      <%inherit file="/base/base.html"/>

      <%def name="title()">

          ${_('Admin journal')}

          %if c.rhodecode_name:

              &middot; ${h.branding(c.rhodecode_name)}

          %endif

      </%def>

      <%def name="breadcrumbs_links()">

          ${h.form(None, id_="filter_form", method="get")}

              <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or ''}" placeholder="${_('journal filter...')}"/>

              <input type='submit' value="${_('filter')}" class="btn" />

              ${_('Admin journal')} - ${ungettext('%s entry', '%s entries', c.users_log.item_count) % (c.users_log.item_count)}

          ${h.end_form()}

          <p class="tooltip filterexample" title="${h.tooltip(h.journal_filter_help())}">${_('Example Queries')}</p>

      </%def>

      <%def name="menu_bar_nav()">

          ${self.menu_items(active='admin')}

      </%def>

      <%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>

      <script>

      $('#j_filter').autoGrowInput();

      </script>

      </%def>

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				## -- coding: utf-8 --
				<%inherit file="/base/base.html"/>

				<%def name="title()">
				${_('Admin journal')}
				%if c.rhodecode_name:
				· ${h.branding(c.rhodecode_name)}
				%endif
				</%def>

				<%def name="breadcrumbs_links()">
				${h.form(None, id_="filter_form", method="get")}
				<input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or ''}" placeholder="${_('journal filter...')}"/>
				<input type='submit' value="${_('filter')}" class="btn" />
				${_('Admin journal')} - ${ungettext('%s entry', '%s entries', c.users_log.item_count) % (c.users_log.item_count)}
				${h.end_form()}
				<p class="tooltip filterexample" title="${h.tooltip(h.journal_filter_help())}">${_('Example Queries')}</p>
				</%def>

				<%def name="menu_bar_nav()">
				${self.menu_items(active='admin')}
				</%def>
				<%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>

				<script>
				$('#j_filter').autoGrowInput();
				</script>
				</%def>