kallithea Changeset - 7e73c0f4f335

Changeset - 7e73c0f4f335

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2013-04-03 19:40:37
marcin@python-works.com

usermenu
- show more space for email
- move notification into link

2 files changed with 6 insertions and 6 deletions:

rhodecode/public/css/style.css

rhodecode/templates/base/base.html

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -1907,162 +1907,163 @@ a.metatag[tag="license"]:hover { @@
     background: #FFF;
     border-top: 1px solid #b3b3b3;
     border-left: 1px solid #b3b3b3;
     border-right: 1px solid #eaeaea;
     border-bottom: 1px solid #eaeaea;
     color: #000;
     font-size: 11px;
     margin: 0;
     padding: 7px 7px 6px;
+}
 #login div.form div.fields div.buttons {
     clear: both;
     overflow: hidden;
     border-top: 1px solid #DDD;
     text-align: right;
     margin: 0;
     padding: 10px 0 0;
+}
 #login div.form div.links {
     clear: both;
     overflow: hidden;
     margin: 10px 0 0;
     padding: 0 0 2px;
+}
 .user-menu {
     margin: 0px !important;
     float: left;
+}
 .user-menu .container {
     padding: 0px 4px 0px 4px;
     margin: 0px 0px 0px 0px;
+}
 .user-menu .gravatar {
     margin: 0px 0px 0px 0px;
     cursor: pointer;
+}
 .user-menu .gravatar.enabled {
     background-color: #FDF784 !important;
+}
 .user-menu .gravatar:hover {
     background-color: #FDF784 !important;
+}
 #quick_login {
-    min-height: 80px;
+    min-height: 110px;
     padding: 4px;
     position: absolute;
     right: 0;
     background-color: #003B76;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#003B76), to(#00376E) );
     background-image: -moz-linear-gradient(top, #003b76, #00376e);
     background-image: -ms-linear-gradient(top, #003b76, #00376e);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #003b76), color-stop(100%, #00376e) );
     background-image: -webkit-linear-gradient(top, #003b76, #00376e);
     background-image: -o-linear-gradient(top, #003b76, #00376e);
     background-image: linear-gradient(to bottom, #003b76, #00376e);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b76', endColorstr='#00376e', GradientType=0 );
     z-index: 999;
     -webkit-border-radius: 0px 0px 4px 4px;
     -khtml-border-radius: 0px 0px 4px 4px;
     border-radius: 0px 0px 4px 4px;
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
     overflow: hidden;
+}
 #quick_login h4 {
     color: #fff;
     padding: 5px 0px 5px 14px;
+}
 #quick_login .password_forgoten {
     padding-right: 0px;
     padding-top: 0px;
     text-align: left;
+}
 #quick_login .password_forgoten a {
     font-size: 10px;
     color: #fff;
     padding: 0px !important;
     line-height: 20px !important;
+}
 #quick_login .register {
     padding-right: 10px;
     padding-top: 5px;
     text-align: left;
+}
 #quick_login .register a {
     font-size: 10px;
     color: #fff;
     padding: 0px !important;
     line-height: 20px !important;
+}
 #quick_login .submit {
     margin: -20px 0 0 0px;
     position: absolute;
     right: 15px;
+}
 #quick_login .links_left {
     float: left;
     margin-right: 120px;
     margin-right: 130px;
     width: 170px;
+}
 #quick_login .links_right {
-    width: 120px;
     position: absolute;
     right: 0;
+}
 #quick_login .full_name {
     color: #FFFFFF;
     font-weight: bold;
     padding: 3px 3px 3px 6px;
+}
 #quick_login .big_gravatar {
     padding: 4px 0px 0px 6px;
+}
 #quick_login .notifications {
     padding: 2px 0px 0px 6px;
     color: #FFFFFF;
     font-weight: bold;
     line-height: 10px !important;
+}
 #quick_login .notifications a,
 #quick_login .unread a {
     color: #FFFFFF;
     display: block;
     padding: 0px !important;
+}
 #quick_login .notifications a:hover,
 #quick_login .unread a:hover {
     background-color: inherit !important;
+}
 #quick_login .email, #quick_login .unread {
     color: #FFFFFF;
     padding: 3px 3px 3px 6px;
+}
 #quick_login .links .logout {
+}
 #quick_login div.form div.fields {
     padding-top: 2px;
     padding-left: 10px;
+}
 #quick_login div.form div.fields div.field {
     padding: 5px;
+}
 #quick_login div.form div.fields div.field div.label label {
     color: #fff;
     padding-bottom: 3px;
+}

rhodecode/templates/base/base.html

➞

Show inline comments

@@ @@ -185,104 +185,103 @@ @@
               <span class="menu_link_notifications">${c.unread_notifications}</span>
             %endif
           %else:
               <span>${_('Not logged in')}</span>
           %endif
       </a>
   <div class="user-menu">
       <div id="quick_login">
         %if c.rhodecode_user.username == 'default':
             <h4>${_('Login to your account')}</h4>
             ${h.form(h.url('login_home',came_from=h.url.current()))}
             <div class="form">
                 <div class="fields">
                     <div class="field">
                         <div class="label">
                             <label for="username">${_('Username')}:</label>
                         </div>
                         <div class="input">
                             ${h.text('username',class_='focus')}
                         </div>
                     </div>
                     <div class="field">
                         <div class="label">
                             <label for="password">${_('Password')}:</label>
                         </div>
                         <div class="input">
                             ${h.password('password',class_='focus')}
                         </div>
                     </div>
                     <div class="buttons">
                         <div class="password_forgoten">${h.link_to(_('Forgot password ?'),h.url('reset_password'))}</div>
                         <div class="register">
                         %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
                          ${h.link_to(_("Don't have an account ?"),h.url('register'))}
                         %endif
                         </div>
                         <div class="submit">
                             ${h.submit('sign_in',_('Log In'),class_="ui-btn xsmall")}
                         </div>
                     </div>
                 </div>
             </div>
             ${h.end_form()}
         %else:
             <div class="links_left">
                 <div class="big_gravatar"><img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,48)}" /></div>
                 <div class="full_name">${c.rhodecode_user.full_name_or_username}</div>
                 <div class="email">${c.rhodecode_user.email}</div>
                 <div class="big_gravatar"><img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,48)}" /></div>
                 ##<div class="notifications"><a href="${h.url('notifications')}">${_('Notifications')}</a></div>
                 <div class="unread"><a href="${h.url('notifications')}">${_('Unread notifications')}: ${c.unread_notifications}</a></div>
             </div>
             <div class="links_right">
             <ol class="links">
               <li><a href="${h.url('notifications')}">${_('Notifications')}: ${c.unread_notifications}</a></li>
               <li>${h.link_to(_(u'My account'),h.url('admin_settings_my_account'))}</li>
               <li class="logout">${h.link_to(_(u'Log Out'),h.url('logout_home'))}</li>
             </ol>
             </div>
         %endif
       </div>
   </div>
     </li>
 </%def>
 <%def name="menu(current=None)">
         <%
         def is_current(selected):
             if selected == current:
                 return h.literal('class="current"')
         %>
         <ul id="quick" class="horizontal-list">
           <!-- repo switcher -->
           <li ${is_current('repositories')}>
               <a class="menu_link repo_switcher childs" id="repo_switcher" title="${_('Switch repository')}" href="${h.url('home')}">
               ${_('Repositories')}
               </a>
               <ul id="repo_switcher_list" class="repo_switcher">
                   <li>
                       <a href="#">${_('loading...')}</a>
                   </li>
               </ul>
           </li>
           ##ROOT MENU
           %if c.rhodecode_user.username != 'default':
             <li ${is_current('journal')}>
               <a class="menu_link journal" title="${_('Show recent activity')}"  href="${h.url('journal')}">
               ${_('Journal')}
               </a>
             </li>
           %else:
             <li ${is_current('journal')}>
               <a class="menu_link journal" title="${_('Public journal')}"  href="${h.url('public_journal')}">
               ${_('Public journal')}
               </a>
             </li>
           %endif
           <li ${is_current('search')}>
               <a class="menu_link search" title="${_('Search in repositories')}"  href="${h.url('search')}">
               ${_('Search')}
               </a>
           </li>

0 comments (0 inline, 0 general)