kallithea Changeset - b30a842bc164

Changeset - b30a842bc164

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 13 years ago 2013-03-06 01:53:55
marcin@python-works.com

codecleaner

3 files changed with 8 insertions and 8 deletions:

rhodecode/model/db.py

rhodecode/public/css/style.css

rhodecode/templates/admin/users/user_edit_my_account_form.html

0 comments (0 inline, 0 general)

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -1348,49 +1348,49 @@ class RepoGroup(Base, BaseModel): @@
     def _recursive_objects(self, include_repos=True):
         all_ = []
         def _get_members(root_gr):
             if include_repos:
                 for r in root_gr.repositories:
                     all_.append(r)
             childs = root_gr.children.all()
             if childs:
                 for gr in childs:
                     all_.append(gr)
                     _get_members(gr)
         _get_members(self)
         return [self] + all_
     def recursive_groups_and_repos(self):
         """
         Recursive return all groups, with repositories in those groups
         """
         return self._recursive_objects()
     def recursive_groups(self):
         """
-        Returns all children groups for this group including children of children
         Returns all children groups for this group including children of children
         """
         return self._recursive_objects(include_repos=False)
     def get_new_name(self, group_name):
         """
         returns new full group name based on parent and new name
         :param group_name:
         """
         path_prefix = (self.parent_group.full_path_splitted if
                        self.parent_group else [])
         return RepoGroup.url_sep().join(path_prefix + [group_name])
 class Permission(Base, BaseModel):
     __tablename__ = 'permissions'
     __table_args__ = (
         Index('p_perm_name_idx', 'permission_name'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'},
+    )
     PERMS = [
         ('repository.none', _('Repository no access')),
         ('repository.read', _('Repository read access')),

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -4098,53 +4098,53 @@ div.readme .readme_box pre { @@
     -webkit-border-radius: 3px;
     border-radius: 3px;
+}
 div.readme .readme_box table {
     display: table;
     border-collapse: separate;
     border-spacing: 2px;
     border-color: gray;
     width: auto !important;
+}
 /** RST STYLE **/
 div.rst-block {
     padding: 0px;
+}
 div.rst-block h2 {
     font-weight: normal;
+}
-div.rst-block  {
 div.rst-block {
     background-color: #fafafa;
+}
-div.rst-block  {
 div.rst-block {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 0 20px 10px;
+}
 div.rst-block  h1, div.rst-block  h2, div.rst-block  h3, div.rst-block  h4, div.rst-block  h5, div.rst-block  h6 {
     border-bottom: 0 !important;
     margin: 0 !important;
     padding: 0 !important;
     line-height: 1.5em !important;
+}
 div.rst-block  h1:first-child {
     padding-top: .25em !important;
+}
 div.rst-block  h2, div.rst-block  h3 {
     margin: 1em 0 !important;
+}
 div.rst-block  h2 {
     margin-top: 1.5em !important;
@@ @@ -4390,49 +4390,49 @@ form.comment-inline-form { @@
 .file-comments {
     display: none;
+}
 .comment-inline-form .comment {
     margin-left: 10px;
+}
 .comment-inline-form .comment-help {
     padding: 0px 0px 2px 0px;
     color: #666666;
     font-size: 10px;
+}
 .comment-inline-form .comment-button {
     padding-top: 5px;
+}
 /** comment inline **/
 .inline-comments {
     padding: 10px 20px;
+}
-.inline-comments div.rst-block  {
 .inline-comments div.rst-block {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 0 20px 0px;
+}
 .inline-comments .comment {
     border: 1px solid #ddd;
     -webkit-border-radius: 4px;
     border-radius: 4px;
     margin: 3px 3px 5px 5px;
     background-color: #FAFAFA;
+}
 .inline-comments .add-comment {
     padding: 2px 4px 8px 5px;
+}
 .inline-comments .comment-wrapp {
     padding: 1px;
+}
 .inline-comments .comment .meta {
     background: #f8f8f8;
     padding: 4px;
     border-bottom: 1px solid #ddd;
     height: 20px;
@@ @@ -4787,25 +4787,25 @@ table.code-difftable .code pre { @@
+}
 .diffblock.margined.comm .line .code:hover {
     background-color: #FFFFCC !important;
     cursor: pointer !important;
     background-image: url("../images/icons/comment_add.png") !important;
     background-repeat: no-repeat !important;
     background-position: right !important;
     background-position: 0% 50% !important;
+}
 .diffblock.margined.comm .line .code.no-comment:hover {
     background-image: none !important;
     cursor: auto !important;
     background-color: inherit !important;
+}
 div.comment:target>.comment-wrapp {
     border: solid 2px #ee0 !important;
+}
 .lineno:target a {
     border: solid 2px #ee0 !important;
     margin: -2px;
+}
+}
@@ \ No newline at end of file @@

rhodecode/templates/admin/users/user_edit_my_account_form.html

➞

Show inline comments

 <div>
     ${h.form(url('admin_settings_my_account_update'),method='put')}
         <div class="form">
              <div class="field">
                 <div class="gravatar_box">
                     <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/></div>
                     <p>
                     %if c.use_gravatar:
                     <strong>${_('Change your avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong>
                     <br/>${_('Using')} ${c.user.email}
                     %else:
                     <br/>${c.user.email}
                     %endif
                     </p>
                 </div>
              </div>
             <div class="field">
                 <div class="label">
                     <label>${_('API key')}</label> ${c.user.api_key}
                 </div>
             </div>
             <div class="field">
 	            <div class="label">
 	                <label>${_('Current IP')}:</label> ${c.perm_user.ip_addr or "?"}
 	            </div>
                 <div class="label">
                     <label>${_('Current IP')}:</label> ${c.perm_user.ip_addr or "?"}
                 </div>
             </div>
             <div class="fields">
                  <div class="field">
                     <div class="label">
                         <label for="username">${_('Username')}:</label>
                     </div>
                     <div class="input">
                       %if c.ldap_dn:
                           ${h.text('username',class_='medium disabled', readonly="readonly")}
                       %else:
                           ${h.text('username',class_='medium')}
                       %endif:
                     </div>
                  </div>
                  <div class="field">
                     <div class="label">
                         <label for="new_password">${_('New password')}:</label>
                     </div>
                     <div class="input">
                         ${h.password('new_password',class_="medium",autocomplete="off")}
                     </div>
                  </div>

0 comments (0 inline, 0 general)