Commits

joberschweiber committed 81d0c43

Add help link; rename journal -> dashboard

  • Participants
  • Parent commits 02aa3d0

Comments (0)

Files changed (4)

File production.ini

 commit_parse_limit = 50
 use_gravatar = true
 bugtracker_url = http://test.de
+help_url = http://test.de
 
 ####################################
 ###        CELERY CONFIG        ####

File rhodecode/config/routing.py

     rmap.connect('bugtracker',
                  config.get('bugtracker_url'),
                  _static=True)
+    rmap.connect('help',
+                config.get('help_url'),
+                _static=True)
     rmap.connect('rhodecode_official', "http://rhodecode.org", _static=True)
 
     #ADMIN REPOSITORY REST ROUTES
 
 
     #USER JOURNAL
-    rmap.connect('journal', '%s/journal' % ADMIN_PREFIX, controller='journal')
+    rmap.connect('journal', '/dashboard', controller='journal')
 
     rmap.connect('public_journal', '%s/public_journal' % ADMIN_PREFIX,
                  controller='journal', action="public_journal")

File rhodecode/templates/base/base.html

       <a class="brand" href="${h.url('home')}">${c.rhodecode_name}</a>
 
       <ul class="nav">
+          <li>${h.link_to(_('Dashboard'), h.url('journal'))}</li>
         %if h.HasPermissionAll('hg.admin')('access admin main page'):
           <li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">${_('Admin')} <b class="caret"></b></a>
             </ul>
           </li>
         %endif
+          <li>${h.link_to(_('Help'), h.url('help'))}</li>
       </ul>
 
       <form class="navbar-search pull-right" action="${h.url('search')}">
           <li>${h.link_to('Login', h.url('login_home'), id='quick_login_link')}</li>
         %else:
           <li>${h.link_to(c.rhodecode_user.username, h.url('admin_settings_my_account'))}</li>
-          <li>${h.link_to(_('Journal'), h.url('journal'))}</li>
           <li>${h.link_to('Log out', h.url('logout_home'))}</li>
         %endif
       </ul>
 <div id="footer">
    <div class="container" style="padding-top: 10px;">
        <div class="row">
-        <div class="span8">
+        <div class="span6">
           <a href="${h.url('bugtracker')}">${_('Submit a bug')}</a>
         </div>
-        <div class="span8" style="text-align: right">
+        <div class="span6" style="text-align: right">
           <a href="${h.url('rhodecode_official')}">RhodeCode</a>
           ${c.rhodecode_version} &copy; 2010-${h.datetime.today().year} by Marcin Kuzminski
         </div>

File rhodecode/templates/journal/journal.html

         }
         </script>
         <div id="journal" class="span8">
-                <h2>${_('Journal')}</h2>
+                <h2>${_('Dashboard')}</h2>
                 <div id="entries">
                 ${c.journal_data}
                 </div>