Mercurial > public > src > rhodecode
changeset 490:a977818fbc6d demo
Merge with default branch ac21f018f6befd7a09e11596074a0fb77ccbfc79
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Fri, 03 Sep 2010 09:24:16 +0200 |
parents | c3e28b44454b (current diff) ac21f018f6be (diff) |
children | 13aaa1d34a96 |
files | pylons_app/controllers/admin/settings.py pylons_app/public/css/style_full.css |
diffstat | 11 files changed, 197 insertions(+), 417 deletions(-) [+] |
line wrap: on
line diff
--- a/pylons_app/controllers/admin/settings.py Thu Sep 02 20:08:00 2010 +0200 +++ b/pylons_app/controllers/admin/settings.py Fri Sep 03 09:24:16 2010 +0200 @@ -225,6 +225,11 @@ """ # url('admin_settings_my_account') c.user = self.sa.query(User).get(c.hg_app_user.user_id) + c.user_repos = [] + for repo in c.cached_repo_list.values(): + if repo.dbrepo.user.username == c.user.username: + c.user_repos.append(repo) + if c.user.username == 'default': h.flash(_("You can't edit this user since it's" " crucial for entire application"), category='warning')
--- a/pylons_app/controllers/hg.py Thu Sep 02 20:08:00 2010 +0200 +++ b/pylons_app/controllers/hg.py Fri Sep 03 09:24:16 2010 +0200 @@ -37,19 +37,20 @@ super(HgController, self).__before__() def index(self): - c.current_sort = request.GET.get('sort', 'name') - sort_by = c.current_sort sortables = ['name', 'description', 'last_change', 'tip', 'contact'] + current_sort = request.GET.get('sort', 'name') + current_sort_slug = current_sort.replace('-', '') - c.cs_slug = sort_by.replace('-', '') - - if c.cs_slug not in sortables: - sort_by = 'name' - + if current_sort_slug not in sortables: + c.sort_by = 'name' + current_sort_slug = c.sort_by + else: + c.sort_by = current_sort + c.sort_slug = current_sort_slug cached_repo_list = HgModel().get_repos() - sort_key = c.cs_slug + '_sort' - if sort_by.startswith('-'): + sort_key = current_sort_slug + '_sort' + if c.sort_by.startswith('-'): c.repos_list = sorted(cached_repo_list, key=itemgetter(sort_key), reverse=True) else: c.repos_list = sorted(cached_repo_list, key=itemgetter(sort_key), reverse=False)
--- a/pylons_app/lib/helpers.py Thu Sep 02 20:08:00 2010 +0200 +++ b/pylons_app/lib/helpers.py Fri Sep 03 09:24:16 2010 +0200 @@ -210,7 +210,7 @@ revision=rev, f_path='/'.join(paths_l[:cnt])))) - return literal(' / '.join(url_l)) + return literal('/'.join(url_l)) files_breadcrumbs = _FilesBreadCrumbs()
--- a/pylons_app/lib/middleware/simplehg.py Thu Sep 02 20:08:00 2010 +0200 +++ b/pylons_app/lib/middleware/simplehg.py Fri Sep 03 09:24:16 2010 +0200 @@ -72,6 +72,8 @@ try: repo_name = '/'.join(environ['PATH_INFO'].split('/')[1:]) + if repo_name.endswith('/'): + repo_name = repo_name.rstrip('/') except: log.error(traceback.format_exc()) return HTTPInternalServerError()(environ, start_response)
--- a/pylons_app/public/css/style.css Thu Sep 02 20:08:00 2010 +0200 +++ b/pylons_app/public/css/style.css Fri Sep 03 09:24:16 2010 +0200 @@ -26,6 +26,10 @@ border: none; } +img.icon{ + vertical-align: bottom; + +} /* ----------------------------------------------------------- anchors ----------------------------------------------------------- */ @@ -1231,11 +1235,14 @@ #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; + left: 0; + margin: 0; + padding: 0 0 8px 0; + width: auto; + position: relative; + clear: both; + overflow: hidden; + } /* ----------------------------------------------------------- @@ -1318,12 +1325,15 @@ #content div.box-left div.form div.fields div.field div.input, #content div.box-right div.form div.fields div.field div.input { - margin: 0; + margin: 0; padding: 7px 7px 6px 7px; + clear: both; + overflow: hidden; border-top: 1px solid #b3b3b3; border-left: 1px solid #b3b3b3; border-right: 1px solid #eaeaea; border-bottom: 1px solid #eaeaea; + } #content div.box div.form div.fields div.field div.input input @@ -2869,6 +2879,32 @@ #clone_url{ border: none; } +/* ----------------------------------------------------------- + FILES +----------------------------------------------------------- */ + +h3.files_location{ + font-size: 1.8em; + font-weight: bold; + margin: 10px 0 !important; + border-bottom: none !important; +} + +#files_data.dl{ + + +} +#files_data dl dt{ + float:left; + margin:0 !important; + padding:5px; + width:115px; +} +#files_data dl dd{ + margin:0 !important; + padding: 5px !important; +} + /* ----------------------------------------------------------- CHANGESETS @@ -3157,7 +3193,7 @@ text-align:center; } /* ----------------------------------------------------------- - TOOLTIP + YUI TOOLTIP ----------------------------------------------------------- */ .yui-overlay,.yui-panel-container { visibility: hidden; @@ -3183,7 +3219,7 @@ } /* ----------------------------------------------------------- - AUTOCOMPLETE + YUI AUTOCOMPLETE ----------------------------------------------------------- */ .ac{ @@ -3315,9 +3351,6 @@ padding-top: 1px; } - - - .action_button { border: 0px; display: block; @@ -3485,300 +3518,50 @@ } /* ----------------------------------------------------------- - jquery ui + STYLING OF LAYOUT ----------------------------------------------------------- */ -.ui-helper-hidden { display: none; } -.ui-helper-hidden-accessible { position: absolute; left: -99999999px; } -.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } /* ----------------------------------------------------------- - jquery ui -> icons + GLOBAL WIDTH ----------------------------------------------------------- */ - -.ui-icon { width: 16px; height: 16px; background-image: url(../images/ui/ui-icons_222222_256x240.png); } -.ui-widget-content .ui-icon {background-image: url(../images/ui/ui-icons_222222_256x240.png); } -.ui-widget-header .ui-icon {background-image: url(../images/ui/ui-icons_222222_256x240.png); } -.ui-state-default .ui-icon { background-image: url(../images/ui/ui-icons_ef8c08_256x240.png); } -.ui-state-hover .ui-icon, .ui-state-focus .ui-icon { background-image: url(../images/ui/ui-icons_ef8c08_256x240.png); } -.ui-state-active .ui-icon {background-image: url(../images/ui/ui-icons_ef8c08_256x240.png); } -.ui-state-highlight .ui-icon {background-image: url(../images/ui/ui-icons_228ef1_256x240.png); } -.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(../images/ui/ui-icons_ffd27a_256x240.png); } +#header,#content,#footer{ + min-width: 1224px; +} /* ----------------------------------------------------------- - jquery ui -> icon positioning ------------------------------------------------------------ */ -.ui-icon-carat-1-n { background-position: 0 0; } -.ui-icon-carat-1-ne { background-position: -16px 0; } -.ui-icon-carat-1-e { background-position: -32px 0; } -.ui-icon-carat-1-se { background-position: -48px 0; } -.ui-icon-carat-1-s { background-position: -64px 0; } -.ui-icon-carat-1-sw { background-position: -80px 0; } -.ui-icon-carat-1-w { background-position: -96px 0; } -.ui-icon-carat-1-nw { background-position: -112px 0; } -.ui-icon-carat-2-n-s { background-position: -128px 0; } -.ui-icon-carat-2-e-w { background-position: -144px 0; } -.ui-icon-triangle-1-n { background-position: 0 -16px; } -.ui-icon-triangle-1-ne { background-position: -16px -16px; } -.ui-icon-triangle-1-e { background-position: -32px -16px; } -.ui-icon-triangle-1-se { background-position: -48px -16px; } -.ui-icon-triangle-1-s { background-position: -64px -16px; } -.ui-icon-triangle-1-sw { background-position: -80px -16px; } -.ui-icon-triangle-1-w { background-position: -96px -16px; } -.ui-icon-triangle-1-nw { background-position: -112px -16px; } -.ui-icon-triangle-2-n-s { background-position: -128px -16px; } -.ui-icon-triangle-2-e-w { background-position: -144px -16px; } -.ui-icon-arrow-1-n { background-position: 0 -32px; } -.ui-icon-arrow-1-ne { background-position: -16px -32px; } -.ui-icon-arrow-1-e { background-position: -32px -32px; } -.ui-icon-arrow-1-se { background-position: -48px -32px; } -.ui-icon-arrow-1-s { background-position: -64px -32px; } -.ui-icon-arrow-1-sw { background-position: -80px -32px; } -.ui-icon-arrow-1-w { background-position: -96px -32px; } -.ui-icon-arrow-1-nw { background-position: -112px -32px; } -.ui-icon-arrow-2-n-s { background-position: -128px -32px; } -.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } -.ui-icon-arrow-2-e-w { background-position: -160px -32px; } -.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } -.ui-icon-arrowstop-1-n { background-position: -192px -32px; } -.ui-icon-arrowstop-1-e { background-position: -208px -32px; } -.ui-icon-arrowstop-1-s { background-position: -224px -32px; } -.ui-icon-arrowstop-1-w { background-position: -240px -32px; } -.ui-icon-arrowthick-1-n { background-position: 0 -48px; } -.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } -.ui-icon-arrowthick-1-e { background-position: -32px -48px; } -.ui-icon-arrowthick-1-se { background-position: -48px -48px; } -.ui-icon-arrowthick-1-s { background-position: -64px -48px; } -.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } -.ui-icon-arrowthick-1-w { background-position: -96px -48px; } -.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } -.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } -.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } -.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } -.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } -.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } -.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } -.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } -.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } -.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } -.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } -.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } -.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } -.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } -.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } -.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } -.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } -.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } -.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } -.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } -.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } -.ui-icon-arrow-4 { background-position: 0 -80px; } -.ui-icon-arrow-4-diag { background-position: -16px -80px; } -.ui-icon-extlink { background-position: -32px -80px; } -.ui-icon-newwin { background-position: -48px -80px; } -.ui-icon-refresh { background-position: -64px -80px; } -.ui-icon-shuffle { background-position: -80px -80px; } -.ui-icon-transfer-e-w { background-position: -96px -80px; } -.ui-icon-transferthick-e-w { background-position: -112px -80px; } -.ui-icon-folder-collapsed { background-position: 0 -96px; } -.ui-icon-folder-open { background-position: -16px -96px; } -.ui-icon-document { background-position: -32px -96px; } -.ui-icon-document-b { background-position: -48px -96px; } -.ui-icon-note { background-position: -64px -96px; } -.ui-icon-mail-closed { background-position: -80px -96px; } -.ui-icon-mail-open { background-position: -96px -96px; } -.ui-icon-suitcase { background-position: -112px -96px; } -.ui-icon-comment { background-position: -128px -96px; } -.ui-icon-person { background-position: -144px -96px; } -.ui-icon-print { background-position: -160px -96px; } -.ui-icon-trash { background-position: -176px -96px; } -.ui-icon-locked { background-position: -192px -96px; } -.ui-icon-unlocked { background-position: -208px -96px; } -.ui-icon-bookmark { background-position: -224px -96px; } -.ui-icon-tag { background-position: -240px -96px; } -.ui-icon-home { background-position: 0 -112px; } -.ui-icon-flag { background-position: -16px -112px; } -.ui-icon-calendar { background-position: -32px -112px; } -.ui-icon-cart { background-position: -48px -112px; } -.ui-icon-pencil { background-position: -64px -112px; } -.ui-icon-clock { background-position: -80px -112px; } -.ui-icon-disk { background-position: -96px -112px; } -.ui-icon-calculator { background-position: -112px -112px; } -.ui-icon-zoomin { background-position: -128px -112px; } -.ui-icon-zoomout { background-position: -144px -112px; } -.ui-icon-search { background-position: -160px -112px; } -.ui-icon-wrench { background-position: -176px -112px; } -.ui-icon-gear { background-position: -192px -112px; } -.ui-icon-heart { background-position: -208px -112px; } -.ui-icon-star { background-position: -224px -112px; } -.ui-icon-link { background-position: -240px -112px; } -.ui-icon-cancel { background-position: 0 -128px; } -.ui-icon-plus { background-position: -16px -128px; } -.ui-icon-plusthick { background-position: -32px -128px; } -.ui-icon-minus { background-position: -48px -128px; } -.ui-icon-minusthick { background-position: -64px -128px; } -.ui-icon-close { background-position: -80px -128px; } -.ui-icon-closethick { background-position: -96px -128px; } -.ui-icon-key { background-position: -112px -128px; } -.ui-icon-lightbulb { background-position: -128px -128px; } -.ui-icon-scissors { background-position: -144px -128px; } -.ui-icon-clipboard { background-position: -160px -128px; } -.ui-icon-copy { background-position: -176px -128px; } -.ui-icon-contact { background-position: -192px -128px; } -.ui-icon-image { background-position: -208px -128px; } -.ui-icon-video { background-position: -224px -128px; } -.ui-icon-script { background-position: -240px -128px; } -.ui-icon-alert { background-position: 0 -144px; } -.ui-icon-info { background-position: -16px -144px; } -.ui-icon-notice { background-position: -32px -144px; } -.ui-icon-help { background-position: -48px -144px; } -.ui-icon-check { background-position: -64px -144px; } -.ui-icon-bullet { background-position: -80px -144px; } -.ui-icon-radio-off { background-position: -96px -144px; } -.ui-icon-radio-on { background-position: -112px -144px; } -.ui-icon-pin-w { background-position: -128px -144px; } -.ui-icon-pin-s { background-position: -144px -144px; } -.ui-icon-play { background-position: 0 -160px; } -.ui-icon-pause { background-position: -16px -160px; } -.ui-icon-seek-next { background-position: -32px -160px; } -.ui-icon-seek-prev { background-position: -48px -160px; } -.ui-icon-seek-end { background-position: -64px -160px; } -.ui-icon-seek-start { background-position: -80px -160px; } -/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ -.ui-icon-seek-first { background-position: -80px -160px; } -.ui-icon-stop { background-position: -96px -160px; } -.ui-icon-eject { background-position: -112px -160px; } -.ui-icon-volume-off { background-position: -128px -160px; } -.ui-icon-volume-on { background-position: -144px -160px; } -.ui-icon-power { background-position: 0 -176px; } -.ui-icon-signal-diag { background-position: -16px -176px; } -.ui-icon-signal { background-position: -32px -176px; } -.ui-icon-battery-0 { background-position: -48px -176px; } -.ui-icon-battery-1 { background-position: -64px -176px; } -.ui-icon-battery-2 { background-position: -80px -176px; } -.ui-icon-battery-3 { background-position: -96px -176px; } -.ui-icon-circle-plus { background-position: 0 -192px; } -.ui-icon-circle-minus { background-position: -16px -192px; } -.ui-icon-circle-close { background-position: -32px -192px; } -.ui-icon-circle-triangle-e { background-position: -48px -192px; } -.ui-icon-circle-triangle-s { background-position: -64px -192px; } -.ui-icon-circle-triangle-w { background-position: -80px -192px; } -.ui-icon-circle-triangle-n { background-position: -96px -192px; } -.ui-icon-circle-arrow-e { background-position: -112px -192px; } -.ui-icon-circle-arrow-s { background-position: -128px -192px; } -.ui-icon-circle-arrow-w { background-position: -144px -192px; } -.ui-icon-circle-arrow-n { background-position: -160px -192px; } -.ui-icon-circle-zoomin { background-position: -176px -192px; } -.ui-icon-circle-zoomout { background-position: -192px -192px; } -.ui-icon-circle-check { background-position: -208px -192px; } -.ui-icon-circlesmall-plus { background-position: 0 -208px; } -.ui-icon-circlesmall-minus { background-position: -16px -208px; } -.ui-icon-circlesmall-close { background-position: -32px -208px; } -.ui-icon-squaresmall-plus { background-position: -48px -208px; } -.ui-icon-squaresmall-minus { background-position: -64px -208px; } -.ui-icon-squaresmall-close { background-position: -80px -208px; } -.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } -.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } -.ui-icon-grip-solid-vertical { background-position: -32px -224px; } -.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } -.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } -.ui-icon-grip-diagonal-se { background-position: -80px -224px; } + content +----------------------------------------------------------- */ + +#content +{ + margin: 10px 30px 0 30px; + padding: 0; + min-height: 100%; + clear: both; + overflow: hidden; + background: transparent; +} /* ----------------------------------------------------------- - jquery ui -> tabs ------------------------------------------------------------ */ -.ui-tabs .ui-tabs-hide { display: none; } - -/* ----------------------------------------------------------- - jquery ui -> datepicker ------------------------------------------------------------ */ -.ui-datepicker { width: 17em; padding: .2em .2em 0; background: #FFFFFF; border: 1px solid #000000; border-top: none; } -.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; background: #F6F6F6; } -.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 1px; width: 1.8em; height: 1.8em; } -.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; } -.ui-datepicker .ui-datepicker-prev { left: 0; } -.ui-datepicker .ui-datepicker-next { right: 0; } -.ui-datepicker .ui-datepicker-prev-hover { left: 0; } -.ui-datepicker .ui-datepicker-next-hover { right: 0; } -.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; } -.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; } -.ui-datepicker .ui-datepicker-title select { margin:1px 0; } -.ui-datepicker select.ui-datepicker-month-year {width: 100%;} -.ui-datepicker select.ui-datepicker-month, -.ui-datepicker select.ui-datepicker-year { width: 49%;} -.ui-datepicker table {width: 100%; border-collapse: collapse; margin:0 0 .4em; } -.ui-datepicker th { padding: .7em .3em; text-align: center; border: 0; } -.ui-datepicker td { border: 0; padding: 1px; } -.ui-datepicker td span, .ui-datepicker td a { display: block; padding: 3px; text-align: center; text-decoration: none; } -.ui-datepicker td span, .ui-datepicker td a:hover { background: #376ea6; color: #ffffff; } -.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; } -.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; } -.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; } -.ui-datepicker td span, .ui-datepicker td.ui-datepicker-today a { background: #DDDDDD; color: #585858; } -.ui-datepicker td span, .ui-datepicker td.ui-datepicker-current-day a { background: #376ea6; color: #ffffff; } - -/* ----------------------------------------------------------- - jquery ui -> datepicker / multiple calenders ------------------------------------------------------------ */ -.ui-datepicker.ui-datepicker-multi { width:auto; } -.ui-datepicker-multi .ui-datepicker-group { float:left; } -.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; } -.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; } -.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; } -.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; } -.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; } -.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; } -.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } -.ui-datepicker-row-break { clear:both; width:100%; } - -/* ----------------------------------------------------------- - jquery ui -> datepicker / rtl support + content -> right -> forms -> labels ----------------------------------------------------------- */ -.ui-datepicker-rtl { direction: rtl; } -.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; } -.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; } -.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; } -.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; } -.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; } -.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; } -.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; } -.ui-datepicker-rtl .ui-datepicker-group { float:right; } -.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; } -.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; } - -/* ----------------------------------------------------------- - jquery ui -> select styling ------------------------------------------------------------ */ - -.ui-selectmenu -{ - display: block; - position: relative; - overflow: hidden; - background: #ffffff; - border-top: 1px solid #b3b3b3; - border-left: 1px solid #b3b3b3; - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; - text-align: left; - text-decoration: none; -} - -.ui-selectmenu-icon { position:absolute; right:6px; margin-top:-8px; top: 50%; } -.ui-selectmenu-menu { padding:0; margin:0; list-style:none; position:absolute; top: 0; visibility: hidden; overflow: auto; } -.ui-selectmenu-open { background: #ffffff; border: 1px solid #666666; border-top: none; visibility: visible; } -.ui-selectmenu-menu-popup { margin-top: -1px; } -.ui-selectmenu-menu-dropdown { } -.ui-selectmenu-menu li { padding:0; margin:0; display: block; border-top: 1px dotted transparent; border-bottom: 1px dotted transparent; border-right-width: 0 !important; border-left-width: 0 !important; } -.ui-selectmenu-menu li a,.ui-selectmenu-status {line-height: 1.4em; display:block; padding: 5px 0 5px 8px; outline:none; text-decoration:none; color: #000000; } -.ui-selectmenu-menu li.ui-selectmenu-hasIcon a, -.ui-selectmenu-hasIcon .ui-selectmenu-status { margin-left: 5px; padding-left: 20px; position: relative; } -.ui-selectmenu-menu li .ui-icon, .ui-selectmenu-status .ui-icon { position: absolute; top: 1em; margin-top: -8px; left: 0; } -.ui-selectmenu-status { line-height: 1.4em; } -.ui-selectmenu-open li.ui-selectmenu-item-focus { background: #376ea6; } -.ui-selectmenu-open li.ui-selectmenu-item-focus a { color: #ffffff; } -.ui-selectmenu-open li.ui-selectmenu-item-selected { background: #dfdfdf; } -.ui-selectmenu-open li.ui-selectmenu-item-selected a { color: #000000; } -.ui-selectmenu-menu li span,.ui-selectmenu-status span { display:block; margin-bottom: .2em; } -.ui-selectmenu-menu .ui-selectmenu-group .ui-selectmenu-group-label { line-height: 1.4em; display:block; padding:.6em .5em 0; } -.ui-selectmenu-menu .ui-selectmenu-group ul { margin: 0; padding: 0; } \ No newline at end of file + +#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
--- a/pylons_app/public/css/style_full.css Thu Sep 02 20:08:00 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -/* ----------------------------------------------------------- - 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
--- a/pylons_app/templates/admin/users/user_edit_my_account.html Thu Sep 02 20:08:00 2010 +0200 +++ b/pylons_app/templates/admin/users/user_edit_my_account.html Fri Sep 03 09:24:16 2010 +0200 @@ -14,66 +14,98 @@ </%def> <%def name="main()"> -<div class="box"> + +<div class="box box-left"> <!-- box / title --> <div class="title"> ${self.breadcrumbs()} </div> <!-- end box / title --> + <div class="ui-tabs-panel ui-widget-content ui-corner-bottom"> ${h.form(url('admin_settings_my_account_update'),method='put')} - <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')} - </div> - </div> - - <div class="field"> - <div class="label"> - <label for="new_password">${_('New password')}:</label> - </div> - <div class="input"> - ${h.password('new_password')} - </div> - </div> - - <div class="field"> - <div class="label"> - <label for="name">${_('Name')}:</label> - </div> - <div class="input"> - ${h.text('name')} - </div> - </div> - - <div class="field"> - <div class="label"> - <label for="lastname">${_('Lastname')}:</label> - </div> - <div class="input"> - ${h.text('lastname')} - </div> - </div> - - <div class="field"> - <div class="label"> - <label for="email">${_('Email')}:</label> - </div> - <div class="input"> - ${h.text('email')} - </div> - </div> - - <div class="buttons"> - ${h.submit('save','save',class_="ui-button ui-widget ui-state-default ui-corner-all")} - </div> - </div> + <div class="form"> + <div class="fields"> + <div class="field"> + <div class="label"> + <label for="username">${_('Username')}:</label> + </div> + <div class="input"> + ${h.text('username')} + </div> + </div> + + <div class="field"> + <div class="label"> + <label for="new_password">${_('New password')}:</label> + </div> + <div class="input"> + ${h.password('new_password')} + </div> + </div> + + <div class="field"> + <div class="label"> + <label for="name">${_('Name')}:</label> + </div> + <div class="input"> + ${h.text('name')} + </div> + </div> + + <div class="field"> + <div class="label"> + <label for="lastname">${_('Lastname')}:</label> + </div> + <div class="input"> + ${h.text('lastname')} + </div> + </div> + + <div class="field"> + <div class="label"> + <label for="email">${_('Email')}:</label> + </div> + <div class="input"> + ${h.text('email')} + </div> + </div> + + <div class="buttons"> + ${h.submit('save','save',class_="ui-button ui-widget ui-state-default ui-corner-all")} + </div> + </div> + </div> + ${h.end_form()} </div> - ${h.end_form()} </div> + +<div class="box box-right"> + <!-- box / title --> + <div class="title"> + <h5>${_('My repositories')}</h5> + </div> + <!-- end box / title --> + <div class="table"> + <table> + <tbody> + %for repo in c.user_repos: + <tr> + <td> + %if 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>${_('revision')}: ${repo.revisions[-1]}</td> + <td>${_('last changed')}: ${h.age(repo.last_change)}</td> + <td><img class="icon" alt="${_('private')}" src="/images/icons/application_form_edit.png"/> ${h.link_to(_('edit'),h.url('edit_repo',repo_name=repo.name))}</td> + </tr> + %endfor + </tbody> + </table> + </div> + +</div> </%def> \ No newline at end of file
--- a/pylons_app/templates/base/base.html Thu Sep 02 20:08:00 2010 +0200 +++ b/pylons_app/templates/base/base.html Fri Sep 03 09:24:16 2010 +0200 @@ -233,7 +233,6 @@ <%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 rel="stylesheet" type="text/css" href="/css/style_full.css" /> <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" />
--- a/pylons_app/templates/files/files.html Thu Sep 02 20:08:00 2010 +0200 +++ b/pylons_app/templates/files/files.html Fri Sep 03 09:24:16 2010 +0200 @@ -28,7 +28,7 @@ <div class="table"> <div id="files_data"> %if c.files_list: - <h2>${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cur_rev,c.files_list.path)}</h2> + <h3 class="files_location">${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cur_rev,c.files_list.path)}</h3> %if c.files_list.is_dir(): <%include file='files_browser.html'/> %else:
--- a/pylons_app/templates/index.html Thu Sep 02 20:08:00 2010 +0200 +++ b/pylons_app/templates/index.html Fri Sep 03 09:24:16 2010 +0200 @@ -12,17 +12,18 @@ <%def name="main()"> <%def name="get_sort(name)"> <%name_slug = name.lower().replace(' ','_') %> - %if name_slug == c.cs_slug: - <span style="font-weight: bold;text-decoration: underline;">${name}</span> + + %if name_slug == c.sort_slug: + %if c.sort_by.startswith('-'): + <a href="?sort=${name_slug}">${name}↑</a> + %else: + <a href="?sort=-${name_slug}">${name}↓</a> + %endif: %else: - <span style="font-weight: bold">${name}</span> + <a href="?sort=${name_slug}">${name}</a> %endif - <a href="?sort=${name_slug}">↓</a> - <a href="?sort=-${name_slug}">↑</a> </%def> - - <div class="box"> <!-- box / title --> <div class="title"> @@ -55,9 +56,9 @@ <tr class="parity${cnt%2}"> <td> %if repo['repo'].dbrepo.private: - <img alt="${_('private')}" src="/images/icons/lock.png"/> + <img class="icon" alt="${_('private')}" src="/images/icons/lock.png"/> %else: - <img alt="${_('public')}" src="/images/icons/lock_open.png"/> + <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>
--- a/pylons_app/templates/summary/summary.html Thu Sep 02 20:08:00 2010 +0200 +++ b/pylons_app/templates/summary/summary.html Fri Sep 03 09:24:16 2010 +0200 @@ -42,7 +42,7 @@ <label>${_('Name')}:</label> </div> <div class="input-short"> - ${c.repo_info.name} + <span style="font-size: 1.6em;font-weight: bold">${c.repo_info.name}</span> </div> </div>