kallithea Changeset - 05ed7e20bd0f

Changeset - 05ed7e20bd0f

Parent rev.

Child rev.

[Not reviewed]

rhodecode-2.2.5-gpl

0 5 1

Mads Kiilerich - 12 years ago 2013-12-10 19:28:05
madski@unity3d.com

old style: use kallithea-logo.png in page headers

Using http://openfontlibrary.org/en/font/fally-pin

6 files changed with 18 insertions and 6 deletions:

rhodecode/public/css/style.css

rhodecode/public/images/kallithea-logo.png

bin+new file

rhodecode/templates/base/base.html

rhodecode/templates/login.html

rhodecode/templates/password_reset.html

rhodecode/templates/register.html

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ modified file chmod 100755 => 100644 @@
@@ @@ -156,194 +156,206 @@ div.options a { @@
     margin: 0;
     padding: 3px 8px;
+}
 .top-left-rounded-corner {
     -webkit-border-top-left-radius: 8px;
     -khtml-border-radius-topleft: 8px;
     border-top-left-radius: 8px;
+}
 .top-right-rounded-corner {
     -webkit-border-top-right-radius: 8px;
     -khtml-border-radius-topright: 8px;
     border-top-right-radius: 8px;
+}
 .bottom-left-rounded-corner {
     -webkit-border-bottom-left-radius: 8px;
     -khtml-border-radius-bottomleft: 8px;
     border-bottom-left-radius: 8px;
+}
 .bottom-right-rounded-corner {
     -webkit-border-bottom-right-radius: 8px;
     -khtml-border-radius-bottomright: 8px;
     border-bottom-right-radius: 8px;
+}
 .top-left-rounded-corner-mid {
     -webkit-border-top-left-radius: 4px;
     -khtml-border-radius-topleft: 4px;
     border-top-left-radius: 4px;
+}
 .top-right-rounded-corner-mid {
     -webkit-border-top-right-radius: 4px;
     -khtml-border-radius-topright: 4px;
     border-top-right-radius: 4px;
+}
 .bottom-left-rounded-corner-mid {
     -webkit-border-bottom-left-radius: 4px;
     -khtml-border-radius-bottomleft: 4px;
     border-bottom-left-radius: 4px;
+}
 .bottom-right-rounded-corner-mid {
     -webkit-border-bottom-right-radius: 4px;
     -khtml-border-radius-bottomright: 4px;
     border-bottom-right-radius: 4px;
+}
 .help-block {
     color: #999999;
     display: block;
     margin-bottom: 0;
     margin-top: 5px;
+}
 .empty_data {
     color: #B9B9B9;
+}
 .truncate {
        white-space: nowrap;
        overflow: hidden;
        text-overflow: ellipsis;
     -o-text-overflow: ellipsis;
     -ms-text-overflow: ellipsis;
+}
 .truncate.autoexpand:hover {
     text-overflow: none;
     overflow: visible;
+}
 a.permalink {
     visibility: hidden;
     position: absolute;
     margin: 3px 4px;
+}
 a.permalink:hover {
     text-decoration: none;
+}
 h1:hover > a.permalink,
 h2:hover > a.permalink,
 h3:hover > a.permalink,
 h4:hover > a.permalink,
 h5:hover > a.permalink,
 h6:hover > a.permalink,
 div:hover > a.permalink {
     visibility: visible;
+}
 #header {
+}
 #header #logo {
     padding-left: 20px;
+}
 #header #logo div.header,
 #header #logo div.branding {
     font-size: 20px;
     color: white;
     float: left;
     height: 44px;
     line-height: 44px;
     margin-right: 10px;
+}
 #header ul#logged-user {
     margin-bottom: 5px !important;
     -webkit-border-radius: 0px 0px 8px 8px;
     -khtml-border-radius: 0px 0px 8px 8px;
     border-radius: 0px 0px 8px 8px;
     height: 37px;
     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 );
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
+}
 #header ul#logged-user li {
     list-style: none;
     float: left;
     margin: 8px 0 0;
     padding: 4px 12px;
     border-left: 1px solid #316293;
+}
 #header ul#logged-user li.first {
     border-left: none;
     margin: 4px;
+}
 #header ul#logged-user li.first div.gravatar {
     margin-top: -2px;
+}
 #header ul#logged-user li.first div.account {
     padding-top: 4px;
     float: left;
+}
 #header ul#logged-user li.last {
     border-right: none;
+}
 #header ul#logged-user li a {
     color: #fff;
     font-weight: 700;
     text-decoration: none;
+}
 #header ul#logged-user li a:hover {
     text-decoration: underline;
+}
 #header ul#logged-user li.highlight a {
     color: #fff;
+}
 #header ul#logged-user li.highlight a:hover {
     color: #FFF;
+}
 #header-dd {
     clear: both;
     position: fixed !important;
     background-color: #003B76;
     opacity: 0.01;
     cursor: pointer;
     min-height: 10px;
     width: 100% !important;
     -webkit-border-radius: 0px 0px 4px 4px;
     -khtml-border-radius: 0px 0px 4px 4px;
     border-radius: 0px 0px 4px 4px;
+}
 #header-dd:hover {
     opacity: 0.2;
     -webkit-transition: opacity 0.5s ease-in-out;
     -moz-transition: opacity 0.5s ease-in-out;
     transition: opacity 0.5s ease-in-out;
+}
 #header #header-inner {
     min-height: 44px;
     clear: both;
     position: relative;
     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 );

rhodecode/public/images/kallithea-logo.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

rhodecode/templates/base/base.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="root.html"/>
 <!-- HEADER -->
 <div id="header">
     <div id="header-inner" class="title">
         <div id="logo">
             <div class="header">
-                <a href="${h.url('home')}"><img src="${h.url('/images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
+                <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a>
             </div>
             %if c.rhodecode_name:
              <div class="branding">- ${c.rhodecode_name}</div>
             %endif
         </div>
         <!-- MENU -->
         ${self.page_nav()}
         <!-- END MENU -->
         ${self.body()}
     </div>
 </div>
 <!-- END HEADER -->
 <!-- CONTENT -->
 <div id="content">
     ${self.flash_msg()}
     <div id="main">
         ${next.main()}
     </div>
 </div>
 <!-- END CONTENT -->
 <!-- FOOTER -->
 <div id="footer">
    <div id="footer-inner" class="title">
        <div>
            <p class="footer-link">
                ${_('Server instance: %s') % c.rhodecode_instanceid if c.rhodecode_instanceid else ''}
            </p>
            <p class="footer-link-right">
                RhodeCode
                %if c.visual.show_version:
                    ${c.rhodecode_version}
                %endif
                &copy; 2010-${h.datetime.today().year}, <a href="${h.url('rhodecode_official')}" target="_blank">RhodeCode GmbH</a>. All rights reserved.
                %if c.rhodecode_bugtracker:
                    &ndash; <a href="${c.rhodecode_bugtracker}" target="_blank">${_('Support')}</a>
                %endif
            </p>
        </div>
    </div>
 </div>
 <!-- END FOOTER -->
 ### MAKO DEFS ###
 <%def name="flash_msg()">
     <%include file="/base/flash_msg.html"/>
 </%def>
 <%def name="breadcrumbs()">
     <div class="breadcrumbs">
     ${self.breadcrumbs_links()}
     </div>
 </%def>
 <%def name="admin_menu()">
   <ul class="admin_menu">
       <li><a href="${h.url('admin_home')}"><i class="icon-book"></i> ${_('Admin journal')}</a></li>
       <li><a href="${h.url('repos')}"><i class="icon-archive"></i> ${_('Repositories')}</a></li>
       <li><a href="${h.url('repos_groups')}"><i class="icon-folder-close"></i> ${_('Repository groups')}</a></li>
       <li><a href="${h.url('users')}"><i class="icon-user"></i> ${_('Users')}</a></li>
       <li><a href="${h.url('users_groups')}"><i class="icon-group"></i> ${_('User groups')}</a></li>
       <li><a href="${h.url('admin_permissions')}"><i class="icon-ban-circle"></i> ${_('Permissions')}</a></li>
       <li><a href="${h.url('auth_home')}"><i class="icon-key"></i> ${_('Authentication')}</a></li>
       <li><a href="${h.url('defaults')}"><i class="icon-wrench"></i> ${_('Defaults')}</a></li>
       <li class="last"><a href="${h.url('admin_settings')}"><i class="icon-cog"></i> ${_('Settings')}</a></li>
   </ul>
 </%def>
 ## admin menu used for people that have some admin resources
 <%def name="admin_menu_simple(repositories=None, repository_groups=None, user_groups=None)">
   <ul>
    %if repositories:
       <li><a href="${h.url('repos')}"><i class="icon-archive"></i> ${_('Repositories')}</a></li>
    %endif
    %if repository_groups:
       <li><a href="${h.url('repos_groups')}"><i class="icon-folder-close"></i> ${_('Repository groups')}</a></li>
    %endif
    %if user_groups:
       <li><a href="${h.url('users_groups')}"><i class="icon-group"></i> ${_('User groups')}</a></li>
    %endif
   </ul>
 </%def>
 <%def name="repo_context_bar(current=None)">
   <%
       def follow_class():
           if c.repository_following:
               return h.literal('following')
           else:
               return h.literal('follow')
   %>

rhodecode/templates/login.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="base/root.html"/>
 <%def name="title()">
     ${_('Log In')}
     %if c.rhodecode_name:
         &middot; ${c.rhodecode_name}
     %endif
 </%def>
 <div id="header">
     <div id="header-inner" class="title">
         <div id="logo">
             <div class="header">
-                <a href="${h.url('home')}"><img src="/images/rhodecode-logo-white-216x60.png" alt="RhodeCode"/></a>
+                <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a>
             </div>
             %if c.rhodecode_name:
              <div class="branding">- ${c.rhodecode_name}</div>
             %endif
         </div>
     </div>
 </div>
 <div id="login">
     <%include file="/base/flash_msg.html"/>
     <!-- login -->
     <div class="title withlogo">
         %if c.rhodecode_name:
             <h5>${_('Log In to %s') % c.rhodecode_name}</h5>
         %else:
             <h5>${_('Log In')}</h5>
         %endif
     </div>
     <div class="inner">
         ${h.form(h.url.current(came_from=c.came_from))}
         <div class="form">
             <!-- fields -->
             <div class="fields">
                 <div class="field">
                     <div class="label">
                         <label for="username">${_('Username')}:</label>
                     </div>
                     <div class="input">
                         ${h.text('username',class_='focus large')}
                     </div>
                 </div>
                 <div class="field">
                     <div class="label">
                         <label for="password">${_('Password')}:</label>
                     </div>
                     <div class="input">
                         ${h.password('password',class_='focus large')}
                     </div>
                 </div>
                 <div class="field">
                     <div class="checkbox">
                         <input type="checkbox" id="remember" name="remember" />
                         <label for="remember">${_('Remember me')}</label>
                     </div>
                 </div>
                 <div class="buttons">
                     ${h.submit('sign_in',_('Sign In'),class_="btn")}
                 </div>
             </div>
             <!-- end fields -->
             <!-- links -->
             <div class="links">
                 ${h.link_to(_('Forgot your password ?'),h.url('reset_password'))}
                 %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>
             <!-- end links -->
         </div>
         ${h.end_form()}
         <script type="text/javascript">
         YUE.onDOMReady(function(){
             YUD.get('username').focus();
         })
         </script>
     </div>
     <!-- end login -->
 </div>

rhodecode/templates/password_reset.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="base/root.html"/>
 <%def name="title()">
     ${_('Password Reset')}
     %if c.rhodecode_name:
         &middot; ${c.rhodecode_name}
     %endif
 </%def>
 <div id="header">
     <div id="header-inner" class="title">
         <div id="logo">
             <div class="header">
-                <a href="${h.url('home')}"><img src="/images/rhodecode-logo-white-216x60.png" alt="RhodeCode"/></a>
+                <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a>
             </div>
             %if c.rhodecode_name:
              <div class="branding">- ${c.rhodecode_name}</div>
             %endif
         </div>
     </div>
 </div>
 <div id="register">
     <%include file="/base/flash_msg.html"/>
     <div class="title withlogo">
         %if c.rhodecode_name:
             <h5>${_('Reset your Password to %s') % c.rhodecode_name}</h5>
         %else:
             <h5>${_('Reset your Password')}</h5>
         %endif
     </div>
     <div class="inner">
         ${h.form(url('password_reset'))}
         <div class="form">
             <!-- fields -->
             <div class="fields">
                  <div class="field">
                     <div class="label">
                         <label for="email">${_('Email Address')}:</label>
                     </div>
                     <div class="input">
                         ${h.text('email')}
                     </div>
                  </div>
                 %if c.captcha_active:
                 <div class="field">
                     <div class="label">
                         <label for="email">${_('Captcha')}:</label>
                     </div>
                     <div class="input">
                         ${h.hidden('recaptcha_field')}
                         <div id="recaptcha"></div>
                     </div>
                 </div>
                 %endif
                 <div class="buttons">
                     <div class="nohighlight">
                       ${h.submit('send',_('Send password reset email'),class_="btn")}
                           <div class="activation_msg">${_('Password reset link will be send to matching email address')}</div>
                     </div>
                 </div>
             </div>
         </div>
         ${h.end_form()}
         %if c.captcha_active:
         <script type="text/javascript" src="https://www.google.com/recaptcha/api/js/recaptcha_ajax.js"></script>
         %endif
         <script type="text/javascript">
          $(document).ready(function(){
             $('#email').focus();
             %if c.captcha_active:
             Recaptcha.create("${c.captcha_public_key}", "recaptcha",
+                {
                   theme: "white",
+                }
             );
             %endif
          });
         </script>
     </div>
    </div>

rhodecode/templates/register.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="base/root.html"/>
 <%def name="title()">
     ${_('Sign Up')}
     %if c.rhodecode_name:
         &middot; ${c.rhodecode_name}
     %endif
 </%def>
 <div id="header">
     <div id="header-inner" class="title">
         <div id="logo">
             <div class="header">
-                <a href="${h.url('home')}"><img src="/images/rhodecode-logo-white-216x60.png" alt="RhodeCode"/></a>
+                <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a>
             </div>
             %if c.rhodecode_name:
              <div class="branding">- ${c.rhodecode_name}</div>
             %endif
         </div>
     </div>
 </div>
 <div id="register">
     <%include file="/base/flash_msg.html"/>
     <div class="title withlogo">
         %if c.rhodecode_name:
             <h5>${_('Sign Up to %s') % c.rhodecode_name}</h5>
         %else:
             <h5>${_('Sign Up')}</h5>
         %endif
     </div>
     <div class="inner">
         ${h.form(url('register'))}
         <div class="form">
             <!-- fields -->
             <div class="fields">
                 <div class="field">
                     <div class="label">
                         <label for="username">${_('Username')}:</label>
                     </div>
                     <div class="input">
                         ${h.text('username',class_="medium")}
                     </div>
                 </div>
                 <div class="field">
                     <div class="label">
                         <label for="password">${_('Password')}:</label>
                     </div>
                     <div class="input">
                         ${h.password('password',class_="medium")}
                     </div>
                 </div>
                 <div class="field">
                     <div class="label">
                         <label for="password">${_('Re-enter password')}:</label>
                     </div>
                     <div class="input">
                         ${h.password('password_confirmation',class_="medium")}
                     </div>
                 </div>
                 <div class="field">
                     <div class="label">
                         <label for="firstname">${_('First Name')}:</label>
                     </div>
                     <div class="input">
                         ${h.text('firstname',class_="medium")}
                     </div>
                 </div>
                 <div class="field">
                     <div class="label">
                         <label for="lastname">${_('Last Name')}:</label>
                     </div>
                     <div class="input">
                         ${h.text('lastname',class_="medium")}
                     </div>
                 </div>
                 <div class="field">
                     <div class="label">
                         <label for="email">${_('Email')}:</label>
                     </div>
                     <div class="input">
                         ${h.text('email',class_="medium")}
                     </div>
                 </div>
                 %if c.captcha_active:
                 <div class="field">
                     <div class="label">
                         <label for="email">${_('Captcha')}:</label>
                     </div>
                     <div class="input">
                         ${h.hidden('recaptcha_field')}
                         <div id="recaptcha"></div>
                     </div>
                 </div>
                 %endif
                 <div class="buttons">
                     <div class="nohighlight">
                       ${h.submit('sign_up',_('Sign Up'),class_="btn")}
                       %if c.auto_active:
                           <div class="activation_msg">${_('Your account will be activated right after registration')}</div>
                       %else:
                           <div class="activation_msg">${_('Your account must wait for activation by administrator')}</div>

0 comments (0 inline, 0 general)