aboutsummaryrefslogtreecommitdiff
path: root/rhodecode/templates
diff options
context:
space:
mode:
authorMads Kiilerich <madski@unity3d.com>2013-03-26 23:29:54 +0100
committerMads Kiilerich <madski@unity3d.com>2013-03-26 23:29:54 +0100
commit204626cae64b349fc7e521336d5b7a3c6fa07fdf (patch)
tree843dc59d6d9c7e2dffca661b0f22aa5cac98683d /rhodecode/templates
parentc07b35aa5885212a5e5efcca0f339e559c4ceb7a (diff)
move repo actions from their own menu line to Options menu
--HG-- branch : beta
Diffstat (limited to 'rhodecode/templates')
-rw-r--r--rhodecode/templates/base/base.html34
1 files changed, 15 insertions, 19 deletions
diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html
index 2991eea9..f30dcf18 100644
--- a/rhodecode/templates/base/base.html
+++ b/rhodecode/templates/base/base.html
@@ -87,7 +87,7 @@
if c.repository_following:
return h.literal('following')
else:
- return h.literal('follow')
+ return h.literal('follow')
%>
<%
def is_current(selected):
@@ -103,24 +103,6 @@
&raquo;
${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
</div>
- ## TODO: this check feels wrong, it would be better to have a check for permissions
- ## also it feels like a job for the controller
- %if c.rhodecode_user.username != 'default':
- <ul id="context-actions" class="horizontal-list">
- <li>
- <button class="${follow_class()}" onclick="javascript:toggleFollowingRepo(this,${c.rhodecode_db_repo.repo_id},'${str(h.get_token())}');">
- <!--span class="icon show-follow follow"></span>
- <span class="icon show-following following"></span-->
- <span class="show-follow">${_('Follow')}</span>
- <span class="show-following">${_('Unfollow')}</span>
- </button>
- </li>
- <li><a href="${h.url('repo_fork_home',repo_name=c.repo_name)}" class="fork">${_('Fork')}</a></li>
- %if h.is_hg(c.rhodecode_repo):
- <li><a href="${h.url('pullrequest_home',repo_name=c.repo_name)}" class="pull-request">${_('Create Pull Request')}</a></li>
- %endif
- </ul>
- %endif
</div>
<div id="context-state">
<ul id="context-pages" class="horizontal-list">
@@ -156,6 +138,20 @@
<li>${h.link_to(_('Lock'), h.url('toggle_locking',repo_name=c.repo_name),class_='locking_add')}</li>
%endif
%endif
+ ## TODO: this check feels wrong, it would be better to have a check for permissions
+ ## also it feels like a job for the controller
+ %if c.rhodecode_user.username != 'default':
+ <li>
+ <a class="${follow_class()}" onclick="javascript:toggleFollowingRepo(this,${c.rhodecode_db_repo.repo_id},'${str(h.get_token())}');">
+ <span class="show-follow">${_('Follow')}</span>
+ <span class="show-following">${_('Unfollow')}</span>
+ </a>
+ </li>
+ <li><a href="${h.url('repo_fork_home',repo_name=c.repo_name)}" class="fork">${_('Fork')}</a></li>
+ %if h.is_hg(c.rhodecode_repo):
+ <li><a href="${h.url('pullrequest_home',repo_name=c.repo_name)}" class="pull-request">${_('Create Pull Request')}</a></li>
+ %endif
+ %endif
</ul>
</li>
<li ${is_current('showpullrequest')}>