kallithea Changeset - b7f489714639

Changeset - b7f489714639

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 13 years ago 2013-03-19 15:05:32
marcin@python-works.com

linkify names on fork/create repos in tooltip messages

4 files changed with 27 insertions and 5 deletions:

rhodecode/controllers/admin/repos.py

rhodecode/controllers/files.py

rhodecode/controllers/forks.py

rhodecode/public/css/style.css

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -147,50 +147,52 @@ class ReposController(BaseRepoController @@
         c.data = json.dumps(repos_data)
         return render('admin/repos/repos.html')
     @NotAnonymous()
     def create(self):
         """
         POST /repos: Create a new item"""
         # url('repos')
         self.__load_defaults()
         form_result = {}
         try:
             form_result = RepoForm(repo_groups=c.repo_groups_choices,
                                    landing_revs=c.landing_revs_choices)()\
                             .to_python(dict(request.POST))
             new_repo = RepoModel().create(form_result,
                                           self.rhodecode_user.user_id)
             if form_result['clone_uri']:
                 h.flash(_('created repository %s from %s') \
                     % (form_result['repo_name'], form_result['clone_uri']),
                     category='success')
             else:
                 h.flash(_('created repository %s') % form_result['repo_name'],
                     category='success')
                 repo_url = h.link_to(form_result['repo_name'],
                     h.url('summary_home', repo_name=form_result['repo_name']))
                 h.flash(h.literal(_('created repository %s') % repo_url),
                         category='success')
             if request.POST.get('user_created'):
                 # created by regular non admin user
                 action_logger(self.rhodecode_user, 'user_created_repo',
                               form_result['repo_name_full'], self.ip_addr,
                               self.sa)
             else:
                 action_logger(self.rhodecode_user, 'admin_created_repo',
                               form_result['repo_name_full'], self.ip_addr,
                               self.sa)
             Session().commit()
         except formencode.Invalid, errors:
             return htmlfill.render(
                 render('admin/repos/repo_add.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8")
         except Exception:
             log.error(traceback.format_exc())
             msg = _('error occurred during creation of repository %s') \
                     % form_result.get('repo_name')
             h.flash(msg, category='error')

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -63,49 +63,49 @@ log = logging.getLogger(__name__) @@
 class FilesController(BaseRepoController):
     def __before__(self):
         super(FilesController, self).__before__()
         c.cut_off_limit = self.cut_off_limit
     def __get_cs_or_redirect(self, rev, repo_name, redirect_after=True):
         """
         Safe way to get changeset if error occur it redirects to tip with
         proper message
         :param rev: revision to fetch
         :param repo_name: repo name to redirect after
         """
         try:
             return c.rhodecode_repo.get_changeset(rev)
         except EmptyRepositoryError, e:
             if not redirect_after:
                 return None
             url_ = url('files_add_home',
                        repo_name=c.repo_name,
                        revision=0, f_path='')
-            add_new = '<a href="%s">[%s]</a>' % (url_, _('click here to add new file'))
+            add_new = h.link_to(_('click here to add new file'), url_)
             h.flash(h.literal(_('There are no files yet %s') % add_new),
                     category='warning')
             redirect(h.url('summary_home', repo_name=repo_name))
         except RepositoryError, e:
             h.flash(str(e), category='warning')
             redirect(h.url('files_home', repo_name=repo_name, revision='tip'))
     def __get_filenode_or_redirect(self, repo_name, cs, path):
         """
         Returns file_node, if error occurs or given path is directory,
         it'll redirect to top level path
         :param repo_name: repo_name
         :param cs: given changeset
         :param path: path to lookup
         """
         try:
             file_node = cs.get_node(path)
             if file_node.is_dir():
                 raise RepositoryError('given path is a directory')
         except RepositoryError, e:
             h.flash(str(e), category='warning')

rhodecode/controllers/forks.py

➞

Show inline comments

@@ @@ -141,42 +141,45 @@ class ForksController(BaseRepoController @@
         return htmlfill.render(
             render('forks/fork.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False
+        )
     @NotAnonymous()
     @HasPermissionAnyDecorator('hg.admin', 'hg.fork.repository')
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def fork_create(self, repo_name):
         self.__load_defaults()
         c.repo_info = Repository.get_by_repo_name(repo_name)
         _form = RepoForkForm(old_data={'repo_type': c.repo_info.repo_type},
                              repo_groups=c.repo_groups_choices,
                              landing_revs=c.landing_revs_choices)()
         form_result = {}
         try:
             form_result = _form.to_python(dict(request.POST))
             # create fork is done sometimes async on celery, db transaction
             # management is handled there.
             RepoModel().create_fork(form_result, self.rhodecode_user.user_id)
             h.flash(_('forked %s repository as %s') \
                       % (repo_name, form_result['repo_name']),
             fork_url = h.link_to(form_result['repo_name'],
                     h.url('summary_home', repo_name=form_result['repo_name_full']))
             h.flash(h.literal(_('forked repository %s as %s') \
                       % (repo_name, fork_url)),
                     category='success')
         except formencode.Invalid, errors:
             c.new_repo = errors.value['repo_name']
             return htmlfill.render(
                 render('forks/fork.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8")
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during repository forking %s') %
                     repo_name, category='error')
         return redirect(url('home'))

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -3364,91 +3364,108 @@ table.code-browser .submodule-dir { @@
 .flash_msg {
+}
 .flash_msg ul {
+}
 .error_red {
     color: red;
+}
 .error_msg {
     background-color: #c43c35;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35) );
     background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
     background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35) );
     background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
     background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
     background-image: linear-gradient(to bottom, #ee5f5b, #c43c35);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b',endColorstr='#c43c35', GradientType=0 );
     border-color: #c43c35 #c43c35 #882a25;
+}
 .error_msg a {
 	text-decoration: underline;
+}
 .warning_msg {
     color: #404040 !important;
     background-color: #eedc94;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94) );
     background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
     background-image: -ms-linear-gradient(top, #fceec1, #eedc94);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94) );
     background-image: -webkit-linear-gradient(top, #fceec1, #eedc94);
     background-image: -o-linear-gradient(top, #fceec1, #eedc94);
     background-image: linear-gradient(to bottom, #fceec1, #eedc94);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0 );
     border-color: #eedc94 #eedc94 #e4c652;
+}
 .warning_msg a {
 	text-decoration: underline;
+}
 .success_msg {
     background-color: #57a957;
     background-repeat: repeat-x !important;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957) );
     background-image: -moz-linear-gradient(top, #62c462, #57a957);
     background-image: -ms-linear-gradient(top, #62c462, #57a957);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957) );
     background-image: -webkit-linear-gradient(top, #62c462, #57a957);
     background-image: -o-linear-gradient(top, #62c462, #57a957);
     background-image: linear-gradient(to bottom, #62c462, #57a957);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0 );
     border-color: #57a957 #57a957 #3d773d;
+}
 .success_msg a {
 	text-decoration: underline;
 	color: #FFF !important;
+}
 .notice_msg {
     background-color: #339bb9;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9) );
     background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
     background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9) );
     background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
     background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
     background-image: linear-gradient(to bottom, #5bc0de, #339bb9);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0 );
     border-color: #339bb9 #339bb9 #22697d;
+}
 .notice_msg a {
     text-decoration: underline;
+}
 .success_msg, .error_msg, .notice_msg, .warning_msg {
     font-size: 12px;
     font-weight: 700;
     min-height: 14px;
     line-height: 14px;
     margin-bottom: 10px;
     margin-top: 0;
     display: block;
     overflow: auto;
     padding: 6px 10px 6px 10px;
     border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
     position: relative;
     color: #FFF;
     border-width: 1px;
     border-style: solid;
     -webkit-border-radius: 4px;
     border-radius: 4px;
     -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
     box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+}
 #msg_close {
     background: transparent url("../icons/cross_grey_small.png") no-repeat scroll 0 0;
     cursor: pointer;

0 comments (0 inline, 0 general)