upstream/kallithea Files · rhodecode/templates/switch_to_list.html

Migrate to Mergely 3.3.4....

Migrate to Mergely 3.3.4. RhodeCode 2.2.5 distributed Mergely 3.3.4 with some of the changes that Mergely 3.3.3 in RhodeCode 1.7.2 also had. That do however not seem to be changes we want for Kallithea this way and we take the 3.3.4 files as they are. I've also included the Mergely license file, as downloaded from: http://www.mergely.com/license.php That LICENSE file is kept in HTML just as it was downloaded from their website. While it's a bit annoying to keep the license file in HTML, this is the way it came from upstream so we'll leave it that way. Since the Javascript code is used with other GPLv3 Javascript, we are using the GPL option of Mergely's tri-license. Finally, note that previously, this was incorrectly called "mergerly", so the opportunity is taken here to correct the name. That required changes to diff_2way.html. As commands:: $ wget -N --output-document LICENSE-MERGELY.html http://www.mergely.com/license.php $ hg add LICENSE-MERGELY.html $ hg mv rhodecode/public/css/mergerly.css rhodecode/public/css/mergely.css $ hg mv rhodecode/public/js/mergerly.js rhodecode/public/js/mergely.js $ sed -i 's,mergerly\.,mergely,g' rhodecode/templates/files/diff_2way.html $ ( cd /tmp; \ wget -N http://www.mergely.com/releases/mergely-3.3.4.zip; \ unzip mergely-3.3.4.zip ) $ sha256sum /tmp/mergely-3.3.4.zip 87415d30494bbe829c248881aa7cdc0303f7e70b458a5f687615564d4498cc82 mergely-3.3.4.zip $ cp /tmp/mergely-3.3.4/lib/mergely.js rhodecode/public/js/mergely.js $ cp /tmp/mergely-3.3.4/lib/mergely.css rhodecode/public/css/mergely.css $ sed -i -e '/^ \* Version/a\ *\n * NOTE by bkuhn@sfconservancy.org for Kallithea:\n * Mergely license appears at http://www.mergely.com/license.php and in LICENSE-MERGELY.html' rhodecode/public/js/mergely.js rhodecode/public/css/mergely.css

Bradley M. Kuhn - - Load All Authors

File last commit:

r4116:ffd45b18 rhodecode-2.2.5-gpl


                r4125:aa3b5594

rhodecode-2.2.5-gpl

Download file

             switch_to_list.html
        
                    49 lines
            
             | 2.5 KiB
            
                | text/html
            
             |
                HtmlLexer
            
             / rhodecode / templates / switch_to_list.html
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        marcink
    
White-space cleanup

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

        marcink
    
lazy load of branches and tags menu...

              r1608
            
      <li>

        Bradley M. Kuhn
    
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....

              r4116
            
          <a href="${h.url('branches_home',repo_name=c.repo_name)}" class="childs"><i class="icon-code-fork"></i> ${'%s (%s)' % (_('Branches'),len(c.rhodecode_repo.branches.values()),)}</a>

        marcink
    
lazy load of branches and tags menu...

              r1608
            
          <ul>

          %if c.rhodecode_repo.branches.values():

              %for cnt,branch in enumerate(c.rhodecode_repo.branches.items()):

        marcink
    
added same switch to logic for tags and bookmarks containing /....

              r3425
            
                  <li><div><pre>${h.link_to('%s - %s' % (branch[0],h.short_id(branch[1])),h.url('files_home',repo_name=c.repo_name,revision=(branch[0] if '/' not in branch[0] else branch[1]), at=branch[0]))}</pre></div></li>

        marcink
    
lazy load of branches and tags menu...

              r1608
            
              %endfor

          %else:

              <li>${h.link_to(_('There are no branches yet'),'#')}</li>

          %endif

        marcink
    
White-space cleanup

              r1888
            
          </ul>

        marcink
    
lazy load of branches and tags menu...

              r1608
            
      </li>

        Mads Kiilerich
    
branch selectors: show closed branches too...

              r4020
            
      %if c.rhodecode_repo.closed_branches.values():

      <li>

        Bradley M. Kuhn
    
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....

              r4116
            
          <a href="${h.url('branches_home',repo_name=c.repo_name)}" class="childs"><i class="icon-code-fork"></i> ${'%s (%s)' % (_('Closed Branches'),len(c.rhodecode_repo.closed_branches.values()))}</a>

        Mads Kiilerich
    
branch selectors: show closed branches too...

              r4020
            
          <ul>

              %for cnt,branch in enumerate(c.rhodecode_repo.closed_branches.items()):

                  <li><div><pre>${h.link_to('%s - %s' % (branch[0],h.short_id(branch[1])),h.url('files_home',repo_name=c.repo_name,revision=(branch[0] if '/' not in branch[0] else branch[1]), at=branch[0]))}</pre></div></li>

              %endfor

          </ul>

      </li>

      %endif

        marcink
    
lazy load of branches and tags menu...

              r1608
            
      <li>

        Bradley M. Kuhn
    
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....

              r4116
            
          <a href="${h.url('tags_home',repo_name=c.repo_name)}" class="childs"><i class="icon-tag"></i> ${'%s (%s)' % (_('Tags'),len(c.rhodecode_repo.tags.values()),)}</a>

        marcink
    
lazy load of branches and tags menu...

              r1608
            
          <ul>

          %if c.rhodecode_repo.tags.values():

              %for cnt,tag in enumerate(c.rhodecode_repo.tags.items()):

        marcink
    
added same switch to logic for tags and bookmarks containing /....

              r3425
            
               <li><div><pre>${h.link_to('%s - %s' % (tag[0],h.short_id(tag[1])),h.url('files_home',repo_name=c.repo_name,revision=(tag[0] if '/' not in tag[0] else tag[1]), at=tag[0]))}</pre></div></li>

        marcink
    
lazy load of branches and tags menu...

              r1608
            
              %endfor

          %else:

              <li>${h.link_to(_('There are no tags yet'),'#')}</li>

          %endif

        marcink
    
White-space cleanup

              r1888
            
          </ul>

        marcink
    
implements #135 bookmark support for UI

              r1748
            
      </li>

        marcink
    
White-space cleanup

              r1888
            
      %if c.rhodecode_repo.alias == 'hg':

        marcink
    
implements #135 bookmark support for UI

              r1748
            
      <li>

        Bradley M. Kuhn
    
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....

              r4116
            
          <a href="${h.url('bookmarks_home',repo_name=c.repo_name)}" class="childs"><i class="icon-bookmark"></i> ${'%s (%s)' % (_('Bookmarks'),len(c.rhodecode_repo.bookmarks.values()),)}</a>

        marcink
    
implements #135 bookmark support for UI

              r1748
            
          <ul>

          %if c.rhodecode_repo.bookmarks.values():

              %for cnt,book in enumerate(c.rhodecode_repo.bookmarks.items()):

        marcink
    
added same switch to logic for tags and bookmarks containing /....

              r3425
            
               <li><div><pre>${h.link_to('%s - %s' % (book[0],h.short_id(book[1])),h.url('files_home',repo_name=c.repo_name,revision=(book[0] if '/' not in book[0] else book[1]), at=book[0]))}</pre></div></li>

        marcink
    
implements #135 bookmark support for UI

              r1748
            
              %endfor

          %else:

              <li>${h.link_to(_('There are no bookmarks yet'),'#')}</li>

          %endif

        marcink
    
White-space cleanup

              r1888
            
          </ul>

      </li>

      %endif

	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

marcink White-space cleanup	r1888	## -- coding: utf-8 --
marcink lazy load of branches and tags menu...	r1608	<li>
Bradley M. Kuhn Imported some of the GPLv3'd changes from RhodeCode v2.2.5....	r4116	<a href="${h.url('branches_home',repo_name=c.repo_name)}" class="childs"><i class="icon-code-fork"></i> ${'%s (%s)' % (_('Branches'),len(c.rhodecode_repo.branches.values()),)}</a>
marcink lazy load of branches and tags menu...	r1608	<ul>
		%if c.rhodecode_repo.branches.values():
		%for cnt,branch in enumerate(c.rhodecode_repo.branches.items()):
marcink added same switch to logic for tags and bookmarks containing /....	r3425	<li><div><pre>${h.link_to('%s - %s' % (branch[0],h.short_id(branch[1])),h.url('files_home',repo_name=c.repo_name,revision=(branch[0] if '/' not in branch[0] else branch[1]), at=branch[0]))}</pre></div></li>
marcink lazy load of branches and tags menu...	r1608	%endfor
		%else:
		<li>${h.link_to(_('There are no branches yet'),'#')}</li>
		%endif
marcink White-space cleanup	r1888	</ul>
marcink lazy load of branches and tags menu...	r1608	</li>
Mads Kiilerich branch selectors: show closed branches too...	r4020	%if c.rhodecode_repo.closed_branches.values():
		<li>
Bradley M. Kuhn Imported some of the GPLv3'd changes from RhodeCode v2.2.5....	r4116	<a href="${h.url('branches_home',repo_name=c.repo_name)}" class="childs"><i class="icon-code-fork"></i> ${'%s (%s)' % (_('Closed Branches'),len(c.rhodecode_repo.closed_branches.values()))}</a>
Mads Kiilerich branch selectors: show closed branches too...	r4020	<ul>
		%for cnt,branch in enumerate(c.rhodecode_repo.closed_branches.items()):
		<li><div><pre>${h.link_to('%s - %s' % (branch[0],h.short_id(branch[1])),h.url('files_home',repo_name=c.repo_name,revision=(branch[0] if '/' not in branch[0] else branch[1]), at=branch[0]))}</pre></div></li>
		%endfor
		</ul>
		</li>
		%endif
marcink lazy load of branches and tags menu...	r1608	<li>
Bradley M. Kuhn Imported some of the GPLv3'd changes from RhodeCode v2.2.5....	r4116	<a href="${h.url('tags_home',repo_name=c.repo_name)}" class="childs"><i class="icon-tag"></i> ${'%s (%s)' % (_('Tags'),len(c.rhodecode_repo.tags.values()),)}</a>
marcink lazy load of branches and tags menu...	r1608	<ul>
		%if c.rhodecode_repo.tags.values():
		%for cnt,tag in enumerate(c.rhodecode_repo.tags.items()):
marcink added same switch to logic for tags and bookmarks containing /....	r3425	<li><div><pre>${h.link_to('%s - %s' % (tag[0],h.short_id(tag[1])),h.url('files_home',repo_name=c.repo_name,revision=(tag[0] if '/' not in tag[0] else tag[1]), at=tag[0]))}</pre></div></li>
marcink lazy load of branches and tags menu...	r1608	%endfor
		%else:
		<li>${h.link_to(_('There are no tags yet'),'#')}</li>
		%endif
marcink White-space cleanup	r1888	</ul>
marcink implements #135 bookmark support for UI	r1748	</li>
marcink White-space cleanup	r1888	%if c.rhodecode_repo.alias == 'hg':
marcink implements #135 bookmark support for UI	r1748	<li>
Bradley M. Kuhn Imported some of the GPLv3'd changes from RhodeCode v2.2.5....	r4116	<a href="${h.url('bookmarks_home',repo_name=c.repo_name)}" class="childs"><i class="icon-bookmark"></i> ${'%s (%s)' % (_('Bookmarks'),len(c.rhodecode_repo.bookmarks.values()),)}</a>
marcink implements #135 bookmark support for UI	r1748	<ul>
		%if c.rhodecode_repo.bookmarks.values():
		%for cnt,book in enumerate(c.rhodecode_repo.bookmarks.items()):
marcink added same switch to logic for tags and bookmarks containing /....	r3425	<li><div><pre>${h.link_to('%s - %s' % (book[0],h.short_id(book[1])),h.url('files_home',repo_name=c.repo_name,revision=(book[0] if '/' not in book[0] else book[1]), at=book[0]))}</pre></div></li>
marcink implements #135 bookmark support for UI	r1748	%endfor
		%else:
		<li>${h.link_to(_('There are no bookmarks yet'),'#')}</li>
		%endif
marcink White-space cleanup	r1888	</ul>
		</li>
		%endif