ui: introduce user-bookmarks for creation of quick shortcuts

rhodecode/lib/dbmigrate/versions/094_version_4_16_0.py

@@ -0,0 +1,30 b''
+import logging
+
+from sqlalchemy import *
+
+from rhodecode.model import meta
+from rhodecode.lib.dbmigrate.versions import _reset_base, notify
+
+log = logging.getLogger(__name__)
+
+
+def upgrade(migrate_engine):
+    """
+    Upgrade operations go here.
+    Don't create your own engine; bind migrate_engine to your metadata
+    """
+    _reset_base(migrate_engine)
+    from rhodecode.lib.dbmigrate.schema import db_4_16_0_1 as db
+
+    db.UserBookmark.__table__.create()
+
+    fixups(db, meta.Session)
+
+
+def downgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+
+def fixups(models, _SESSION):
+    pass

rhodecode/templates/admin/my_account/my_account_bookmarks.mako

@@ -0,0 +1,222 b''
+<%namespace name="dt" file="/data_table/_dt_elements.mako"/>
+
+<%def name="form_item(count, position=None, title=None, redirect_url=None, repo=None, repo_group=None)">
+    <tr>
+        <td class="td-align-top" >
+            <div class="label">
+                <label for="position">${_('Position')}:</label>
+            </div>
+            <div class="input">
+                <input type="text" name="position" value="${position or count}" style="width: 40px"/>
+            </div>
+        </td>
+
+        <td>
+            <div class="label">
+                <label for="title">${_('Bookmark title (max 30 characters, optional)')}:</label>
+            </div>
+            <div class="input">
+                <input type="text" name="title" value="${title}" style="width: 300px" maxlength="30"/>
+
+                <div class="field pull-right">
+                    <div>
+                        <label class="btn-link btn-danger">${_('Clear')}:</label>
+                        ${h.checkbox('remove', value=True)}
+                    </div>
+         </div>
+            </div>
+
+            <div class="label">
+                <label for="redirect_url">${_('Redirect URL')}:</label>
+            </div>
+            <div class="input">
+                <input type="text" name="redirect_url" value="${redirect_url}" style="width: 600px"/>
+            </div>
+
+
+            <div class="select">
+                % if repo:
+                    <div class="label">
+                        <label for="redirect_url">${_('Repository template')}:</label>
+                    </div>
+                    ${dt.repo_name(name=repo.repo_name, rtype=repo.repo_type,rstate=None,private=None,archived=False,fork_of=False)}
+                    ${h.hidden('bookmark_repo', repo.repo_id)}
+                % elif repo_group:
+                    <div class="label">
+                        <label for="redirect_url">${_('Repository group template')}:</label>
+                    </div>
+                    ${dt.repo_group_name(repo_group.group_name)}
+                    ${h.hidden('bookmark_repo_group', repo_group.group_id)}
+                % else:
+                    <div class="label">
+                        <label for="redirect_url">${_('Template Repository or Repository group')}:</label>
+                    </div>
+                    ${h.hidden('bookmark_repo', class_='bookmark_repo')}
+                    <span style="padding-right:15px">OR</span>
+                    ${h.hidden('bookmark_repo_group', class_='bookmark_repo_group')}
+                % endif
+            </div>
+
+            <p class="help-block help-block-inline" >
+            % if repo:
+                ${_('Available as ${repo_url}  e.g. Redirect url: ${repo_url}/changelog')}
+            % elif repo_group:
+                ${_('Available as ${repo_group_url} e.g. Redirect url: ${repo_group_url}')}
+            % else:
+                ${_('Available as full url variables in redirect url. i.e: ${repo_url}, ${repo_group_url}.')}
+            % endif
+            </p>
+        </td>
+
+    </tr>
+</%def>
+
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">${_('Your Bookmarks')}</h3>
+    </div>
+
+    <div class="panel-body">
+        <p>
+            ${_('Store upto 10 bookmark links to favorite repositories, external issue tracker or CI server. ')}
+            <br/>
+            ${_('Bookmarks are accessible from your username dropdown or by keyboard shortcut `g 0-9`')}
+        </p>
+
+        ${h.secure_form(h.route_path('my_account_bookmarks_update'), request=request)}
+        <div class="form-vertical">
+        <table class="rctable">
+        ## generate always 10 entries
+        <input type="hidden" name="__start__" value="bookmarks:sequence"/>
+        % for cnt, item in enumerate((c.bookmark_items + [None for i in range(10)])[:10]):
+            <input type="hidden" name="__start__" value="bookmark:mapping"/>
+            % if item is None:
+                ## empty placehodlder
+                ${form_item(cnt)}
+            % else:
+                ## actual entry
+                ${form_item(cnt, position=item.position, title=item.title, redirect_url=item.redirect_url, repo=item.repository, repo_group=item.repository_group)}
+            % endif
+            <input type="hidden" name="__end__" value="bookmark:mapping"/>
+        % endfor
+        <input type="hidden" name="__end__" value="bookmarks:sequence"/>
+        </table>
+        <div class="buttons">
+          ${h.submit('save',_('Save'),class_="btn")}
+        </div>
+        </div>
+        ${h.end_form()}
+    </div>
+</div>
+
+<script>
+$(document).ready(function(){
+
+
+    var repoFilter = function (data) {
+        var results = [];
+
+        if (!data.results[0]) {
+            return data
+        }
+
+        $.each(data.results[0].children, function () {
+            // replace name to ID for submision
+            this.id = this.repo_id;
+            results.push(this);
+        });
+
+        data.results[0].children = results;
+        return data;
+    };
+
+
+    $(".bookmark_repo").select2({
+        cachedDataSource: {},
+        minimumInputLength: 2,
+        placeholder: "${_('repository')}",
+        dropdownAutoWidth: true,
+        containerCssClass: "drop-menu",
+        dropdownCssClass: "drop-menu-dropdown",
+        formatResult: formatRepoResult,
+        query: $.debounce(250, function (query) {
+            self = this;
+            var cacheKey = query.term;
+            var cachedData = self.cachedDataSource[cacheKey];
+
+            if (cachedData) {
+                query.callback({results: cachedData.results});
+            } else {
+                $.ajax({
+                    url: pyroutes.url('repo_list_data'),
+                    data: {'query': query.term},
+                    dataType: 'json',
+                    type: 'GET',
+                    success: function (data) {
+                        data = repoFilter(data);
+                        self.cachedDataSource[cacheKey] = data;
+                        query.callback({results: data.results});
+                    },
+                    error: function (data, textStatus, errorThrown) {
+                        alert("Error while fetching entries.\nError code {0} ({1}).".format(data.status, data.statusText));
+                    }
+                })
+            }
+        }),
+    });
+
+    var repoGroupFilter = function (data) {
+        var results = [];
+
+        if (!data.results[0]) {
+            return data
+        }
+
+        $.each(data.results[0].children, function () {
+            // replace name to ID for submision
+            this.id = this.repo_group_id;
+            results.push(this);
+        });
+
+        data.results[0].children = results;
+        return data;
+    };
+
+    $(".bookmark_repo_group").select2({
+        cachedDataSource: {},
+        minimumInputLength: 2,
+        placeholder: "${_('repository group')}",
+        dropdownAutoWidth: true,
+        containerCssClass: "drop-menu",
+        dropdownCssClass: "drop-menu-dropdown",
+        formatResult: formatRepoGroupResult,
+        query: $.debounce(250, function (query) {
+            self = this;
+            var cacheKey = query.term;
+            var cachedData = self.cachedDataSource[cacheKey];
+
+            if (cachedData) {
+                query.callback({results: cachedData.results});
+            } else {
+                $.ajax({
+                    url: pyroutes.url('repo_group_list_data'),
+                    data: {'query': query.term},
+                    dataType: 'json',
+                    type: 'GET',
+                    success: function (data) {
+                        data = repoGroupFilter(data);
+                        self.cachedDataSource[cacheKey] = data;
+                        query.callback({results: data.results});
+                    },
+                    error: function (data, textStatus, errorThrown) {
+                        alert("Error while fetching entries.\nError code {0} ({1}).".format(data.status, data.statusText));
+                    }
+                })
+            }
+        })
+    });
+
+
+});
+
+</script>

rhodecode/__init__.py

@@ -45,7 +45,7 b' PYRAMID_SETTINGS = {}'
 EXTENSIONS = {}
 
 __version__ = ('.'.join((str(each) for each in VERSION[:3])))
-__dbversion__ = 93  # defines current db version for migrations
+__dbversion__ = 94  # defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'AGPLv3, and Commercial License'
 __author__ = 'RhodeCode GmbH'

rhodecode/apps/home/__init__.py

@@ -56,6 +56,10 b' def includeme(config):'
         pattern='/_repos')
 
     config.add_route(
+        name='repo_group_list_data',
+        pattern='/_repo_groups')
+
+    config.add_route(
         name='goto_switcher_data',
         pattern='/_goto_data')
 

rhodecode/apps/home/views.py

@@ -172,7 +172,9 b' class HomeView(BaseAppView):'
                 'id': obj.group_name,
                 'value': org_query,
                 'value_display': obj.group_name,
+                'text': obj.group_name,
                 'type': 'repo_group',
+                'repo_group_id': obj.group_id,
                 'url': h.route_path(
                     'repo_group_home', repo_group_name=obj.group_name)
             }
@@ -302,6 +304,33 b' class HomeView(BaseAppView):'
         }
         return data
 
+    @LoginRequired()
+    @view_config(
+        route_name='repo_group_list_data', request_method='GET',
+        renderer='json_ext', xhr=True)
+    def repo_group_list_data(self):
+        _ = self.request.translate
+        self.load_default_context()
+
+        query = self.request.GET.get('query')
+
+        log.debug('generating repo group list, query:%s',
+                  query)
+
+        res = []
+        repo_groups = self._get_repo_group_list(query)
+        if repo_groups:
+            res.append({
+                'text': _('Repository Groups'),
+                'children': repo_groups
+            })
+
+        data = {
+            'more': False,
+            'results': res
+        }
+        return data
+
     def _get_default_search_queries(self, search_context, searcher, query):
         if not searcher:
             return []

rhodecode/apps/my_account/__init__.py

@@ -95,6 +95,18 b' def includeme(config):'
         pattern=ADMIN_PREFIX + '/my_account/watched')
 
     config.add_route(
+        name='my_account_bookmarks',
+        pattern=ADMIN_PREFIX + '/my_account/bookmarks')
+
+    config.add_route(
+        name='my_account_bookmarks_update',
+        pattern=ADMIN_PREFIX + '/my_account/bookmarks/update')
+
+    config.add_route(
+        name='my_account_goto_bookmark',
+        pattern=ADMIN_PREFIX + '/my_account/bookmark/{bookmark_id}')
+
+    config.add_route(
         name='my_account_perms',
         pattern=ADMIN_PREFIX + '/my_account/perms')
 

rhodecode/apps/my_account/views/my_account.py

@@ -20,29 +20,30 b''
 
 import logging
 import datetime
+import string
 
 import formencode
 import formencode.htmlfill
+import peppercorn
 from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config
-from pyramid.renderers import render
-from pyramid.response import Response
 
 from rhodecode.apps._base import BaseAppView, DataGridAppView
 from rhodecode import forms
 from rhodecode.lib import helpers as h
 from rhodecode.lib import audit_logger
 from rhodecode.lib.ext_json import json
-from rhodecode.lib.auth import LoginRequired, NotAnonymous, CSRFRequired
+from rhodecode.lib.auth import LoginRequired, NotAnonymous, CSRFRequired, \
+    HasRepoPermissionAny, HasRepoGroupPermissionAny
 from rhodecode.lib.channelstream import (
     channelstream_request, ChannelstreamException)
 from rhodecode.lib.utils2 import safe_int, md5, str2bool
 from rhodecode.model.auth_token import AuthTokenModel
 from rhodecode.model.comment import CommentsModel
 from rhodecode.model.db import (
-    Repository, UserEmailMap, UserApiKeys, UserFollowing, joinedload,
-    PullRequest)
-from rhodecode.model.forms import UserForm, UserExtraEmailForm
+    IntegrityError, joinedload,
+    Repository, UserEmailMap, UserApiKeys, UserFollowing,
+    PullRequest, UserBookmark, RepoGroup)
 from rhodecode.model.meta import Session
 from rhodecode.model.pull_request import PullRequestModel
 from rhodecode.model.scm import RepoList
@@ -392,6 +393,140 b' class MyAccountView(BaseAppView, DataGri'
     @LoginRequired()
     @NotAnonymous()
     @view_config(
+        route_name='my_account_bookmarks', request_method='GET',
+        renderer='rhodecode:templates/admin/my_account/my_account.mako')
+    def my_account_bookmarks(self):
+        c = self.load_default_context()
+        c.active = 'bookmarks'
+        return self._get_template_context(c)
+
+    def _process_entry(self, entry, user_id):
+        position = safe_int(entry.get('position'))
+        if position is None:
+            return
+
+        # check if this is an existing entry
+        is_new = False
+        db_entry = UserBookmark().get_by_position_for_user(position, user_id)
+
+        if db_entry and str2bool(entry.get('remove')):
+            log.debug('Marked bookmark %s for deletion', db_entry)
+            Session().delete(db_entry)
+            return
+
+        if not db_entry:
+            # new
+            db_entry = UserBookmark()
+            is_new = True
+
+        should_save = False
+        default_redirect_url = ''
+
+        # save repo
+        if entry.get('bookmark_repo'):
+            repo = Repository.get(entry['bookmark_repo'])
+            perm_check = HasRepoPermissionAny(
+                'repository.read', 'repository.write', 'repository.admin')
+            if repo and perm_check(repo_name=repo.repo_name):
+                db_entry.repository = repo
+                should_save = True
+                default_redirect_url = '${repo_url}'
+        # save repo group
+        elif entry.get('bookmark_repo_group'):
+            repo_group = RepoGroup.get(entry['bookmark_repo_group'])
+            perm_check = HasRepoGroupPermissionAny(
+                'group.read', 'group.write', 'group.admin')
+
+            if repo_group and perm_check(group_name=repo_group.group_name):
+                db_entry.repository_group = repo_group
+                should_save = True
+                default_redirect_url = '${repo_group_url}'
+        # save generic info
+        elif entry.get('title') and entry.get('redirect_url'):
+            should_save = True
+
+        if should_save:
+            log.debug('Saving bookmark %s, new:%s', db_entry, is_new)
+            # mark user and position
+            db_entry.user_id = user_id
+            db_entry.position = position
+            db_entry.title = entry.get('title')
+            db_entry.redirect_url = entry.get('redirect_url') or default_redirect_url
+
+            Session().add(db_entry)
+
+    @LoginRequired()
+    @NotAnonymous()
+    @CSRFRequired()
+    @view_config(
+        route_name='my_account_bookmarks_update', request_method='POST')
+    def my_account_bookmarks_update(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+        c.active = 'bookmarks'
+
+        controls = peppercorn.parse(self.request.POST.items())
+        user_id = c.user.user_id
+
+        try:
+            for entry in controls.get('bookmarks', []):
+                self._process_entry(entry, user_id)
+
+            Session().commit()
+            h.flash(_("Update Bookmarks"), category='success')
+        except IntegrityError:
+            h.flash(_("Failed to update bookmarks. "
+                      "Make sure an unique position is used"), category='error')
+
+        return HTTPFound(h.route_path('my_account_bookmarks'))
+
+    @LoginRequired()
+    @NotAnonymous()
+    @view_config(
+        route_name='my_account_goto_bookmark', request_method='GET',
+        renderer='rhodecode:templates/admin/my_account/my_account.mako')
+    def my_account_goto_bookmark(self):
+
+        bookmark_id = self.request.matchdict['bookmark_id']
+        user_bookmark = UserBookmark().query()\
+            .filter(UserBookmark.user_id == self.request.user.user_id) \
+            .filter(UserBookmark.position == bookmark_id).scalar()
+
+        redirect_url = h.route_path('my_account_bookmarks')
+        if not user_bookmark:
+            raise HTTPFound(redirect_url)
+
+        if user_bookmark.repository:
+            repo_name = user_bookmark.repository.repo_name
+            base_redirect_url = h.route_path(
+                'repo_summary', repo_name=repo_name)
+            if user_bookmark.redirect_url and \
+                    '${repo_url}' in user_bookmark.redirect_url:
+                redirect_url = string.Template(user_bookmark.redirect_url)\
+                    .safe_substitute({'repo_url': base_redirect_url})
+            else:
+                redirect_url = base_redirect_url
+
+        elif user_bookmark.repository_group:
+            repo_group_name = user_bookmark.repository_group.group_name
+            base_redirect_url = h.route_path(
+                'repo_group_home', repo_group_name=repo_group_name)
+            if user_bookmark.redirect_url and \
+                    '${repo_group_url}' in user_bookmark.redirect_url:
+                redirect_url = string.Template(user_bookmark.redirect_url)\
+                    .safe_substitute({'repo_group_url': base_redirect_url})
+            else:
+                redirect_url = base_redirect_url
+
+        elif user_bookmark.redirect_url:
+            redirect_url = user_bookmark.redirect_url
+
+        log.debug('Redirecting bookmark %s to %s', user_bookmark, redirect_url)
+        raise HTTPFound(redirect_url)
+
+    @LoginRequired()
+    @NotAnonymous()
+    @view_config(
         route_name='my_account_perms', request_method='GET',
         renderer='rhodecode:templates/admin/my_account/my_account.mako')
     def my_account_perms(self):

rhodecode/lib/base.py

@@ -44,7 +44,7 b' from rhodecode.lib.exceptions import Use'
 from rhodecode.lib.utils import (password_changed, get_enabled_hook_classes)
 from rhodecode.lib.utils2 import (
     str2bool, safe_unicode, AttributeDict, safe_int, sha1, aslist, safe_str)
-from rhodecode.model.db import Repository, User, ChangesetComment
+from rhodecode.model.db import Repository, User, ChangesetComment, UserBookmark
 from rhodecode.model.notification import NotificationModel
 from rhodecode.model.settings import VcsSettingsModel, SettingsModel
 
@@ -282,7 +282,7 b' def get_current_lang(request):'
     return getattr(request, '_LOCALE_', request.locale_name)
 
 
-def attach_context_attributes(context, request, user_id):
+def attach_context_attributes(context, request, user_id=None):
     """
     Attach variables into template context called `c`.
     """
@@ -422,7 +422,13 b' def attach_context_attributes(context, r'
     context.csrf_token = auth.get_csrf_token(session=request.session)
     context.backends = rhodecode.BACKENDS.keys()
     context.backends.sort()
-    context.unread_notifications = NotificationModel().get_unread_cnt_for_user(user_id)
+    unread_count = 0
+    user_bookmark_list = []
+    if user_id:
+        unread_count = NotificationModel().get_unread_cnt_for_user(user_id)
+        user_bookmark_list = UserBookmark.get_bookmarks_for_user(user_id)
+    context.unread_notifications = unread_count
+    context.bookmark_items = user_bookmark_list
 
     # web case
     if hasattr(request, 'user'):

rhodecode/model/db.py

@@ -4797,6 +4797,49 b' class UserGroupToRepoBranchPermission(Ba'
             self.user_group_repo_to_perm, self.branch_pattern)
 
 
+class UserBookmark(Base, BaseModel):
+    __tablename__ = 'user_bookmarks'
+    __table_args__ = (
+        UniqueConstraint('user_id', 'bookmark_repo_id'),
+        UniqueConstraint('user_id', 'bookmark_repo_group_id'),
+        UniqueConstraint('user_id', 'bookmark_position'),
+        base_table_args
+    )
+
+    user_bookmark_id = Column("user_bookmark_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
+    position = Column("bookmark_position", Integer(), nullable=False)
+    title = Column("bookmark_title", String(255), nullable=True, unique=None, default=None)
+    redirect_url = Column("bookmark_redirect_url", String(10240), nullable=True, unique=None, default=None)
+    created_on = Column("created_on", DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+
+    bookmark_repo_id = Column("bookmark_repo_id", Integer(), ForeignKey("repositories.repo_id"), nullable=True, unique=None, default=None)
+    bookmark_repo_group_id = Column("bookmark_repo_group_id", Integer(), ForeignKey("groups.group_id"), nullable=True, unique=None, default=None)
+
+    user = relationship("User")
+
+    repository = relationship("Repository")
+    repository_group = relationship("RepoGroup")
+
+    @classmethod
+    def get_by_position_for_user(cls, position, user_id):
+        return cls.query() \
+            .filter(UserBookmark.user_id == user_id) \
+            .filter(UserBookmark.position == position).scalar()
+
+    @classmethod
+    def get_bookmarks_for_user(cls, user_id):
+        return cls.query() \
+            .filter(UserBookmark.user_id == user_id) \
+            .options(joinedload(UserBookmark.repository)) \
+            .options(joinedload(UserBookmark.repository_group)) \
+            .order_by(UserBookmark.position.asc()) \
+            .all()
+
+    def __unicode__(self):
+        return u'<UserBookmark(%d @ %r)>' % (self.position, self.redirect_url)
+
+
 class DbMigrateVersion(Base, BaseModel):
     __tablename__ = 'db_migrate_version'
     __table_args__ = (

rhodecode/public/css/login.less

@@ -200,7 +200,27 b''
 .user-menu.submenu {
     right: 0; 
     left: auto;
+    min-width: 290px;
 }
+
+
+.user-menu {
+    .bookmark-items {
+        padding: 4px 2px;
+        color: @grey3;
+        border-bottom: @grey3;
+
+        a {
+            padding: 0 !important;
+            color: @rcblue !important;
+        }
+    }
+    a.bookmark-item {
+        color: @rcblue !important;
+    }
+}
+
+
 #quick_login {
     left: auto;
     right: 0;

rhodecode/public/css/navigation.less

@@ -335,6 +335,7 b''
             }
         }
     }
+
 }
 
 

rhodecode/public/css/tables.less

@@ -172,7 +172,9 b' table.dataTable {'
         &.td-buttons {
             padding: .3em 0;
         }
-
+        &.td-align-top {
+            vertical-align: text-top
+        }
         &.td-action {
             // this is for the remove/delete/edit buttons
             padding-right: 0;

rhodecode/public/css/type.less

@@ -526,6 +526,10 b' address {'
   font-family: @text-regular;
 }
 
+.help-block-inline {
+  margin: 0;
+}
+
 // help block text
 .help-block {
   display: block;

rhodecode/public/js/rhodecode/base/keyboard-bindings.js

@@ -51,6 +51,38 b' function setRCMouseBindings(repoName, re'
     Mousetrap.bind(['g G'], function(e) {
         window.location = pyroutes.url('gists_show', {'public': 1});
     });
+
+    Mousetrap.bind(['g 0'], function(e) {
+        window.location = pyroutes.url('my_account_goto_bookmark', {'bookmark_id': 0});
+    });
+    Mousetrap.bind(['g 1'], function(e) {
+        window.location = pyroutes.url('my_account_goto_bookmark', {'bookmark_id': 1});
+    });
+    Mousetrap.bind(['g 2'], function(e) {
+        window.location = pyroutes.url('my_account_goto_bookmark', {'bookmark_id': 2});
+    });
+    Mousetrap.bind(['g 3'], function(e) {
+        window.location = pyroutes.url('my_account_goto_bookmark', {'bookmark_id': 3});
+    });
+    Mousetrap.bind(['g 4'], function(e) {
+        window.location = pyroutes.url('my_account_goto_bookmark', {'bookmark_id': 4});
+    });
+    Mousetrap.bind(['g 5'], function(e) {
+        window.location = pyroutes.url('my_account_goto_bookmark', {'bookmark_id': 5});
+    });
+    Mousetrap.bind(['g 6'], function(e) {
+        window.location = pyroutes.url('my_account_goto_bookmark', {'bookmark_id': 6});
+    });
+    Mousetrap.bind(['g 7'], function(e) {
+        window.location = pyroutes.url('my_account_goto_bookmark', {'bookmark_id': 7});
+    });
+    Mousetrap.bind(['g 8'], function(e) {
+        window.location = pyroutes.url('my_account_goto_bookmark', {'bookmark_id': 8});
+    });
+    Mousetrap.bind(['g 9'], function(e) {
+        window.location = pyroutes.url('my_account_goto_bookmark', {'bookmark_id': 9});
+    });
+
     Mousetrap.bind(['n g'], function(e) {
         window.location = pyroutes.url('gists_new');
     });
@@ -58,7 +90,7 b' function setRCMouseBindings(repoName, re'
         window.location = pyroutes.url('repo_new');
     });
 
-    if (repoName && repoName != '') {
+    if (repoName && repoName !== '') {
         // nav in repo context
         Mousetrap.bind(['g s'], function(e) {
             window.location = pyroutes.url(

rhodecode/public/js/rhodecode/routes.js

@@ -143,6 +143,7 b' function registerRCRoutes() {'
     pyroutes.register('user_autocomplete_data', '/_users', []);
     pyroutes.register('user_group_autocomplete_data', '/_user_groups', []);
     pyroutes.register('repo_list_data', '/_repos', []);
+    pyroutes.register('repo_group_list_data', '/_repo_groups', []);
     pyroutes.register('goto_switcher_data', '/_goto_data', []);
     pyroutes.register('markup_preview', '/_markup_preview', []);
     pyroutes.register('store_user_session_value', '/_store_session_attr', []);
@@ -297,6 +298,9 b' function registerRCRoutes() {'
     pyroutes.register('my_account_emails_delete', '/_admin/my_account/emails/delete', []);
     pyroutes.register('my_account_repos', '/_admin/my_account/repos', []);
     pyroutes.register('my_account_watched', '/_admin/my_account/watched', []);
+    pyroutes.register('my_account_bookmarks', '/_admin/my_account/bookmarks', []);
+    pyroutes.register('my_account_bookmarks_update', '/_admin/my_account/bookmarks/update', []);
+    pyroutes.register('my_account_goto_bookmark', '/_admin/my_account/bookmark/%(bookmark_id)s', ['bookmark_id']);
     pyroutes.register('my_account_perms', '/_admin/my_account/perms', []);
     pyroutes.register('my_account_notifications', '/_admin/my_account/notifications', []);
     pyroutes.register('my_account_notifications_toggle_visibility', '/_admin/my_account/toggle_visibility', []);

rhodecode/templates/admin/my_account/my_account.mako

@@ -28,6 +28,7 b''
         <ul class="nav nav-pills nav-stacked">
           <li class="${'active' if c.active=='profile' or c.active=='profile_edit' else ''}"><a href="${h.route_path('my_account_profile')}">${_('Profile')}</a></li>
           <li class="${'active' if c.active=='password' else ''}"><a href="${h.route_path('my_account_password')}">${_('Password')}</a></li>
+          <li class="${'active' if c.active=='bookmarks' else ''}"><a href="${h.route_path('my_account_bookmarks')}">${_('Bookmarks')}</a></li>
           <li class="${'active' if c.active=='auth_tokens' else ''}"><a href="${h.route_path('my_account_auth_tokens')}">${_('Auth Tokens')}</a></li>
           <li class="${'active' if c.active in ['ssh_keys', 'ssh_keys_generate'] else ''}"><a href="${h.route_path('my_account_ssh_keys')}">${_('SSH Keys')}</a></li>
           <li class="${'active' if c.active=='user_group_membership' else ''}"><a href="${h.route_path('my_account_user_group_membership')}">${_('User Group Membership')}</a></li>

rhodecode/templates/base/base.mako

@@ -52,7 +52,7 b''
            <p class="server-instance" style="display:${sid}">
                ## display hidden instance ID if specially defined
                % if c.rhodecode_instanceid:
-                   ${_('RhodeCode instance id: %s') % c.rhodecode_instanceid}
+                   ${_('RhodeCode instance id: {}').format(c.rhodecode_instanceid)}
                % endif
            </p>
        </div>
@@ -331,6 +331,50 b''
                       <li>${h.link_to(_(u'My personal group'), h.route_path('repo_group_home', repo_group_name=c.rhodecode_user.personal_repo_group.group_name))}</li>
                       % endif
                       <li>${h.link_to(_(u'Pull Requests'), h.route_path('my_account_pullrequests'))}</li>
+                      ## bookmark-items
+                      <li class="bookmark-items">
+                          ${_('Bookmarks')}
+                          <div class="pull-right">
+                              <a href="${h.route_path('my_account_bookmarks')}">${_('Manage')}</a>
+                          </div>
+                      </li>
+                      % if not c.bookmark_items:
+                          <li>
+                              <a href="${h.route_path('my_account_bookmarks')}">${_('No Bookmarks yet.')}</a>
+                          </li>
+                      % endif
+                      % for item in c.bookmark_items:
+                      <li>
+                          % if item.repository:
+                              <div>
+                                <a class="bookmark-item" href="${h.route_path('my_account_goto_bookmark', bookmark_id=item.position)}">
+                                ${item.position}
+                                % if item.repository.repo_type == 'hg':
+                                    <i class="icon-hg" title="${_('Repository')}" style="font-size: 16px"></i>
+                                % elif item.repository.repo_type == 'git':
+                                    <i class="icon-git" title="${_('Repository')}" style="font-size: 16px"></i>
+                                % elif item.repository.repo_type == 'svn':
+                                    <i class="icon-svn" title="${_('Repository')}" style="font-size: 16px"></i>
+                                % endif
+                                ${(item.title or h.shorter(item.repository.repo_name, 30))}
+                              </a>
+                              </div>
+                          % elif item.repository_group:
+                              <div>
+                                <a class="bookmark-item" href="${h.route_path('my_account_goto_bookmark', bookmark_id=item.position)}">
+                                ${item.position}
+                                <i class="icon-folder-close" title="${_('Repository group')}" style="font-size: 16px"></i>
+                                ${(item.title or h.shorter(item.repository_group.group_name, 30))}
+                              </a>
+                              </div>
+                          % else:
+                              <a class="bookmark-item" href="${h.route_path('my_account_goto_bookmark', bookmark_id=item.position)}">
+                                ${item.position}
+                                ${item.title}
+                              </a>
+                          % endif
+                      </li>
+                      % endfor
 
                       <li class="logout">
                       ${h.secure_form(h.route_path('logout'), request=request)}
@@ -483,6 +527,26 b' commit:efced4, to search for commits'
             }(result, escapeMarkup);
         };
 
+        var formatRepoGroupResult = function(result, container, query, escapeMarkup) {
+            return function(data, escapeMarkup) {
+                if (!data.repo_group_id){
+                  return data.text; // optgroup text Repositories
+                }
+
+                var tmpl = '';
+                var repoGroupName = data['text'];
+
+                if(data){
+
+                    tmpl += '<i class="icon-folder-close"></i> ';
+
+                }
+                tmpl += escapeMarkup(repoGroupName);
+                return tmpl;
+
+            }(result, escapeMarkup);
+        };
+
 
         var autocompleteMainFilterFormatResult = function (data, value, org_formatter) {
 
@@ -610,6 +674,7 b' commit:efced4, to search for commits'
                          ('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'),
                      ]

rhodecode/templates/data_table/_dt_elements.mako

@@ -88,9 +88,9 b''
     %endif
 
     ##PRIVATE/PUBLIC
-    %if private and c.visual.show_private_icon:
+    %if private is True and c.visual.show_private_icon:
       <i class="icon-lock" title="${_('Private repository')}"></i>
-    %elif not private and c.visual.show_public_icon:
+    %elif private is False and c.visual.show_public_icon:
       <i class="icon-unlock-alt" title="${_('Public repository')}"></i>
     %else:
       <span></span>