kallithea Changeset - 63212fea2471

Changeset - 63212fea2471

Parent rev.

Child rev.

[Not reviewed]

default

0 7 0

Marcin Kuzminski - 15 years ago 2010-09-29 22:36:53
marcin@python-works.com

a lot of fixes in templates,
added options to each repository showing fork/serach/settings fixed emtpy changeset (again !)

7 files changed with 64 insertions and 19 deletions:

pylons_app/lib/utils.py

pylons_app/public/css/style.css

pylons_app/templates/admin/repos/repo_add.html

pylons_app/templates/base/base.html

pylons_app/templates/index.html

pylons_app/templates/settings/repo_settings.html

pylons_app/templates/summary/summary.html

0 comments (0 inline, 0 general)

pylons_app/lib/utils.py

➞

Show inline comments

 #!/usr/bin/env python
 # encoding: utf-8
 # Utilities for hg app
 # Copyright (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 """
 Created on April 18, 2010
 Utilities for hg app
 @author: marcink
 """
 from beaker.cache import cache_region
 from mercurial import ui, config, hg
 from mercurial.error import RepoError
 from pylons_app.model import meta
 from pylons_app.model.db import Repository, User, HgAppUi, HgAppSettings
 from vcs.backends.base import BaseChangeset
 from vcs.utils.lazy import LazyProperty
 import logging
 import os
 log = logging.getLogger(__name__)
 def get_repo_slug(request):
     return request.environ['pylons.routes_dict'].get('repo_name')
 def is_mercurial(environ):
     """
     Returns True if request's target is mercurial server - header
     ``HTTP_ACCEPT`` of such request would start with ``application/mercurial``.
     """
     http_accept = environ.get('HTTP_ACCEPT')
     if http_accept and http_accept.startswith('application/mercurial'):
         return True
     return False
 def check_repo_dir(paths):
     repos_path = paths[0][1].split('/')
     if repos_path[-1] in ['*', '**']:
         repos_path = repos_path[:-1]
     if repos_path[0] != '/':
         repos_path[0] = '/'
     if not os.path.isdir(os.path.join(*repos_path)):
         raise Exception('Not a valid repository in %s' % paths[0][1])
 def check_repo_fast(repo_name, base_path):
     if os.path.isdir(os.path.join(base_path, repo_name)):return False
     return True
 def check_repo(repo_name, base_path, verify=True):
     repo_path = os.path.join(base_path, repo_name)
     try:
         if not check_repo_fast(repo_name, base_path):
             return False
         r = hg.repository(ui.ui(), repo_path)
         if verify:
             hg.verify(r)
         #here we hnow that repo exists it was verified
         log.info('%s repo is already created', repo_name)
         return False
     except RepoError:
         #it means that there is no valid repo there...
         log.info('%s repo is free for creation', repo_name)
         return True
 def ask_ok(prompt, retries=4, complaint='Yes or no, please!'):
     while True:
         ok = raw_input(prompt)
         if ok in ('y', 'ye', 'yes'): return True
         if ok in ('n', 'no', 'nop', 'nope'): return False
         retries = retries - 1
         if retries < 0: raise IOError
         print complaint
 @cache_region('super_short_term', 'cached_hg_ui')
 def get_hg_ui_cached():
     try:
         sa = meta.Session
         ret = sa.query(HgAppUi).all()
     finally:
         meta.Session.remove()
     return ret
 def get_hg_settings():
     try:
         sa = meta.Session
         ret = sa.query(HgAppSettings).all()
     finally:
         meta.Session.remove()
     if not ret:
         raise Exception('Could not get application settings !')
     settings = {}
     for each in ret:
         settings['hg_app_' + each.app_settings_name] = each.app_settings_value
     return settings
 def get_hg_ui_settings():
     try:
         sa = meta.Session
         ret = sa.query(HgAppUi).all()
     finally:
         meta.Session.remove()
     if not ret:
         raise Exception('Could not get application ui settings !')
     settings = {}
     for each in ret:
         k = each.ui_key
         v = each.ui_value
         if k == '/':
             k = 'root_path'
         if k.find('.') != -1:
             k = k.replace('.', '_')
         if each.ui_section == 'hooks':
             v = each.ui_active
         settings[each.ui_section + '_' + k] = v
     return settings
 #propagated from mercurial documentation
 ui_sections = ['alias', 'auth',
                 'decode/encode', 'defaults',
                 'diff', 'email',
                 'extensions', 'format',
                 'merge-patterns', 'merge-tools',
                 'hooks', 'http_proxy',
                 'smtp', 'patch',
                 'paths', 'profiling',
                 'server', 'trusted',
                 'ui', 'web', ]
 def make_ui(read_from='file', path=None, checkpaths=True):
     """
     A function that will read python rc files or database
     and make an mercurial ui object from read options
     @param path: path to mercurial config file
     @param checkpaths: check the path
     @param read_from: read from 'file' or 'db'
     """
     baseui = ui.ui()
     if read_from == 'file':
         if not os.path.isfile(path):
             log.warning('Unable to read config file %s' % path)
             return False
         log.debug('reading hgrc from %s', path)
         cfg = config.config()
         cfg.read(path)
         for section in ui_sections:
             for k, v in cfg.items(section):
                 baseui.setconfig(section, k, v)
                 log.debug('settings ui from file[%s]%s:%s', section, k, v)
         if checkpaths:check_repo_dir(cfg.items('paths'))
     elif read_from == 'db':
         hg_ui = get_hg_ui_cached()
         for ui_ in hg_ui:
             if ui_.ui_active:
                 log.debug('settings ui from db[%s]%s:%s', ui_.ui_section, ui_.ui_key, ui_.ui_value)
                 baseui.setconfig(ui_.ui_section, ui_.ui_key, ui_.ui_value)
     return baseui
 def set_hg_app_config(config):
     hgsettings = get_hg_settings()
     for k, v in hgsettings.items():
         config[k] = v
 def invalidate_cache(name, *args):
     """Invalidates given name cache"""
     from beaker.cache import region_invalidate
     log.info('INVALIDATING CACHE FOR %s', name)
     """propagate our arguments to make sure invalidation works. First
     argument has to be the name of cached func name give to cache decorator
     without that the invalidation would not work"""
     tmp = [name]
     tmp.extend(args)
     args = tuple(tmp)
     if name == 'cached_repo_list':
         from pylons_app.model.hg_model import _get_repos_cached
         region_invalidate(_get_repos_cached, None, *args)
     if name == 'full_changelog':
         from pylons_app.model.hg_model import _full_changelog_cached
         region_invalidate(_full_changelog_cached, None, *args)
 class EmptyChangeset(BaseChangeset):
     revision = -1
     message = ''
     author = ''
     @LazyProperty
     def raw_id(self):
         """
         Returns raw string identifing this changeset, useful for web
         representation.
         """
         return '0' * 40
     @LazyProperty
     def short_id(self):
         self.raw_id[:12]
+        return self.raw_id[:12]
 def repo2db_mapper(initial_repo_list, remove_obsolete=False):
     """
     maps all found repositories into db
     """
     from pylons_app.model.repo_model import RepoModel
     sa = meta.Session
     user = sa.query(User).filter(User.admin == True).first()
     rm = RepoModel()
     for name, repo in initial_repo_list.items():
         if not sa.query(Repository).filter(Repository.repo_name == name).scalar():
             log.info('repository %s not found creating default', name)
             form_data = {
                          'repo_name':name,
                          'description':repo.description if repo.description != 'unknown' else \
                                         'auto description for %s' % name,
                          'private':False
+                         }
             rm.create(form_data, user, just_db=True)
     if remove_obsolete:
         #remove from database those repositories that are not in the filesystem
         for repo in sa.query(Repository).all():
             if repo.repo_name not in initial_repo_list.keys():
                 sa.delete(repo)
                 sa.commit()
     meta.Session.remove()
 from UserDict import DictMixin
 class OrderedDict(dict, DictMixin):
     def __init__(self, *args, **kwds):
         if len(args) > 1:
             raise TypeError('expected at most 1 arguments, got %d' % len(args))
         try:
             self.__end
         except AttributeError:
             self.clear()
         self.update(*args, **kwds)
     def clear(self):
         self.__end = end = []
         end += [None, end, end]         # sentinel node for doubly linked list
         self.__map = {}                 # key --> [key, prev, next]
         dict.clear(self)
     def __setitem__(self, key, value):
         if key not in self:
             end = self.__end
             curr = end[1]
             curr[2] = end[1] = self.__map[key] = [key, curr, end]
         dict.__setitem__(self, key, value)
     def __delitem__(self, key):
         dict.__delitem__(self, key)
         key, prev, next = self.__map.pop(key)
         prev[2] = next
         next[1] = prev
     def __iter__(self):
         end = self.__end
         curr = end[2]
         while curr is not end:
             yield curr[0]
             curr = curr[2]
     def __reversed__(self):
         end = self.__end
         curr = end[1]
         while curr is not end:
             yield curr[0]
             curr = curr[1]
     def popitem(self, last=True):
         if not self:
             raise KeyError('dictionary is empty')
         if last:
             key = reversed(self).next()
         else:
             key = iter(self).next()
         value = self.pop(key)
         return key, value
     def __reduce__(self):
         items = [[k, self[k]] for k in self]
         tmp = self.__map, self.__end
         del self.__map, self.__end
         inst_dict = vars(self).copy()
         self.__map, self.__end = tmp
         if inst_dict:
             return (self.__class__, (items,), inst_dict)
         return self.__class__, (items,)
     def keys(self):
         return list(self)
     setdefault = DictMixin.setdefault
     update = DictMixin.update
     pop = DictMixin.pop
     values = DictMixin.values
     items = DictMixin.items
     iterkeys = DictMixin.iterkeys
     itervalues = DictMixin.itervalues
     iteritems = DictMixin.iteritems
     def __repr__(self):
         if not self:
             return '%s()' % (self.__class__.__name__,)
         return '%s(%r)' % (self.__class__.__name__, self.items())
     def copy(self):
         return self.__class__(self)
     @classmethod
     def fromkeys(cls, iterable, value=None):
         d = cls()
         for key in iterable:
             d[key] = value
         return d
     def __eq__(self, other):
         if isinstance(other, OrderedDict):
             return len(self) == len(other) and self.items() == other.items()
         return dict.__eq__(self, other)
     def __ne__(self, other):
         return not self == other
 #===============================================================================
 # TEST FUNCTIONS
 #===============================================================================
 def create_test_index(repo_location, full_index):
     """Makes default test index
     @param repo_location:
     @param full_index:
     """
     from pylons_app.lib.indexers.daemon import WhooshIndexingDaemon
     from pylons_app.lib.pidlock import DaemonLock, LockHeld
     from pylons_app.lib.indexers import IDX_LOCATION
     import shutil
     if os.path.exists(IDX_LOCATION):
         shutil.rmtree(IDX_LOCATION)
     try:
         l = DaemonLock()
         WhooshIndexingDaemon(repo_location=repo_location)\
             .run(full_index=full_index)
         l.release()
     except LockHeld:
         pass
 def create_test_env(repos_test_path, config):
     """Makes a fresh database and
     install test repository into tmp dir
     """
     from pylons_app.lib.db_manage import DbManage
     import tarfile
     import shutil
     from os.path import dirname as dn, join as jn, abspath
     log = logging.getLogger('TestEnvCreator')
     # create logger
     log.setLevel(logging.DEBUG)
     log.propagate = True
     # create console handler and set level to debug
     ch = logging.StreamHandler()
     ch.setLevel(logging.DEBUG)
     # create formatter
     formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
     # add formatter to ch
     ch.setFormatter(formatter)
     # add ch to logger
     log.addHandler(ch)
     #PART ONE create db
     log.debug('making test db')
     dbname = config['sqlalchemy.db1.url'].split('/')[-1]
     dbmanage = DbManage(log_sql=True, dbname=dbname, tests=True)
     dbmanage.create_tables(override=True)
     dbmanage.config_prompt(repos_test_path)
     dbmanage.create_default_user()
     dbmanage.admin_prompt()
     dbmanage.create_permissions()
     dbmanage.populate_default_permissions()
     #PART TWO make test repo
     log.debug('making test vcs repo')
     if os.path.isdir('/tmp/vcs_test'):
         shutil.rmtree('/tmp/vcs_test')
     cur_dir = dn(dn(abspath(__file__)))
     tar = tarfile.open(jn(cur_dir, 'tests', "vcs_test.tar.gz"))
     tar.extractall('/tmp')
     tar.close()

pylons_app/public/css/style.css

➞

Show inline comments

@@ @@ -188,780 +188,809 @@ div.options a:hover @@
 #header
+{
 	margin: 0;
 	padding: 0 30px 0 30px;
 	background: #b0b0b0 url("../images/header_background.png") repeat;
+}
 /* -----------------------------------------------------------
 	header -> user
 ----------------------------------------------------------- */
 #header ul#logged-user
+{
 	margin: 0;
 	padding: 0;
 	float: right;
+}
 #header ul#logged-user li
+{
 	margin: 0;
 	padding: 10px 12px 10px 12px;
 	list-style: none;
 	float: left;
 	border-left: 1px solid #bbbbbb;
 	border-right: 1px solid #a5a5a5;
+}
 #header ul#logged-user li.first
+{
 	border-left: none;
 	margin:-6px;
+}
 #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: #4e4e4e;
 	font-weight: bold;
 	text-decoration: none;
+}
 #header ul#logged-user li a:hover
+{
 	color: #376ea6;
 	text-decoration: underline;
+}
 #header ul#logged-user li.highlight a
+{
 	color: #ffffff;
+}
 #header ul#logged-user li.highlight a:hover
+{
 	color: #376ea6;
+}
 #header #header-inner
+{
 	margin: 0;
 	padding: 0;
 	height: 40px;
 	clear: both;
 	position: relative;
 	background: #003367 url("../images/colors/blue/header_inner.png") repeat-x;
 	border-bottom: 6px solid #ffffff;
+}
 /* -----------------------------------------------------------
 	header -> home
 ----------------------------------------------------------- */
 #header #header-inner #home
+{
 	float: left;
+}
 #header #header-inner #home a
+{
 	margin: 0;
 	padding: 0;
 	height: 40px;
 	width: 46px;
 	display: block;
 	background: url("../images/colors/blue/button_home.png");
 	background-position: 0 0;
+}
 #header #header-inner #home a:hover
+{
 	background-position: 0 -40px;
+}
 /* -----------------------------------------------------------
 	header -> logo
 ----------------------------------------------------------- */
 #header #header-inner #logo
+{
 	float: left;
+}
 #header #header-inner #logo h1
+{
 	margin: 13px 0 0 13px;
 	padding: 0;
 	color: #FFFFFF;
 	font-size: 14px;
 	text-transform: uppercase;
+}
 #header #header-inner #logo a
+{
 	color: #ffffff;
 	text-decoration: none;
+}
 #header #header-inner #logo a:hover
+{
 	color: #dabf29;
+}
 /* -----------------------------------------------------------
 	header -> quick
 ----------------------------------------------------------- */
 #header #header-inner #quick,
 #header #header-inner #quick ul
+{
     margin: 10px 5px 0 0;
     padding: 0;
     position: relative;
     float: right;
     list-style-type: none;
     list-style-position: outside;
+}
 #header #header-inner #quick li
+{
     margin: 0 5px 0 0;
     padding: 0;
     position: relative;
     float: left;
+}
 #header #header-inner #quick li a
+{
     top: 0;
     left: 0;
     padding: 0;
     height: 1%;
     display: block;
     clear: both;
     overflow: hidden;
     background: #336699 url("../../resources/images/colors/blue/quick_l.png") no-repeat top left;
     color: #FFFFFF;
     font-weight: bold;
     text-decoration: none;
+}
 #header #header-inner #quick li span
+{
     top: 0;
     right: 0;
     margin: 0;
     padding: 10px 12px 8px 10px;
     height: 1%;
     display: block;
     float: left;
     background: url("../../resources/images/colors/blue/quick_r.png") no-repeat top right;
     border-left: 1px solid #3f6f9f;
+}
 #header #header-inner #quick li span.normal
+{
     padding: 10px 12px 8px 12px;
     border: none;
+}
 #header #header-inner #quick li span.icon
+{
     top: 0;
     left: 0;
     padding: 8px 8px 4px 8px;
     background: url("../../resources/images/colors/blue/quick_l.png") no-repeat top left;
     border-left: none;
     border-right: 1px solid #2e5c89;
+}
 #header #header-inner #quick li a:hover
+{
     background: #4e4e4e url("../../resources/images/colors/blue/quick_l_selected.png") no-repeat top left;
+}
 #header #header-inner #quick li a:hover span
+{
     background: url("../../resources/images/colors/blue/quick_r_selected.png") no-repeat top right;
     border-left: 1px solid #545454;
+}
 #header #header-inner #quick li a:hover span.normal
+{
     border: none;
+}
 #header #header-inner #quick li a:hover span.icon
+{
     background: url("../../resources/images/colors/blue/quick_l_selected.png") no-repeat top left;
     border-left: none;
     border-right: 1px solid #464646;
+}
 #header #header-inner #quick ul
+{
     top: 29px;
     right: 0;
     margin: 0;
     padding: 0;
     width: 200px;
     display: none;
     position: absolute;
     background: #FFFFFF;
     border: 1px solid #666;
     border-top: 1px solid #003367;
     z-index: 100;
+}
 #header #header-inner #quick ul.repo_switcher{
     max-height:275px;
     overflow-x:hidden;
     overflow-y:auto;
     white-space:nowrap;
+}
 #header #header-inner #quick li ul li
+{
     border-bottom: 1px solid #dddddd;
+}
 #header #header-inner #quick li ul li.last
+{
     border: none;
+}
 #header #header-inner #quick li ul li a
+{
     margin: 0;
     padding: 7px 9px 7px 9px;
     height: 1%;
     width: 182px;
     height: auto;
     display: block;
     float: left;
     background: #FFFFFF;
     color: #0066CC;
     font-weight: normal;
+}
 #header #header-inner #quick li ul li a.childs
+{
     margin: 0;
     padding: 7px 9px 7px 24px;
     width: 167px;
     background: #FFFFFF url("../../resources/images/plus.png") no-repeat 8px 9px;
+}
 #header #header-inner #quick li ul li a:hover
+{
     color: #000000;
     background: #FFFFFF;
+}
 #header #header-inner #quick li ul li a.childs:hover
+{
     background: #FFFFFF url("../../resources/images/minus.png") no-repeat 8px 9px;
+}
 #header #header-inner #quick ul ul
+{
     top: auto;
+}
 #header #header-inner #quick li ul ul
+{
     right: 200px;
     max-height: 275px;
     overflow: auto;
     overflow-x: hidden;
     white-space:nowrap;
+}
 #header #header-inner #quick li:hover ul ul,
 #header #header-inner #quick li:hover ul ul ul,
 #header #header-inner #quick li:hover ul ul ul ul
+{
     display: none;
+}
 #header #header-inner #quick li:hover ul,
 #header #header-inner #quick li li:hover ul,
 #header #header-inner #quick li li li:hover ul,
 #header #header-inner #quick li li li li:hover ul
+{
     display: block;
+}
 /*ICONS*/
 #header #header-inner #quick li ul li a.journal,
 #header #header-inner #quick li ul li a.journal:hover
+{
     background:url("../images/icons/book.png") no-repeat scroll 4px 9px #FFFFFF;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 #header #header-inner #quick li ul li a.private_repo,
 #header #header-inner #quick li ul li a.private_repo:hover
+{
     background:url("../images/icons/lock.png") no-repeat scroll 4px 9px #FFFFFF;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 #header #header-inner #quick li ul li a.public_repo,
 #header #header-inner #quick li ul li a.public_repo:hover
+{
     background:url("../images/icons/lock_open.png") no-repeat scroll 4px 9px #FFFFFF;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 #header #header-inner #quick li ul li a.repos,
 #header #header-inner #quick li ul li a.repos:hover
+{
     background:url("../images/icons/folder_edit.png") no-repeat scroll 4px 9px #FFFFFF;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 #header #header-inner #quick li ul li a.users,
 #header #header-inner #quick li ul li a.users:hover
+{
     background: #FFFFFF url("../images/icons/user_edit.png") no-repeat 4px 9px;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 #header #header-inner #quick li ul li a.settings,
 #header #header-inner #quick li ul li a.settings:hover
+{
     background: #FFFFFF url("../images/icons/cog.png") no-repeat 4px 9px;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 #header #header-inner #quick li ul li a.permissions,
 #header #header-inner #quick li ul li a.permissions:hover
+{
     background: #FFFFFF url("../images/icons/key.png") no-repeat 4px 9px;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 #header #header-inner #quick li ul li a.branches,#header #header-inner #quick li ul li a.branches:hover
+{
 #header #header-inner #quick li ul li a.fork,
 #header #header-inner #quick li ul li a.fork:hover
+{
     background: #FFFFFF url("../images/icons/arrow_divide.png") no-repeat 4px 9px;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 #header #header-inner #quick li ul li a.search,
 #header #header-inner #quick li ul li a.search:hover
+{
     background: #FFFFFF url("../images/icons/search_16.png") no-repeat 4px 9px;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 #header #header-inner #quick li ul li a.delete,
 #header #header-inner #quick li ul li a.delete:hover
+{
     background: #FFFFFF url("../images/icons/delete.png") no-repeat 4px 9px;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 #header #header-inner #quick li ul li a.branches,
 #header #header-inner #quick li ul li a.branches:hover
+{
     background: #FFFFFF url("../images/icons/arrow_branch.png") no-repeat 4px 9px;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 #header #header-inner #quick li ul li a.tags,#header #header-inner #quick li ul li a.tags:hover
+{
 #header #header-inner #quick li ul li a.tags,
 #header #header-inner #quick li ul li a.tags:hover
+{
     background: #FFFFFF url("../images/icons/tag_blue.png") no-repeat 4px 9px;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 /* -----------------------------------------------------------
 	header corners
 ----------------------------------------------------------- */
 #header #header-inner div.corner
+{
 	height: 6px;
 	width: 6px;
 	position: absolute;
 	background: url("../images/colors/blue/header_inner_corners.png") no-repeat;
+}
 #header #header-inner div.tl
+{
 	top: 0;
 	left: 0;
     background-position: 0 0;
+}
 #header #header-inner div.tr
+{
 	top: 0;
 	right: 0;
     background-position: -6px 0;
+}
 /* -----------------------------------------------------------
 	content
 ----------------------------------------------------------- */
 #content
+{
 	margin: 10px 0 0 0;
 	padding: 0;
     min-height: 100%;
 	clear: both;
 	overflow: hidden;
 	background: url("../images/content.png") repeat-y top left;
+}
 /* -----------------------------------------------------------
 	content -> left
 ----------------------------------------------------------- */
 #content #left
+{
 	left: 0;
 	width: 280px;
 	position: absolute;
+}
 /* -----------------------------------------------------------
 	content -> left -> menu
 ----------------------------------------------------------- */
 #content #left #menu
+{
 	margin: 5px 10px 0 60px;
 	padding: 0;
 	clear: both;
 	overflow: hidden;
+}
 /* -----------------------------------------------------------
 	content -> left -> menu / heading
 ----------------------------------------------------------- */
 #content #left #menu h6
+{
 	margin: 5px 0 0 0;
 	padding: 0;
 	clear: both;
 	overflow: hidden;
 	background: #dfdfdf url("../images/menu.png") repeat-x;
 	color: #6e6e6e;
+}
 #content #left #menu h6 a
+{
 	margin: 0;
 	padding: 0;
 	height: 1%;
 	display: block;
     clear: both;
     overflow: hidden;
 	background: url("../images/menu_l.png") no-repeat top left;
 	color: #6e6e6e;
 	text-decoration: none;
+}
 #content #left #menu h6 span
+{
 	margin: 0;
 	padding: 9px 10px 10px 10px;
 	height: 1%;
 	display: block;
 	background: url("../images/menu_r.png") no-repeat top right;
+}
 #content #left #menu h6.selected
+{
 	background: #00376e url("../images/colors/blue/menu_selected.png") repeat-x;
 	color: #FFFFFF;
+}
 #content #left #menu h6.selected a
+{
 	background: url("../images/colors/blue/menu_l_selected.png") no-repeat top left;
 	color: #ffffff;
+}
 #content #left #menu h6.selected span
+{
 	background: url("../images/colors/blue/menu_r_selected.png") no-repeat top right;
+}
 /* -----------------------------------------------------------
 	content -> left -> menu / links
 ----------------------------------------------------------- */
 #content #left #menu ul
+{
 	margin: 0;
 	padding: 0;
 	background: #376ea6;
+}
 #content #left #menu ul.opened
+{
 	display: block;
+}
 #content #left #menu ul.closed
+{
 	display: none;
+}
 #content #left #menu li
+{
 	margin: 0;
 	padding: 0;
 	clear: both;
 	overflow: hidden;
 	list-style: none;
 	border-bottom: 1px solid #5f8bb7;
 	color: #ffffff;
+}
 #content #left #menu li a
+{
 	margin: 0 0 0 6px;
 	padding: 8px 0 8px 18px;
 	height: 1%;
 	display: block;
 	float: left;
 	background: url("../images/colors/colors/blue/menu_arrow.png") no-repeat 0 9px;
 	color: #ffffff;
 	text-decoration: none;
+}
 #content #left #menu li a:hover
+{
 	color: #b9dcff;
+}
 /* -----------------------------------------------------------
 	content -> left -> menu / collapsible
 ----------------------------------------------------------- */
 #content #left #menu li.collapsible
+{
 	background: url("../images/colors/blue/menu_border.png") no-repeat top left;
+}
 #content #left #menu li.collapsible a
+{
 	margin: 0 0 0 6px;
 	padding: 8px 0 8px 0;
 	height: 1%;
 	display: block;
 	background: transparent;
 	float: left;
 	font-weight: bold;
+}
 #content #left #menu li.collapsible a.plus
+{
 	margin: 0;
 	padding: 8px 0 9px 24px;
 	height: 10px;
 	width: 10px;
 	display: block;
 	float: left;
 	background: url("../images/menu_plus.png") no-repeat 5px 10px;
 	border: none;
+}
 #content #left #menu li.collapsible a.minus
+{
 	margin: 0;
 	padding: 8px 0 9px 24px;
 	height: 10px;
 	width: 10px;
 	display: block;
 	float: left;
 	background: url("../images/menu_minus.png") no-repeat 5px 10px;
 	border: none;
+}
 #content #left #menu li ul
+{
 	margin: 0;
 	padding: 0;
 	border-left: 18px solid #285889;
+}
 #content #left #menu li ul.expanded
+{
 	display: block;
+}
 #content #left #menu li ul.collapsed
+{
 	display: none;
+}
 #content #left #menu li ul li
+{
 	margin: 0;
 	padding: 0;
 	clear: both;
 	overflow: hidden;
 	list-style: none;
 	border-bottom: 1px solid #5f8bb7;
 	color: #ffffff;
+}
 #content #left #menu li.collapsible ul li a
+{
 	font-weight: normal;
+}
 #content #left #menu li.last
+{
 	border-bottom: none;
+}
 /* -----------------------------------------------------------
 	content -> left -> date picker
 ----------------------------------------------------------- */
 #content #left #date-picker
+{
 	margin: 10px 10px 0 60px;
 	padding: 0;
 	clear: both;
 	overflow: hidden;
+}
 #content #left #date-picker .ui-datepicker
+{
 	width: auto;
 	padding: 0;
 	clear: both;
 	overflow: hidden;
 	background: #FFFFFF;
 	border: 1px solid #d1d1d1;
+}
 #content #left #date-picker .ui-datepicker .ui-datepicker-header
+{
 	padding: 5px 0;
+}
 #content #left #date-picker .ui-datepicker .ui-datepicker-prev
+{
 	top: 5px;
 	left: 4px;
+}
 #content #left #date-picker .ui-datepicker .ui-datepicker-next
+{
 	top: 5px;
 	right: 4px;
+}
 #content #left #date-picker .ui-datepicker .ui-datepicker-prev-hover
+{
 	top: 5px;
 	left: 4px;
+}
 #content #left #date-picker .ui-datepicker .ui-datepicker-next-hover
+{
 	top: 5px;
 	right: 4px;
+}
 /* -----------------------------------------------------------
 	content -> right
 ----------------------------------------------------------- */
 #content #right
+{
 	margin: 0 60px 10px 290px;
+}
 /* -----------------------------------------------------------
 	content -> right -> box
 ----------------------------------------------------------- */
 #content div.box
+{
 	margin: 0 0 10px 0;
 	padding: 0 0 10px 0;
 	clear: both;
 	overflow: hidden;
 	background: #ffffff;
+}
 #content div.box-left
+{
 	margin: 0 0 10px;
 	width: 49%;
 	clear: none;
 	float: left;
+}
 #content div.box-right
+{
 	margin: 0 0 10px;
 	width: 49%;
 	clear: none;
 	float: right;
+}
 /* -----------------------------------------------------------
 	content -> right -> box / title
 ----------------------------------------------------------- */
 #content div.box div.title
+{
 	margin: 0 0 20px 0;
 	padding: 0;
 	clear: both;
 	overflow: hidden;
 	background: #336699 url("../images/colors/blue/title.png") repeat-x;
+}
 #content div.box div.title h5
+{
 	margin: 0;
 	padding: 11px 0 11px 10px;
 	float: left;
 	border: none;
 	color: #ffffff;
 	text-transform: uppercase;
+}
 #content div.box div.title ul.links
+{
 	margin: 0;
 	padding: 0;
 	float: right;
+}
 #content div.box div.title ul.links li
+{
 	margin: 0;
 	padding: 0;
 	list-style: none;
 	float: left;
+}
 #content div.box div.title ul.links li a
+{
 	margin: 0;
 	padding: 13px 16px 12px 16px;
 	height: 1%;
@@ @@ -3083,600 +3112,602 @@ h3.files_location{ @@
 .cs_files .cs_removed {
 	background: url("/images/icons/page_white_delete.png") no-repeat scroll
 px;
 	/*background-color: #FF8888;*/
 	height: 16px;
 	padding-left: 20px;
 	margin-top: 7px;
 	text-align: left;
+}
 /* -----------------------------------------------------------
 	CHANGESETS - CANVAS
 ----------------------------------------------------------- */
 #graph {
 	overflow: hidden;
+}
 #graph_nodes {
 	width: 160px;
 	float: left;
 	margin-left:-50px;
 	margin-top: 5px;
+}
 #graph_content {
 	width: 800px;
 	float: left;
+}
 #graph_content .container_header {
 	border: 1px solid #CCCCCC;
 	padding:10px;
+}
 #graph_content .container .wrapper {
 	width: 600px;
+}
 #graph_content .container {
 	border-bottom: 1px solid #CCCCCC;
 	border-left: 1px solid #CCCCCC;
 	border-right: 1px solid #CCCCCC;
 	min-height: 90px;
 	overflow: hidden;
 	font-size:1.2em;
+}
 #graph_content .container .left {
 	float: left;
 	width: 70%;
 	padding-left: 5px;
+}
 #graph_content .container .right {
 	float: right;
 	width: 25%;
 	text-align: right;
+}
 #graph_content .container .left .date {
 	font-weight: bold;
+}
 #graph_content .container .left .author {
+}
 #graph_content .container .left .message {
 	font-size: 100%;
 	padding-top: 3px;
+}
 .right div {
 	clear: both;
+}
 .right .changes .added,.changed,.removed {
 	border: 1px solid #DDDDDD;
 	display: block;
 	float: right;
 	font-size: 0.75em;
 	text-align: center;
 	min-width: 15px;
+}
 .right .changes .added {
 	background: #BBFFBB;
+}
 .right .changes .changed {
 	background: #FFDD88;
+}
 .right .changes .removed {
 	background: #FF8888;
+}
 .right .merge {
 	vertical-align: top;
 	font-size: 60%;
 	font-weight: bold;
+}
 .right .merge img {
 	vertical-align: bottom;
+}
 .right .parent {
 	font-size: 90%;
 	font-family: monospace;
+}
 /* -----------------------------------------------------------
 	FILE BROWSER
 ----------------------------------------------------------- */
 div.browserblock {
 	overflow: hidden;
 	padding: 0px;
 	border: 1px solid #ccc;
 	background: #f8f8f8;
 	font-size: 100%;
 	line-height: 100%;
 	/* new */
 	line-height: 125%;
+}
 div.browserblock .browser-header {
 	border-bottom: 1px solid #CCCCCC;
 	background: #FFFFFF;
 	color: blue;
 	padding: 10px 0 10px 0;
+}
 div.browserblock .browser-header span {
 	margin-left: 25px;
 	font-weight: bold;
+}
 div.browserblock .browser-body {
 	background: #EEEEEE;
+}
 table.code-browser {
 	border-collapse: collapse;
 	width: 100%;
+}
 table.code-browser tr {
 	margin: 3px;
+}
 table.code-browser thead th {
 	background-color: #EEEEEE;
 	height: 20px;
 	font-size: 1.1em;
 	font-weight: bold;
 	text-align: center;
 	text-align: left;
 	padding-left: 10px;
+}
 table.code-browser tbody tr {
+}
 table.code-browser tbody td {
 	padding-left: 10px;
 	height: 20px;
+}
 table.code-browser .browser-file {
 	background: url("/images/icons/document_16.png") no-repeat scroll 3px;
 	height: 16px;
 	padding-left: 20px;
 	text-align: left;
+}
 table.code-browser .browser-dir {
 	background: url("/images/icons/folder_16.png") no-repeat scroll 3px;
 	height: 16px;
 	padding-left: 20px;
 	text-align: left;
+}
 /* -----------------------------------------------------------
 	ADMIN - SETTINGS
 ----------------------------------------------------------- */
 #path_unlock{
 	color: red;
 	font-size: 1.2em;
 	padding-left: 4px;
+}
 /* -----------------------------------------------------------
     INFOBOX
 ----------------------------------------------------------- */
 .info_box *{
 	background:url("../../images/pager.png") repeat-x scroll 0 0 #EBEBEB;
 	border-color:#DEDEDE #C4C4C4 #C4C4C4 #CFCFCF;
 	border-style:solid;
 	border-width:1px;
 	color:#4A4A4A;
 	display:block;
 	font-weight:bold;
 	height:1%;
 	padding:4px 6px;
 	display: inline;
+}
 .info_box span{
     margin-left:3px;
     margin-right:3px;
+}
 .info_box input#at_rev {
 	padding:1px 3px 3px 2px;
 	text-align:center;
+}
 .info_box input#view {
 	padding:0px 3px 2px 2px;
 	text-align:center;
+}
 /* -----------------------------------------------------------
     YUI TOOLTIP
 ----------------------------------------------------------- */
 .yui-overlay,.yui-panel-container {
     visibility: hidden;
     position: absolute;
     z-index: 2;
+}
 .yui-tt {
     visibility: hidden;
     position: absolute;
     color: #666666;
     background-color: #FFFFFF;
     font-family: arial, helvetica, verdana, sans-serif;
     padding: 8px;
     border: 2px solid #556CB5;
     font: 100% sans-serif;
     width: auto;
     opacity: 1.0;
+}
 .yui-tt-shadow {
     display: none;
+}
 /* -----------------------------------------------------------
     YUI AUTOCOMPLETE
 ----------------------------------------------------------- */
 .ac{
     vertical-align: top;
+}
 .ac .match {
     font-weight:bold;
+}
 .ac .yui-ac {
     position: relative;
     font-family: arial;
     font-size: 100%;
+}
 .ac .perm_ac{
     width:15em;
+}
 /* styles for input field */
 .ac .yui-ac-input {
     width: 100%;
+}
 /* styles for results container */
 .ac .yui-ac-container {
     position: absolute;
     top: 1.6em;
     width: 100%;
+}
 /* styles for header/body/footer wrapper within container */
 .ac .yui-ac-content {
     position: absolute;
     width: 100%;
     border: 1px solid #808080;
     background: #fff;
     overflow: hidden;
     z-index: 9050;
+}
 /* styles for container shadow */
 .ac .yui-ac-shadow {
     position: absolute;
     margin: .3em;
     width: 100%;
     background: #000;
     -moz-opacity: 0.10;
     opacity: .10;
     filter: alpha(opacity = 10);
     z-index: 9049;
+}
 /* styles for results list */
 .ac .yui-ac-content ul {
     margin: 0;
     padding: 0;
     width: 100%;
+}
 /* styles for result item */
 .ac .yui-ac-content li {
     margin: 0;
     padding: 2px 5px;
     cursor: default;
     white-space: nowrap;
+}
 /* styles for prehighlighted result item */
 .ac .yui-ac-content li.yui-ac-prehighlight {
     background: #B3D4FF;
+}
 /* styles for highlighted result item */
 .ac .yui-ac-content li.yui-ac-highlight {
     background: #556CB5;
     color: #FFF;
+}
 /* -----------------------------------------------------------
     ACTION ICONS
 ----------------------------------------------------------- */
 .add_icon {
     background: url("/images/icons/add.png") no-repeat scroll 3px ;
     height: 16px;
     padding-left: 20px;
     padding-top: 1px;
     text-align: left;
+}
 .edit_icon {
     background: url("/images/icons/folder_edit.png") no-repeat scroll 3px;
     height: 16px;
     padding-left: 20px;
     padding-top: 1px;
     text-align: left;
+}
 .delete_icon {
     background: url("/images/icons/delete.png") no-repeat scroll 3px;
     height: 16px;
     padding-left: 20px;
     padding-top: 1px;
     text-align: left;
+}
 .rss_icon {
     background: url("/images/icons/rss_16.png") no-repeat scroll 3px;
     height: 16px;
     padding-left: 20px;
     padding-top: 1px;
     text-align: left;
+}
 .atom_icon {
     background: url("/images/icons/atom.png") no-repeat scroll 3px;
     height: 16px;
     padding-left: 20px;
     padding-top: 1px;
     text-align: left;
+}
 .archive_icon {
     background: url("/images/icons/compress.png") no-repeat scroll 3px;
     height: 16px;
     padding-left: 20px;
     text-align: left;
     padding-top: 1px;
+}
 .action_button {
     border: 0px;
     display: block;
     color:#0066CC;
+}
 .action_button:hover {
     border: 0px;
-    font-style: italic;
+    text-decoration:underline;
     cursor: pointer;
     color:#0066CC;
+}
 /* -----------------------------------------------------------
     REPO SWITCHER
 ----------------------------------------------------------- */
 #switch_repos{
 	position: absolute;
 	height: 25px;
 	z-index: 1;
+}
 #switch_repos select{
     min-width:150px;
     max-height: 250px;
     z-index: 1;
+}
 /* -----------------------------------------------------------
     BREADCRUMBS
 ----------------------------------------------------------- */
 .breadcrumbs{
 	border:medium none;
 	color:#FFFFFF;
 	float:left;
 	margin:0;
 	padding:11px 0 11px 10px;
 	text-transform:uppercase;
     font-weight: bold;
     font-size: 14px;
+}
 .breadcrumbs a{
  color: #FFFFFF;
+}
 /* -----------------------------------------------------------
     FLASH MSG
 ----------------------------------------------------------- */
 .flash_msg ul {
     margin: 0;
     padding: 0px 0px 10px 0px;
+}
 .error_msg {
     background-color: #FFCFCF;
     background-image: url("/images/icons/error_msg.png");
     border: 1px solid #FF9595;
     color: #CC3300;
+}
 .warning_msg {
     background-color: #FFFBCC;
     background-image: url("/images/icons/warning_msg.png");
     border: 1px solid #FFF35E;
     color: #C69E00;
+}
 .success_msg {
     background-color: #D5FFCF;
     background-image: url("/images/icons/success_msg.png");
     border: 1px solid #97FF88;
     color: #009900;
+}
 .notice_msg {
     background-color: #DCE3FF;
     background-image: url("/images/icons/notice_msg.png");
     border: 1px solid #93A8FF;
     color: #556CB5;
+}
 .success_msg,.error_msg,.notice_msg,.warning_msg {
     background-position: 10px center;
     background-repeat: no-repeat;
     font-size: 12px;
     font-weight: bold;
     min-height: 14px;
     line-height: 14px;
     margin-bottom: 0px;
     margin-top: 0px;
     padding: 6px 10px 6px 40px;
     display: block;
     overflow: auto;
+}
 #msg_close {
     background: transparent url("icons/cross_grey_small.png") no-repeat
         scroll 0 0;
     cursor: pointer;
     height: 16px;
     position: absolute;
     right: 5px;
     top: 5px;
     width: 16px;
+}
 /* -----------------------------------------------------------
 	YUI FLOT
 ----------------------------------------------------------- */
 div#commit_history{
 	float: left;
+}
 div#legend_data{
 	float:left;
+}
 div#legend_container {
 	float: left;
+}
 div#legend_container table,div#legend_choices table{
 	width:auto !important;
+}
 div#legend_container table td{
 	border: none !important;
 	padding: 0px !important;
 	height: 20px  !important;
+}
 div#legend_choices table td{
 	border: none !important;
 	padding: 0px !important;
 	height: 20px  !important;
+}
 div#legend_choices{
 	float:left;
+}
 /* -----------------------------------------------------------
     PERMISSIONS TABLE
 ----------------------------------------------------------- */
 table#permissions_manage{
     width: 0 !important;
+}
 table#permissions_manage span.private_repo_msg{
     font-size: 0.8em;
     opacity:0.6;
+}
 table#permissions_manage td.private_repo_msg{
     font-size: 0.8em;
+}
 table#permissions_manage tr#add_perm_input td{
     vertical-align:middle;
+}
 /* -----------------------------------------------------------
     GRAVATARS
 ----------------------------------------------------------- */
 div.gravatar{
 	background-color:white;
 	border:1px solid #D0D0D0;
 	float:left;
 	margin-right:0.7em;
 	padding: 2px 2px 0px;
+}
 /* -----------------------------------------------------------
     STYLING OF LAYOUT
 ----------------------------------------------------------- */
 /* -----------------------------------------------------------
     GLOBAL WIDTH
 ----------------------------------------------------------- */
 #header,#content,#footer{
     min-width: 1224px;
+}
 /* -----------------------------------------------------------
     content
 ----------------------------------------------------------- */
 #content
+{
     margin: 10px 30px 0 30px;
     padding: 0;
     min-height: 100%;
     clear: both;
     overflow: hidden;
     background: transparent;
+}
 /* -----------------------------------------------------------
     content -> right -> forms -> labels
 ----------------------------------------------------------- */
 #content div.box div.form div.fields div.field div.label
+{
     left: 80px;
     margin: 0;
     padding: 8px 0 0 5px;
     width: auto;
     position: absolute;
+}
 #content div.box-left div.form div.fields div.field div.label,
 #content div.box-right div.form div.fields div.field div.label
+{
     left: 0;
     margin: 0;
     padding: 0 0 8px 0;
     width: auto;
     position: relative;
+}
@@ \ No newline at end of file @@

pylons_app/templates/admin/repos/repo_add.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
-    ${_('Repositories administration')}
+    ${_('Add new repository')}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Repositories'),h.url('repos'))}
     &raquo;
     ${_('add new')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('repos'))}
     <div class="form">
         <!-- fields -->
         <div class="fields">
             <div class="field">
 	            <div class="label">
 	                <label for="repo_name">${_('Name')}:</label>
 	            </div>
 	            <div class="input">
 	                ${h.text('repo_name',c.new_repo)}
 	            </div>
              </div>
             <div class="field">
                 <div class="label label-textarea">
                     <label for="description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${h.textarea('description',cols=23,rows=5)}
                 </div>
              </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="private">${_('Private')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('private',value="True")}
                 </div>
              </div>
 	        <div class="buttons">
 	          ${h.submit('add','add',class_="ui-button ui-widget ui-state-default ui-corner-all")}
 	        </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 </%def>

pylons_app/templates/base/base.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml">
 <head>
     <title>${next.title()}</title>
     <link rel="icon" href="/images/hgicon.png" type="image/png" />
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
     <meta name="robots" content="index, nofollow"/>
     <!-- stylesheets -->
     ${self.css()}
     <!-- scripts -->
     ${self.js()}
 </head>
 <body>
     <!-- header -->
     <div id="header">
         <!-- user -->
         <ul id="logged-user">
             <li class="first">
 	            <div class="gravatar">
 	            	<img alt="gravatar" src="${h.gravatar_url(c.hg_app_user.email,24)}" />
 	            </div>
 	            <div class="account">
 	            	${h.link_to('%s %s'%(c.hg_app_user.name,c.hg_app_user.lastname),h.url('admin_settings_my_account'))}<br/>
 	            	${h.link_to(c.hg_app_user.username,h.url('admin_settings_my_account'))}
 	            </div>
             </li>
             <li class="last highlight">${h.link_to(u'Logout',h.url('logout_home'))}</li>
         </ul>
         <!-- end user -->
         <div id="header-inner">
             <div id="home">
                 <a href="${h.url('hg_home')}"></a>
             </div>
             <!-- logo -->
             <div id="logo">
                 <h1><a href="${h.url('hg_home')}">${c.hg_app_name}</a></h1>
             </div>
             <!-- end logo -->
             <!-- quick menu -->
             ${self.page_nav()}
             <!-- end quick -->
             <div class="corner tl"></div>
             <div class="corner tr"></div>
         </div>
     </div>
     <!-- end header -->
 	<!-- CONTENT -->
 	<div id="content">
         <div class="flash_msg">
             <% messages = h.flash.pop_messages() %>
             % if messages:
             <ul id="flash-messages">
                 % for message in messages:
                 <li class="${message.category}_msg">${message}</li>
                 % endfor
             </ul>
             % endif
         </div>
 	    <div id="main">
 	        ${next.main()}
 	    </div>
 	</div>
     <!-- END CONTENT -->
 	<!-- footer -->
 	<div id="footer">
 	    <p>Hg App ${c.hg_app_version} &copy; 2010 by Marcin Kuzminski</p>
         <script type="text/javascript">${h.tooltip.activate()}</script>
 	</div>
 	<!-- end footer -->
 </body>
 </html>
 ### MAKO DEFS ###
 <%def name="page_nav()">
 	${self.menu()}
 </%def>
 <%def name="menu(current=None)">
 		<%
 		def is_current(selected):
 			if selected == current:
 				return h.literal('class="current"')
 		%>
 		%if current not in ['home','admin']:
 		   ##REGULAR MENU
 	        <ul id="quick">
 				<!-- repo switcher -->
 				<li>
 					<a id="repo_switcher" title="${_('Switch repository')}" href="#">
                     <span class="icon">
                         <img src="/images/icons/database.png" alt="${_('Products')}" />
                     </span>
                     <span>&darr;</span>
 					</a>
 					<ul class="repo_switcher">
                         %for repo,private in c.repo_switcher_list:
                           %if private:
                              <li>${h.link_to(repo,h.url('summary_home',repo_name=repo),class_="private_repo")}</li>
                           %else:
                              <li>${h.link_to(repo,h.url('summary_home',repo_name=repo),class_="public_repo")}</li>
                           %endif
                         %endfor
 					</ul>
 				</li>
 	            <li ${is_current('summary')}>
 	               <a title="${_('Summary')}" href="${h.url('summary_home',repo_name=c.repo_name)}">
 	               <span class="icon">
 	                   <img src="/images/icons/clipboard_16.png" alt="${_('Summary')}" />
 	               </span>
 	               <span>${_('Summary')}</span>
 	               </a>
 	            </li>
                 <li ${is_current('shortlog')}>
                    <a title="${_('Shortlog')}" href="${h.url('shortlog_home',repo_name=c.repo_name)}">
                    <span class="icon">
                        <img src="/images/icons/application_double.png" alt="${_('Shortlog')}" />
                    </span>
                    <span>${_('Shortlog')}</span>
                    </a>
                 </li>
                 <li ${is_current('changelog')}>
                    <a title="${_('Changelog')}" href="${h.url('changelog_home',repo_name=c.repo_name)}">
                    <span class="icon">
                        <img src="/images/icons/time.png" alt="${_('Changelog')}" />
                    </span>
                    <span>${_('Changelog')}</span>
                    </a>
                 </li>
                 <li ${is_current('switch_to')}>
                    <a title="${_('Switch to')}" href="#">
                    <span class="icon">
                        <img src="/images/icons/arrow_switch.png" alt="${_('Switch to')}" />
                    </span>
                    <span>${_('Switch to')}</span>
                    </a>
                     <ul>
                         <li>
                             ${h.link_to(_('branches'),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')}
                             <ul>
                             %if c.repository_branches.values():
 						        %for cnt,branch in enumerate(c.repository_branches.items()):
 						            <li>${h.link_to('%s - %s' % (branch[0],branch[1]),h.url('files_home',repo_name=c.repo_name,revision=branch[1]))}</li>
 						        %endfor
 						    %else:
 						    	<li>${h.link_to(_('There are no branches yet'),'#')}</li>
 						    %endif
                             </ul>
                         </li>
                         <li>
                             ${h.link_to(_('tags'),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')}
                             <ul>
                             %if c.repository_tags.values():
                                 %for cnt,tag in enumerate(c.repository_tags.items()):
                                  <li>${h.link_to('%s - %s' % (tag[0],tag[1]),h.url('files_home',repo_name=c.repo_name,revision=tag[1]))}</li>
                                 %endfor
                             %else:
                             	<li>${h.link_to(_('There are no tags yet'),'#')}</li>
                             %endif
                             </ul>
                         </li>
                     </ul>
                 </li>
                 <li ${is_current('files')}>
                    <a title="${_('Files')}" href="${h.url('files_home',repo_name=c.repo_name)}">
                    <span class="icon">
                        <img src="/images/icons/file.png" alt="${_('Files')}" />
                    </span>
                    <span>${_('Files')}</span>
                    </a>
                 </li>
 				%if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
                 <li ${is_current('settings')}>
                    <a title="${_('Settings')}" href="${h.url('repo_settings_home',repo_name=c.repo_name)}">
                 <li ${is_current('options')}>
                    <a title="${_('Options')}" href="#">
                    <span class="icon">
-                       <img src="/images/icons/cog_edit.png" alt="${_('Settings')}" />
+                       <img src="/images/icons/table_gear.png" alt="${_('Admin')}" />
                    </span>
-                   <span>${_('Settings')}</span>
+                   <span>${_('Options')}</span>
                    </a>
                    <ul>
                    %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
                    	<li>${h.link_to(_('settings'),h.url('repo_settings_home',repo_name=c.repo_name),class_='settings')}</li>
                    %endif
                    	<li>${h.link_to(_('fork'),h.url('repo_fork_home',repo_name=c.repo_name),class_='fork')}</li>
                    	<li>${h.link_to(_('search'),h.url('search_repo',search_repo=c.repo_name),class_='search')}</li>
                    %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
                    	<li class="last">
                    	${h.link_to(_('delete'),'#',class_='delete')}
 ##	                  ${h.form(url('repo_settings_delete', repo_name=c.repo_name),method='delete')}
 ##	                    ${h.submit('remove_%s' % c.repo_name,'delete',class_="delete_icon action_button",onclick="return confirm('Confirm to delete this repository');")}
 ##	                  ${h.end_form()}
                 </li>
 				%endif
 	        </ul>
                 </li>
 	        </ul>
 		%else:
 		    ##ROOT MENU
             <ul id="quick">
                 <li>
                     <a title="${_('Home')}"  href="${h.url('hg_home')}">
                     <span class="icon">
                         <img src="/images/icons/home_16.png" alt="${_('Home')}" />
                     </span>
                     <span>${_('Home')}</span>
                     </a>
                 </li>
                 <li>
                     <a title="${_('Search')}"  href="${h.url('search')}">
                     <span class="icon">
                         <img src="/images/icons/search_16.png" alt="${_('Search')}" />
                     </span>
                     <span>${_('Search')}</span>
                     </a>
                 </li>
 				%if h.HasPermissionAll('hg.admin')('access admin main page'):
                 <li ${is_current('admin')}>
                    <a title="${_('Admin')}" href="${h.url('admin_home')}">
                    <span class="icon">
                        <img src="/images/icons/cog_edit.png" alt="${_('Admin')}" />
                    </span>
                    <span>${_('Admin')}</span>
                    </a>
 				    <ul>
 				        <li>${h.link_to(_('journal'),h.url('admin_home'),class_='journal')}</li>
 				        <li>${h.link_to(_('repositories'),h.url('repos'),class_='repos')}</li>
 				        <li>${h.link_to(_('users'),h.url('users'),class_='users')}</li>
 				        <li>${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li>
 				        <li class="last">${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}</li>
 				    </ul>
                 </li>
 				%endif
 			</ul>
 		%endif
 </%def>
 <%def name="css()">
 <link rel="stylesheet" type="text/css" href="/css/reset.css" />
 <link rel="stylesheet" type="text/css" href="/css/style.css" media="screen" />
 <link id="color" rel="stylesheet" type="text/css" href="/css/colors/blue.css" />
 <link rel="stylesheet" type="text/css" href="/css/pygments.css"  />
 <link rel="stylesheet" type="text/css" href="/css/diff.css"  />
 </%def>
 <%def name="js()">
 ##<script type="text/javascript" src="/js/yui/utilities/utilities.js"></script>
 ##<script type="text/javascript" src="/js/yui/container/container.js"></script>
 ##<script type="text/javascript" src="/js/yui/datasource/datasource.js"></script>
 ##<script type="text/javascript" src="/js/yui/autocomplete/autocomplete.js"></script>
 <script type="text/javascript" src="/js/yui2.js"></script>
 <!--[if IE]><script language="javascript" type="text/javascript" src="/js/excanvas.min.js"></script><![endif]-->
 <script type="text/javascript" src="/js/yui.flot.js"></script>
 </%def>
 <%def name="breadcrumbs()">
     <div class="breadcrumbs">
     ${self.breadcrumbs_links()}
     </div>
 </%def>
@@ \ No newline at end of file @@

pylons_app/templates/index.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="base/base.html"/>
 <%def name="title()">
     ${c.hg_app_name}
 </%def>
 <%def name="breadcrumbs()">
 	${c.hg_app_name}
 </%def>
 <%def name="page_nav()">
 	${self.menu('home')}
 </%def>
 <%def name="main()">
 	<%def name="get_sort(name)">
 		<%name_slug = name.lower().replace(' ','_') %>
 		%if name_slug == c.sort_slug:
 		  %if c.sort_by.startswith('-'):
 		    <a href="?sort=${name_slug}">${name}&uarr;</a>
 		  %else:
 		    <a href="?sort=-${name_slug}">${name}&darr;</a>
 		  %endif:
 		%else:
 		    <a href="?sort=${name_slug}">${name}</a>
 		%endif
 	</%def>
     <div class="box">
 	    <!-- box / title -->
 	    <div class="title">
 	        <h5>${_('Dashboard')}</h5>
 	        %if h.HasPermissionAny('hg.admin','hg.create.repository')():
 	        <ul class="links">
 	          <li>
-	            <span>${h.link_to(u'ADD NEW REPOSITORY',h.url('admin_settings_create_repository'),class_="add_icon")}</span>
+	            <span>${h.link_to(_('ADD NEW REPOSITORY'),h.url('admin_settings_create_repository'),class_="add_icon")}</span>
 	          </li>
 	        </ul>
 	        %endif
 	    </div>
 	    <!-- end box / title -->
         <div class="table">
                     <table>
             <thead>
 	            <tr>
 			        <th class="left">${get_sort(_('Name'))}</th>
 			        <th class="left">${get_sort(_('Description'))}</th>
 			        <th class="left">${get_sort(_('Last change'))}</th>
 			        <th class="left">${get_sort(_('Tip'))}</th>
 			        <th class="left">${get_sort(_('Contact'))}</th>
 			        <th class="left">${_('RSS')}</th>
 			        <th class="left">${_('Atom')}</th>
 	            </tr>
             </thead>
                         <tbody>
 					    %for cnt,repo in enumerate(c.repos_list):
 					        %if h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(repo['name'],'main page check'):
 					        <tr class="parity${cnt%2}">
 					            <td>
 					             %if repo['repo'].dbrepo.private:
 					                <img class="icon" alt="${_('private')}" src="/images/icons/lock.png"/>
 					             %else:
 					                <img class="icon" alt="${_('public')}" src="/images/icons/lock_open.png"/>
 					             %endif
 					            ${h.link_to(repo['name'],
 					                h.url('summary_home',repo_name=repo['name']))}</td>
 					            <td title="${repo['description']}">${h.truncate(repo['description'],60)}</td>
 					            <td>${h.age(repo['last_change'])}</td>
 					            <td>
 					            	%if repo['rev']>=0:
 					            	${h.link_to('r%s:%s' % (repo['rev'],repo['tip']),
 					                h.url('changeset_home',repo_name=repo['name'],revision=repo['tip']),
 					                class_="tooltip",
 					                tooltip_title=h.tooltip(repo['last_msg']))}
 					            	%else:
 					            		${_('No changesets yet')}
 					            	%endif
 					            </td>
 					            <td title="${repo['contact']}">${h.person(repo['contact'])}</td>
 					            <td>
 					                <a title="${_('Subscribe to %s rss feed')%repo['name']}" class="rss_icon"  href="${h.url('rss_feed_home',repo_name=repo['name'])}"></a>
 					            </td>
 					            <td>
 					                <a title="${_('Subscribe to %s atom feed')%repo['name']}"  class="atom_icon" href="${h.url('atom_feed_home',repo_name=repo['name'])}"></a>
 					            </td>
 					        </tr>
 					        %endif
 					    %endfor
                         </tbody>
                     </table>
             </div>
     </div>
 </%def>

pylons_app/templates/settings/repo_settings.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
-    ${_('Repositories administration')}
+    ${_('Repository settings')}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(c.repo_info.repo_name,h.url('summary_home',repo_name=c.repo_info.repo_name))}
     &raquo;
     ${_('Settings')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('settings')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('repo_settings_update', repo_name=c.repo_info.repo_name),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
             <div class="field">
                 <div class="label">
                     <label for="repo_name">${_('Name')}:</label>
                 </div>
                 <div class="input input-medium">
                     ${h.text('repo_name')}
                 </div>
              </div>
             <div class="field">
                 <div class="label label-textarea">
                     <label for="description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${h.textarea('description',cols=23,rows=5)}
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="private">${_('Private')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('private',value="True")}
                 </div>
             </div>
              <div class="field">
                 <div class="label">
                     <label for="">${_('Permissions')}:</label>
                 </div>
                 <div class="input">
                     <table id="permissions_manage">
                         <tr>
                             <td>${_('none')}</td>
                             <td>${_('read')}</td>
                             <td>${_('write')}</td>
                             <td>${_('admin')}</td>
                             <td>${_('user')}</td>
                             <td></td>
                         </tr>
                         %for r2p in c.repo_info.repo_to_perm:
                             %if r2p.user.username =='default' and c.repo_info.private:
                                 <tr>
                                     <td colspan="4">
                                         <span class="private_repo_msg">
                                         ${_('private repository')}
                                         </span>
                                     </td>
                                     <td class="private_repo_msg">${r2p.user.username}</td>
                                 </tr>
                             %else:
                             <tr id="id${id(r2p.user.username)}">
                                 <td>${h.radio('perm_%s' % r2p.user.username,'repository.none')}</td>
                                 <td>${h.radio('perm_%s' % r2p.user.username,'repository.read')}</td>
                                 <td>${h.radio('perm_%s' % r2p.user.username,'repository.write')}</td>
                                 <td>${h.radio('perm_%s' % r2p.user.username,'repository.admin')}</td>
                                 <td>${r2p.user.username}</td>
                                 <td>
                                   %if r2p.user.username !='default':
                                     <span class="delete_icon action_button" onclick="ajaxAction(${r2p.user.user_id},'${'id%s'%id(r2p.user.username)}')">
                                         <script type="text/javascript">
                                             function ajaxAction(user_id,field_id){
                                                 var sUrl = "${h.url('delete_repo_user',repo_name=c.repo_name)}";
                                                 var callback = { success:function(o){
                                                 var tr = YAHOO.util.Dom.get(String(field_id));
                                                 tr.parentNode.removeChild(tr);},failure:function(o){
                                                 	alert("${_('Failed to remove user')}");},};
                                                 var postData = '_method=delete&user_id='+user_id;
                                                 var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, postData);};
                                         </script>
                                     </span>
                                   %endif
                                 </td>
                             </tr>
                             %endif
                         %endfor
                         <tr id="add_perm_input">
                             <td>${h.radio('perm_new_user','repository.none')}</td>
                             <td>${h.radio('perm_new_user','repository.read')}</td>
                             <td>${h.radio('perm_new_user','repository.write')}</td>
                             <td>${h.radio('perm_new_user','repository.admin')}</td>
                             <td class='ac'>
                                 <div class="perm_ac" id="perm_ac">
                                     ${h.text('perm_new_user_name',class_='yui-ac-input')}
                                     <div id="perm_container"></div>
                                 </div>
                             </td>
                             <td></td>
                         </tr>
                         <tr>
                             <td colspan="6">
                                 <span id="add_perm" class="add_icon" style="cursor: pointer;">
                                 ${_('Add another user')}
                                 </span>
                             </td>
                         </tr>
                     </table>
              </div>
             <div class="buttons">
               ${h.submit('update','update',class_="ui-button ui-widget ui-state-default ui-corner-all")}
             </div>
         </div>
     </div>
     ${h.end_form()}
         <script type="text/javascript">
             YAHOO.util.Event.onDOMReady(function(){
                 var D = YAHOO.util.Dom;
                 if(!D.hasClass('perm_new_user_name','error')){
                     D.setStyle('add_perm_input','display','none');
+                }
                 YAHOO.util.Event.addListener('add_perm','click',function(){
                     D.setStyle('add_perm_input','display','');
                     D.setStyle('add_perm','opacity','0.6');
                     D.setStyle('add_perm','cursor','default');
                 });
             });
         </script>
         <script type="text/javascript">
         YAHOO.example.FnMultipleFields = function(){
             var myContacts = ${c.users_array|n}
             // Define a custom search function for the DataSource
             var matchNames = function(sQuery) {
                 // Case insensitive matching
                 var query = sQuery.toLowerCase(),
                     contact,
                     i=0,
                     l=myContacts.length,
                     matches = [];
                 // Match against each name of each contact
                 for(; i<l; i++) {
                     contact = myContacts[i];
                     if((contact.fname.toLowerCase().indexOf(query) > -1) ||
                         (contact.lname.toLowerCase().indexOf(query) > -1) ||
                         (contact.nname && (contact.nname.toLowerCase().indexOf(query) > -1))) {
                         matches[matches.length] = contact;
+                    }
+                }
                 return matches;
             };
             // Use a FunctionDataSource
             var oDS = new YAHOO.util.FunctionDataSource(matchNames);
             oDS.responseSchema = {
                 fields: ["id", "fname", "lname", "nname"]
+            }
             // Instantiate AutoComplete for perms
             var oAC_perms = new YAHOO.widget.AutoComplete("perm_new_user_name", "perm_container", oDS);
             oAC_perms.useShadow = false;
             oAC_perms.resultTypeList = false;
             // Instantiate AutoComplete for owner
             var oAC_owner = new YAHOO.widget.AutoComplete("user", "owner_container", oDS);
             oAC_owner.useShadow = false;
             oAC_owner.resultTypeList = false;
             // Custom formatter to highlight the matching letters
             var custom_formatter = function(oResultData, sQuery, sResultMatch) {
                 var query = sQuery.toLowerCase(),
                     fname = oResultData.fname,
                     lname = oResultData.lname,
                     nname = oResultData.nname || "", // Guard against null value
                     query = sQuery.toLowerCase(),
                     fnameMatchIndex = fname.toLowerCase().indexOf(query),
                     lnameMatchIndex = lname.toLowerCase().indexOf(query),
                     nnameMatchIndex = nname.toLowerCase().indexOf(query),
                     displayfname, displaylname, displaynname;
                 if(fnameMatchIndex > -1) {
                     displayfname = highlightMatch(fname, query, fnameMatchIndex);
+                }
                 else {
                     displayfname = fname;
+                }
                 if(lnameMatchIndex > -1) {
                     displaylname = highlightMatch(lname, query, lnameMatchIndex);
+                }
                 else {
                     displaylname = lname;
+                }
                 if(nnameMatchIndex > -1) {
                     displaynname = "(" + highlightMatch(nname, query, nnameMatchIndex) + ")";
+                }
                 else {
                     displaynname = nname ? "(" + nname + ")" : "";
+                }
                 return displayfname + " " + displaylname + " " + displaynname;
             };
             oAC_perms.formatResult = custom_formatter;
             oAC_owner.formatResult = custom_formatter;
             // Helper function for the formatter
             var highlightMatch = function(full, snippet, matchindex) {
                 return full.substring(0, matchindex) +
                         "<span class='match'>" +
                         full.substr(matchindex, snippet.length) +
                         "</span>" +
                         full.substring(matchindex + snippet.length);
             };
             var myHandler = function(sType, aArgs) {
                 var myAC = aArgs[0]; // reference back to the AC instance
                 var elLI = aArgs[1]; // reference to the selected LI element
                 var oData = aArgs[2]; // object literal of selected item's result data
                 myAC.getInputEl().value = oData.nname;
             };
             oAC_perms.itemSelectEvent.subscribe(myHandler);
             //oAC_owner.itemSelectEvent.subscribe(myHandler);
             return {
                 oDS: oDS,
                 oAC_perms: oAC_perms,
                 oAC_owner: oAC_owner,
             };
         }();
         </script>
 </div>
 </%def>

pylons_app/templates/summary/summary.html

➞

Show inline comments

 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Mercurial Repository Overview')}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
     ${_('summary')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('summary')}
 </%def>
 <%def name="main()">
 <script type="text/javascript">
 var E = YAHOO.util.Event;
 var D = YAHOO.util.Dom;
 E.onDOMReady(function(e){
     id = 'clone_url';
     E.addListener(id,'click',function(e){
         D.get('clone_url').select();
     })
 })
 </script>
 <div class="box box-left">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
 	<div class="form">
 	  <div class="fields">
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Name')}:</label>
 			  </div>
 			  <div class="input-short">
 			      <span style="font-size: 1.6em;font-weight: bold">${c.repo_info.name}</span>
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Description')}:</label>
 			  </div>
 			  <div class="input-short">
 			      ${c.repo_info.description}
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Contact')}:</label>
 			  </div>
 			  <div class="input-short">
 			  	<div class="gravatar">
 			  		<img alt="gravatar" src="${h.gravatar_url(c.repo_info.dbrepo.user.email)}"/>
 			  	</div>
 			  		${_('Username')}: ${c.repo_info.dbrepo.user.username}<br/>
 			  		${_('Name')}: ${c.repo_info.dbrepo.user.name} ${c.repo_info.dbrepo.user.lastname}<br/>
 			  		${_('Email')}: <a href="mailto:${c.repo_info.dbrepo.user.email}">${c.repo_info.dbrepo.user.email}</a>
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Last change')}:</label>
 			  </div>
 			  <div class="input-short">
-			      ${h.age(c.repo_info.last_change)} - ${h.rfc822date(c.repo_info.last_change)}
+			      ${h.age(c.repo_info.last_change)} - ${h.rfc822date_notz(c.repo_info.last_change)}
 			      ${_('by')} ${h.get_changeset_safe(c.repo_info,'tip').author}
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Clone url')}:</label>
 			  </div>
 			  <div class="input-short">
 			      <input type="text" id="clone_url" readonly="readonly" value="hg clone ${c.clone_repo_url}" size="70"/>
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Trending languages')}:</label>
 			  </div>
 			  <div class="input-short">
 			    <div id="lang_stats">
 			    </div>
 			  	<script type="text/javascript">
 			  		var data = ${c.trending_languages|n};
 			  		var total = 0;
 			  		var no_data = true;
 			  		for (k in data){
 			  		    total += data[k];
 			  		    no_data = false;
+			  		}
 					var tbl = document.createElement('table');
 					tbl.setAttribute('class','trending_language_tbl');
 			  		for (k in data){
 				  		var tr = document.createElement('tr');
 				  		var percentage = Math.round((data[k]/total*100),2);
 						var value = data[k];
 				  		var td1 = document.createElement('td');
 				  		td1.width=150;
 				  		var trending_language_label = document.createElement('div');
 				  		trending_language_label.innerHTML = k;
 				  		td1.appendChild(trending_language_label);
 				  		var td2 = document.createElement('td');
 			  		    var trending_language = document.createElement('div');
 			  		    trending_language.title = k;
-			  		    trending_language.innerHTML = "<b>"+value+" ${_('files')} - "+percentage+" %</b>";
+			  		    trending_language.innerHTML = "<b>"+percentage+"% "+value+" ${_('files')}</b>";
 			  		    trending_language.setAttribute("class", 'trending_language');
 			  		    trending_language.style.width=percentage+"%";
 						td2.appendChild(trending_language);
 						tr.appendChild(td1);
 						tr.appendChild(td2);
 			  		    tbl.appendChild(tr);
  				  		//YAHOO.util.Dom.get('lang_stats').appendChild(trending_language_label);
+			  		}
 			  		if(no_data){
 			  			var tr = document.createElement('tr');
 			  			var td1 = document.createElement('td');
 			  			td1.innerHTML = "${_('No data loaded yet')}";
 			  			tr.appendChild(td1);
 			  			tbl.appendChild(tr);
+					}
 			  		YAHOO.util.Dom.get('lang_stats').appendChild(tbl);
 			  	</script>
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Download')}:</label>
 			  </div>
 			  <div class="input-short">
 		        %for cnt,archive in enumerate(c.repo_info._get_archives()):
 		             %if cnt >=1:
+		             |
 		             %endif
 		             ${h.link_to(c.repo_info.name+'.'+archive['type'],
 		                h.url('files_archive_home',repo_name=c.repo_info.name,
 		                revision='tip',fileformat=archive['extension']),class_="archive_icon")}
 		        %endfor
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Feeds')}:</label>
 			  </div>
 			  <div class="input-short">
 	            ${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.repo_info.name),class_='rss_icon')}
 	            ${h.link_to(_('Atom'),h.url('atom_feed_home',repo_name=c.repo_info.name),class_='atom_icon')}
 			  </div>
 			 </div>
 	  </div>
 	</div>
 </div>
 <div class="box box-right"  style="min-height:455px">
     <!-- box / title -->
     <div class="title">
         <h5>${_('Commit activity by day / author')}</h5>
     </div>
     <div class="table">
         <div id="commit_history" style="width:560px;height:300px;float:left"></div>
         <div style="clear: both;height: 10px"></div>
         <div id="overview" style="width:560px;height:100px;float:left"></div>
     	<div id="legend_data" style="clear:both;margin-top:10px;">
 	    	<div id="legend_container"></div>
 	    	<div id="legend_choices">
 				<table id="legend_choices_tables" style="font-size:smaller;color:#545454"></table>
 	    	</div>
     	</div>
 		<script type="text/javascript">
 		/**
 		 * Plots summary graph
+		 *
 		 * @class SummaryPlot
 		 * @param {from} initial from for detailed graph
 		 * @param {to} initial to for detailed graph
 		 * @param {dataset}
 		 * @param {overview_dataset}
 		 */
 		function SummaryPlot(from,to,dataset,overview_dataset) {
 			var initial_ranges = {
 			    "xaxis":{
 				    "from":from,
 				   	"to":to,
 				},
 			};
 		    var dataset = dataset;
 		    var overview_dataset = [overview_dataset];
 		    var choiceContainer = YAHOO.util.Dom.get("legend_choices");
 		    var choiceContainerTable = YAHOO.util.Dom.get("legend_choices_tables");
 		    var plotContainer = YAHOO.util.Dom.get('commit_history');
 		    var overviewContainer = YAHOO.util.Dom.get('overview');
 		    var plot_options = {
 				bars: {show:true,align:'center',lineWidth:4},
 				legend: {show:true, container:"legend_container"},
 				points: {show:true,radius:0,fill:false},
 				yaxis: {tickDecimals:0,},
 				xaxis: {
 					mode: "time",
 					timeformat: "%d/%m",
 				    min:from,
 				    max:to,
 				},
 				grid: {
 					hoverable: true,
 				    clickable: true,
 				    autoHighlight:true,
 				    color: "#999"
 				},
 				//selection: {mode: "x"}
 		    };
 		    var overview_options = {
 				legend:{show:false},
 			    bars: {show:true,barWidth: 2,},
 			    shadowSize: 0,
 			    xaxis: {mode: "time", timeformat: "%d/%m/%y",},
 			    yaxis: {ticks: 3, min: 0,},
 			    grid: {color: "#999",},
 			    selection: {mode: "x"}
 			};
 			/**
 			*get dummy data needed in few places
 			*/
 		    function getDummyData(label){
 		    	return {"label":label,
                	 "data":[{"time":0,
                		 "commits":0,
 	                     "added":0,
 	                     "changed":0,
 	                     "removed":0,
                     }],
                     "schema":["commits"],
                     "color":'#ffffff',
+           		}
+			}
 		    /**
 		     * generate checkboxes accordindly to data
 		     * @param keys
 		     * @returns
 		     */
 		    function generateCheckboxes(data) {
 			    //append checkboxes
 			    var i = 0;
 			    choiceContainerTable.innerHTML = '';
 			    for(var pos in data) {
 			    	data[pos].color = i;
 			        i++;
 			        if(data[pos].label != ''){
 				        choiceContainerTable.innerHTML += '<tr><td>'+
 				        '<input type="checkbox" name="' + data[pos].label +'" checked="checked" />'
 				        +data[pos].label+
 				        '</td></tr>';
+			        }
+			    }
+		    }
 		    /**
 		     * ToolTip show
 		     */
 		    function showTooltip(x, y, contents) {
 		        var div=document.getElementById('tooltip');
 		        if(!div) {
 		            div = document.createElement('div');
 		            div.id="tooltip";
 		            div.style.position="absolute";
 		            div.style.border='1px solid #fdd';
 		            div.style.padding='2px';
 		            div.style.backgroundColor='#fee';
 		            document.body.appendChild(div);
+		        }
 		        YAHOO.util.Dom.setStyle(div, 'opacity', 0);
 		        div.innerHTML = contents;
 		        div.style.top=(y + 5) + "px";
 		        div.style.left=(x + 5) + "px";
 		        var anim = new YAHOO.util.Anim(div, {opacity: {to: 0.8}}, 0.2);
 		        anim.animate();
+		    }
 			/**
 			 * This function will detect if selected period has some changesets for this user
 			if it does this data is then pushed for displaying
 			Additionally it will only display users that are selected by the checkbox
 			*/
 		    function getDataAccordingToRanges(ranges) {
 		        var data = [];
 		        var keys = [];
 				for(var key in dataset){
 					var push = false;
 					//method1 slow !!
 		            ///*
 		            for(var ds in dataset[key].data){
 			            commit_data = dataset[key].data[ds];
 			            //console.log(key);
 			            //console.log(new Date(commit_data.time*1000));
 			            //console.log(new Date(ranges.xaxis.from*1000));
 			            //console.log(new Date(ranges.xaxis.to*1000));
 			            if (commit_data.time >= ranges.xaxis.from && commit_data.time <= ranges.xaxis.to){
 			            	push = true;
 			            	break;
+					    }
+				    }
 				    //*/
 				    /*//method2 sorted commit data !!!
 				    var first_commit = dataset[key].data[0].time;
 				    var last_commit = dataset[key].data[dataset[key].data.length-1].time;
 				    console.log(first_commit);
 				    console.log(last_commit);
 				    if (first_commit >= ranges.xaxis.from && last_commit <= ranges.xaxis.to){
 						push = true;
+					}
 				    */
 				    if(push){
 				    	data.push(dataset[key]);
+				    }
+				}
 				if(data.length >= 1){
 					return data;
+				}
 				else{
 					//just return dummy data for graph to plot itself
 					return [getDummyData('')];
+				}
+		    }
 			/**
 			* redraw using new checkbox data
 			*/
 		    function plotchoiced(e,args){
 			    var cur_data = args[0];
 			    var cur_ranges = args[1];
 				var new_data = [];
 		    	var inputs = choiceContainer.getElementsByTagName("input");
 		    	//show only checked labels
 		        for(var i=0; i<inputs.length; i++) {
 		            var checkbox_key = inputs[i].name;
 	                if(inputs[i].checked){
 						for(var d in cur_data){
 							if(cur_data[d].label == checkbox_key){
 								new_data.push(cur_data[d]);
+							}
+						}
+	    	        }
 	                else{
 		                //push dummy data to not hide the label
 						new_data.push(getDummyData(checkbox_key));
+			        }
+		        }
 		    	var new_options = YAHOO.lang.merge(plot_options, {
 		            xaxis: {
 		  	      		min: cur_ranges.xaxis.from,
 		  	      		max: cur_ranges.xaxis.to,
 		  	      		mode:"time",
 		  	      		timeformat: "%d/%m",
+		        	}
 		    	});
 		    	if (!new_data){
 					new_data = [[0,1]];
+				}
 		    	// do the zooming
 		       plot = YAHOO.widget.Flot(plotContainer, new_data, new_options);
 		       plot.subscribe("plotselected", plotselected);
 		       //resubscribe plothover
 		       plot.subscribe("plothover", plothover);
 		       // don't fire event on the overview to prevent eternal loop
 		       overview.setSelection(cur_ranges, true);
+		    }
 			/**
 		     * plot only selected items from overview
 		     * @param ranges
 		     * @returns
 		     */
 		    function plotselected(ranges,cur_data) {
 			    //updates the data for new plot
 	    		data = getDataAccordingToRanges(ranges);
 	    		generateCheckboxes(data);
 		    	var new_options = YAHOO.lang.merge(plot_options, {
 		            xaxis: {
 		  	      		min: ranges.xaxis.from,
 		  	      		max: ranges.xaxis.to,
 		  	      		mode:"time",
 		  	      		timeformat: "%d/%m",
+		        	}
 		    	});
 		    	// do the zooming
 		        plot = YAHOO.widget.Flot(plotContainer, data, new_options);
 		        plot.subscribe("plotselected", plotselected);
 		        //resubscribe plothover
 		        plot.subscribe("plothover", plothover);
 		        // don't fire event on the overview to prevent eternal loop
 		        overview.setSelection(ranges, true);
 		        //resubscribe choiced
 		        YAHOO.util.Event.on(choiceContainer.getElementsByTagName("input"), "click", plotchoiced, [data, ranges]);
+		    }
 		    var previousPoint = null;
 			function plothover(o) {
 		        var pos = o.pos;
 		        var item = o.item;
 		        //YAHOO.util.Dom.get("x").innerHTML = pos.x.toFixed(2);
 		        //YAHOO.util.Dom.get("y").innerHTML = pos.y.toFixed(2);
 		        if (item) {
 		            if (previousPoint != item.datapoint) {
 		                previousPoint = item.datapoint;
 		                var tooltip = YAHOO.util.Dom.get("tooltip");
 		                if(tooltip) {
 		                	  tooltip.parentNode.removeChild(tooltip);
+		                }
 		                var x = item.datapoint.x.toFixed(2);
 		                var y = item.datapoint.y.toFixed(2);
 		                if (!item.series.label){
 		                    item.series.label = 'commits';
+		                }
 		                var d = new Date(x*1000);
 		                var fd = d.toDateString()
 		                var nr_commits = parseInt(y);
 		                var cur_data = dataset[item.series.label].data[item.dataIndex];
 		                var added = cur_data.added;
 		                var changed = cur_data.changed;
 		                var removed = cur_data.removed;
 		                var nr_commits_suffix = " ${_('commits')} ";
 		                var added_suffix = " ${_('files added')} ";
 		                var changed_suffix = " ${_('files changed')} ";
 		                var removed_suffix = " ${_('files removed')} ";
 		                if(nr_commits == 1){nr_commits_suffix = " ${_('commit')} ";}
 						if(added==1){added_suffix=" ${_('file added')} ";}
 						if(changed==1){changed_suffix=" ${_('file changed')} ";}
 						if(removed==1){removed_suffix=" ${_('file removed')} ";}
 		                showTooltip(item.pageX, item.pageY, item.series.label + " on " + fd
 								 +'<br/>'+
 		                         nr_commits + nr_commits_suffix+'<br/>'+
 		                         added + added_suffix +'<br/>'+
 		                         changed + changed_suffix + '<br/>'+
 		                         removed + removed_suffix + '<br/>');
+		            }
+		        }
 		        else {
 		        	  var tooltip = YAHOO.util.Dom.get("tooltip");
 			          if(tooltip) {
 			                tooltip.parentNode.removeChild(tooltip);
+			          }
 		            previousPoint = null;
+		        }
+		    }
 		    /**
 		     * MAIN EXECUTION
 		     */
 			var data = getDataAccordingToRanges(initial_ranges);
 			generateCheckboxes(data);
 		    //main plot
 		    var plot = YAHOO.widget.Flot(plotContainer,data,plot_options);
 			//overview
 			var overview = YAHOO.widget.Flot(overviewContainer, overview_dataset, overview_options);
 			//show initial selection on overview
 			overview.setSelection(initial_ranges);

0 comments (0 inline, 0 general)