Mercurial > kallithea
changeset 3539:c65b440540da beta
Style clean up, and comments removal.
| author | Leonardo Carneiro <leonardo@unity3d.com> |
|---|---|
| date | Mon, 11 Mar 2013 16:43:41 +0100 |
| parents | 9bf927589f7a |
| children | 6e8027c2f49c |
| files | rhodecode/public/css/contextbar.css rhodecode/public/css/style.css rhodecode/templates/base/base.html rhodecode/templates/changelog/changelog.html rhodecode/templates/files/files_source.html |
| diffstat | 5 files changed, 360 insertions(+), 578 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/public/css/contextbar.css Mon Mar 11 16:26:44 2013 +0100 +++ b/rhodecode/public/css/contextbar.css Mon Mar 11 16:43:41 2013 +0100 @@ -7,195 +7,185 @@ #quick .search { background-image: url("../images/icons/search_16.png"); } #quick .admin { background-image: url("../images/icons/cog_edit.png"); } -#context-bar button.follow { background-image: url("../images/icons/heart.png"); } -#context-bar button.following { background-image: url("../images/icons/heart_delete.png"); } -#context-bar a.fork { background-image: url("../images/icons/arrow_divide.png"); } -#context-bar a.summary { background-image: url("../images/icons/clipboard_16.png"); } -#context-bar a.changelogs { background-image: url("../images/icons/time.png"); } -#context-bar a.files { background-image: url("../images/icons/file.png"); } -#context-bar a.switch-to { background-image: url("../images/icons/arrow_switch.png"); } -#context-bar a.options { background-image: url("../images/icons/table_gear.png"); } -#context-bar a.pull-request { background-image: url("../images/icons/arrow_join.png"); } -#context-bar a.branches { background-image: url("../images/icons/arrow_branch.png"); } -#context-bar a.tags { background-image: url("../images/icons/tag_blue.png"); } -#context-bar a.bookmarks { background-image: url("../images/icons/tag_green.png"); } -#context-bar a.settings { background-image: url("../images/icons/cog.png"); } -#context-bar a.shortlog { background-image: url("../images/icons/time.png"); } -#context-bar a.search { background-image: url("../images/icons/search_16.png"); } -#context-bar a.admin { background-image: url("../images/icons/cog_edit.png"); } +#context-bar button.follow { background-image: url("../images/icons/heart.png"); } +#context-bar button.following { background-image: url("../images/icons/heart_delete.png"); } +#context-bar a.fork { background-image: url("../images/icons/arrow_divide.png"); } +#context-bar a.summary { background-image: url("../images/icons/clipboard_16.png"); } +#context-bar a.changelogs { background-image: url("../images/icons/time.png"); } +#context-bar a.files { background-image: url("../images/icons/file.png"); } +#context-bar a.switch-to { background-image: url("../images/icons/arrow_switch.png"); } +#context-bar a.options { background-image: url("../images/icons/table_gear.png"); } +#context-bar a.pull-request { background-image: url("../images/icons/arrow_join.png"); } +#context-bar a.branches { background-image: url("../images/icons/arrow_branch.png"); } +#context-bar a.tags { background-image: url("../images/icons/tag_blue.png"); } +#context-bar a.bookmarks { background-image: url("../images/icons/tag_green.png"); } +#context-bar a.settings { background-image: url("../images/icons/cog.png"); } +#context-bar a.shortlog { background-image: url("../images/icons/time.png"); } +#context-bar a.search { background-image: url("../images/icons/search_16.png"); } +#context-bar a.admin { background-image: url("../images/icons/cog_edit.png"); } -#context-bar a.journal { background-image: url("../images/icons/book.png"); } -#context-bar a.repos { background-image: url("../images/icons/database_edit.png"); } -#context-bar a.repos_groups { background-image: url("../images/icons/database_link.png"); } -#context-bar a.users { background-image: url("../images/icons/user_edit.png"); } -#context-bar a.groups { background-image: url("../images/icons/group_edit.png"); } -#context-bar a.permissions { background-image: url("../images/icons/key.png"); } -#context-bar a.ldap { background-image: url("../images/icons/server_key.png"); } -#context-bar a.defaults { background-image: url("../images/icons/wrench.png"); } -#context-bar a.settings { background-image: url("../images/icons/cog_edit.png"); } +#context-bar a.journal { background-image: url("../images/icons/book.png"); } +#context-bar a.repos { background-image: url("../images/icons/database_edit.png"); } +#context-bar a.repos_groups { background-image: url("../images/icons/database_link.png"); } +#context-bar a.users { background-image: url("../images/icons/user_edit.png"); } +#context-bar a.groups { background-image: url("../images/icons/group_edit.png"); } +#context-bar a.permissions { background-image: url("../images/icons/key.png"); } +#context-bar a.ldap { background-image: url("../images/icons/server_key.png"); } +#context-bar a.defaults { background-image: url("../images/icons/wrench.png"); } +#context-bar a.settings { background-image: url("../images/icons/cog_edit.png"); } #context-bar a.compare_request { background-image: url('../images/icons/arrow_inout.png')} -#context-bar a.locking_del { background-image: url('../images/icons/lock_delete.png')} -#context-bar a.locking_add { background-image: url('../images/icons/lock_add.png')} +#context-bar a.locking_del { background-image: url('../images/icons/lock_delete.png')} +#context-bar a.locking_add { background-image: url('../images/icons/lock_add.png')} #content #context-bar { - position: relative; - background-color: #003B76 !important; - padding: 0px; - overflow: visible; + position: relative; + background-color: #003B76 !important; + padding: 0px; + overflow: visible; } #header #header-inner #quick a, #content #context-bar, #content #context-bar a, #content #context-bar button { - color: #FFFFFF; + color: #FFFFFF; } #header #header-inner #quick a:hover, #content #context-bar a:hover, #content #context-bar button:hover { - text-decoration: none; -/* color: #bfe3ff;*/ + text-decoration: none; } #content #context-bar .icon { - display: inline-block; - width: 16px; - height: 16px; - vertical-align: text-bottom; + display: inline-block; + width: 16px; + height: 16px; + vertical-align: text-bottom; } ul.horizontal-list { - display: block; -/* overflow: hidden;*/ + display: block; } ul.horizontal-list > li { - float: left; - position: relative; + float: left; + position: relative; } #header #header-inner #quick ul, ul.horizontal-list > li ul { - position: absolute; - display: none; - right: 0; - z-index: 999; + position: absolute; + display: none; + right: 0; + z-index: 999; } #header #header-inner #quick li:hover > ul, ul.horizontal-list li:hover > ul { - display: block; + display: block; } #header #header-inner #quick li ul li, ul.horizontal-list ul li { - position: relative; - border-bottom: 1px solid rgba(0,0,0,0.1); - border-top: 1px solid rgba(255,255,255,0.1); + position: relative; + border-bottom: 1px solid rgba(0,0,0,0.1); + border-top: 1px solid rgba(255,255,255,0.1); } ul.horizontal-list > li ul ul { - position: absolute; - right: 100%; - top: -1px; - min-width: 200px; - max-height: 400px; - overflow-x:hidden; - overflow-y:auto; + position: absolute; + right: 100%; + top: -1px; + min-width: 200px; + max-height: 400px; + overflow-x:hidden; + overflow-y:auto; } #header #header-inner #quick ul a, ul.horizontal-list li a { - white-space: nowrap; + white-space: nowrap; } #breadcrumbs { - float:left; - padding: 5px 0; - padding-left: 5px; - font-weight: bold; - font-size: 14px; + float:left; + padding: 5px 0; + padding-left: 5px; + font-weight: bold; + font-size: 14px; } -#breadcrumbs span{ - font-weight: bold; - font-size: 2em; +#breadcrumbs span { + font-weight: bold; + font-size: 2em; } #context-top { - position: relative; - overflow: hidden; - border-bottom: 1px solid #003162; - padding: 5px; + position: relative; + overflow: hidden; + border-bottom: 1px solid #003162; + padding: 5px; } -/*#quick,*/ #header #header-inner #quick ul, #revision-changer, #context-pages, -#context-pages ul /*, -ul#context-actions */{ - background: #3b6998; /* Old browsers */ - background: -moz-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4574a2), color-stop(100%,#2f5d8b)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* IE10+ */ - background: linear-gradient(to bottom, #4574a2 0%, #2f5d8b 100%); /* W3C */ - /*filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4574a2', endColorstr='#2f5d8b',GradientType=0 ); /* IE6-9 */*/ +#context-pages ul { + background: #3b6998; /* Old browsers */ + background: -moz-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4574a2), color-stop(100%,#2f5d8b)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* IE10+ */ + background: linear-gradient(to bottom, #4574a2 0%, #2f5d8b 100%); /* W3C */ + /*Filter on IE will also use overflow:hidden implicitly, and that would clip our inner menus.*/ + /*filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4574a2', endColorstr='#2f5d8b',GradientType=0 ); /* IE6-9 */*/ } #header #header-inner #quick a, #context-actions a, #context-pages a { - background-repeat: no-repeat; - background-position: 10px 50%; - padding-left: 30px; + background-repeat: no-repeat; + background-position: 10px 50%; + padding-left: 30px; } #quick a, -#context-pages ul ul a{ - padding-left: 10px; +#context-pages ul ul a { + padding-left: 10px; } ul#context-actions { - display: inline-block; - float: right; - border-radius: 4px; - /*background-color:#3b6998;*/ - background-image: linear-gradient(top, #4574a2 0%, #2f5d8b 100%); -/* padding: 5px;*/ + display: inline-block; + float: right; + border-radius: 4px; + background-image: linear-gradient(top, #4574a2 0%, #2f5d8b 100%); } #content ul#context-actions li { - padding: 0px; - border-right: 1px solid rgba(0,0,0,0.1); - border-left: 1px solid rgba(255,255,255,0.1); + padding: 0px; + border-right: 1px solid rgba(0,0,0,0.1); + border-left: 1px solid rgba(255,255,255,0.1); } #context-actions button, #context-actions a { - display: block; - cursor: pointer; - background: none; - border: none; - margin: 0px; - height: auto; - padding: 10px 10px 10px 30px; - background-repeat: no-repeat; - background-position: 10px 50%; - font-size: 1em; - /*padding-top: 24px;*/ + display: block; + cursor: pointer; + background: none; + border: none; + margin: 0px; + height: auto; + padding: 10px 10px 10px 30px; + background-repeat: no-repeat; + background-position: 10px 50%; + font-size: 1em; } #context-actions a { - padding: 11px 10px 12px 30px; + padding: 11px 10px 12px 30px; } -/*#context-actions button{ - padding-top: 22px; - height: 40px; -}*/ #header #header-inner #quick li:hover, #revision-changer:hover, #context-pages li:hover, @@ -203,178 +193,171 @@ #content #context-actions li:hover, #header #header-inner #quick li.current, #context-pages li.current { - /*background: rgba(255,255,255,0.2);*/ - background: #6388ad; /* Old browsers */ - background: -moz-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,0.1)), color-stop(100%,rgba(255,255,255,0))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* IE10+ */ - background: linear-gradient(to bottom, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* W3C */ - /*filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#88bfe8', endColorstr='#70b0e0',GradientType=0 ); /* IE6-9 */*/ - - background-image: -webkit-gradient(linear, left top, left bottom, rgb(255,255,255) 0%, rgb(255,255,255) 100%); - - /*border-radius: 4px;*/ + background: #6388ad; /* Old browsers */ + background: -moz-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,0.1)), color-stop(100%,rgba(255,255,255,0))); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* IE10+ */ + background: linear-gradient(to bottom, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* W3C */ + /*filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#88bfe8', endColorstr='#70b0e0',GradientType=0 ); /* IE6-9 */*/ } #content #context-actions li:first-child { - border-left: none; - border-radius:4px 0 0px 4px; + border-left: none; + border-radius:4px 0 0px 4px; } #content #context-actions li:last-child { - border-right: none; - border-radius:0 4px 4px 0; + border-right: none; + border-radius:0 4px 4px 0; } -#content #context-actions .icon{ - margin: auto; - margin-bottom: 5px; - display: block; - clear: both; - float: none; +#content #context-actions .icon { + margin: auto; + margin-bottom: 5px; + display: block; + clear: both; + float: none; } #content #context-actions button.follow, -#content #context-actions button.following{ - width: auto; - float: none; +#content #context-actions button.following { + width: auto; + float: none; } #content #context-actions button .show-following, #content #context-actions button .show-follow { - display: none; + display: none; } #content #context-bar #context-actions button.follow .show-follow { - display: block; + display: block; } #content #context-bar #context-actions button.following .show-following { - display: block; + display: block; } #context-state { - background-color: #336699; - border-top: 1px solid #517da8; - min-height: 36px; -/* overflow: hidden;*/ + background-color: #336699; + border-top: 1px solid #517da8; + min-height: 36px; } #context-pages { - float: right; - border-left: 1px solid rgba(0,0,0,0.1); -/* overflow: hidden;*/ + float: right; + border-left: 1px solid rgba(0,0,0,0.1); } -#context-pages li.curreasdnt{ - background: #535353; /* Old browsers */ - background: -moz-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#5d5d5d), color-stop(100%,#484848)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* IE10+ */ - background: linear-gradient(to bottom, #5d5d5d 0%, #484848 100%); /* W3C */ +#context-pages li.curreasdnt { + background: #535353; /* Old browsers */ + background: -moz-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#5d5d5d), color-stop(100%,#484848)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* IE10+ */ + background: linear-gradient(to bottom, #5d5d5d 0%, #484848 100%); /* W3C */ } #content #context-pages .icon { - margin-right:5px; + margin-right:5px; } #header #header-inner #quick li, #content #context-pages li { - border-right: 1px solid rgba(0,0,0,0.1); - border-left: 1px solid rgba(255,255,255,0.1); - padding: 0; + border-right: 1px solid rgba(0,0,0,0.1); + border-left: 1px solid rgba(255,255,255,0.1); + padding: 0; } #header #header-inner #quick li:last-child, #content #context-pages li:last-child { - border-right:none; + border-right:none; } -#header #header-inner #quick li:first-child{ - border-left:none; +#header #header-inner #quick li:first-child { + border-left:none; } -#header #header-inner #quick > li:first-child > a{ - border-radius: 4px 0 0 4px; +#header #header-inner #quick > li:first-child > a { + border-radius: 4px 0 0 4px; } #header #header-inner #quick a, -#context-pages a, -#context-pages .admin_menu a{ - display: block; - padding: 0px 10px 1px 30px; - padding-left: 30px; - line-height: 35px; +#context-pages a, +#context-pages .admin_menu a { + display: block; + padding: 0px 10px 1px 30px; + padding-left: 30px; + line-height: 35px; } #header #header-inner #quick a#quick_login_link { - padding-left: 0px; + padding-left: 0px; } #header #header-inner #quick a { - overflow: hidden; + overflow: hidden; } #quick a.childs:after, #revision-changer:before, #context-pages a.childs:after, #context-pages a.dropdown:after { - content: ' \25BE'; + content: ' \25BE'; } #context-pages a.childs { - padding-right: 20px; + padding-right: 20px; } -#context-pages a.childs:after{ - position: absolute; - float: right; - padding-left: 5px; - padding-right: 5px; +#context-pages a.childs:after { + position: absolute; + float: right; + padding-left: 5px; + padding-right: 5px; } #revision-changer:before { - position: absolute; - top: 0px; - right: 0px; - border-right: 1px solid rgba(0,0,0,0.1); - height: 25px; - padding-top: 10px; - padding-right: 10px; + position: absolute; + top: 0px; + right: 0px; + border-right: 1px solid rgba(0,0,0,0.1); + height: 25px; + padding-top: 10px; + padding-right: 10px; } #context-pages li:last-child a { - padding-right: 10px; + padding-right: 10px; } #context-bar #revision-changer { - position: relative; - cursor: pointer; - border: none; - padding: 0; - margin: 0; - color: #FFFFFF; - font-size: 0.85em; - padding: 2px 15px; - padding-bottom: 3px; - padding-right: 30px; - border-right: 1px solid rgba(255,255,255,0.1); + position: relative; + cursor: pointer; + border: none; + padding: 0; + margin: 0; + color: #FFFFFF; + font-size: 0.85em; + padding: 2px 15px; + padding-bottom: 3px; + padding-right: 30px; + border-right: 1px solid rgba(255,255,255,0.1); } #revision-changer .branch-name, #revision-changer .revision { - display: block; - text-align: center; - line-height: 1.5em; + display: block; + text-align: center; + line-height: 1.5em; } #revision-changer .branch-name { - font-weight: bold; + font-weight: bold; } -#revision-changer .revision{ - text-transform: uppercase; +#revision-changer .revision { + text-transform: uppercase; }
--- a/rhodecode/public/css/style.css Mon Mar 11 16:26:44 2013 +0100 +++ b/rhodecode/public/css/style.css Mon Mar 11 16:43:41 2013 +0100 @@ -213,7 +213,7 @@ } .empty_data { - color:#B9B9B9; + color: #B9B9B9; } a.permalink { @@ -311,7 +311,7 @@ border-radius: 0px 0px 4px 4px; } -#header-dd:hover{ +#header-dd:hover { opacity: 0.2; -webkit-transition: opacity 0.5s ease-in-out; -moz-transition: opacity 0.5s ease-in-out; @@ -405,44 +405,14 @@ padding: 0; border-radius: 4px; } -/* -#header #header-inner #quick > li { - position: relative; - float: left; - margin: 0 5px 0 0; - padding: 0; -} - -#header #header-inner #quick li a.menu_link { - top: 0; - left: 0; - height: 1%; - display: block; - clear: both; - overflow: hidden; - color: #FFF; - font-weight: 700; - text-decoration: none; - background: #369; - padding: 0; - -webkit-border-radius: 4px 4px 4px 4px; - -khtml-border-radius: 4px 4px 4px 4px; - border-radius: 4px 4px 4px 4px; -} -*/ + #header #header-inner #quick li span.short { padding: 9px 6px 8px 6px; } #header #header-inner #quick li span { - /*top: 0; - right: 0; - height: 1%;*/ display: inline; - /*float: left;*/ - /*border-left: 1px solid #3f6f9f;*/ margin: 0; - /*padding: 10px 12px 8px 10px;*/ } #header #header-inner #quick li span.normal { @@ -469,25 +439,6 @@ margin-bottom: 2px; } -/*#header #header-inner #quick > li.current > a, -#header #header-inner #quick > li > a:hover*/ { - background-color: #4e4e4e; -} -/* -#header #header-inner #quick li.current a span, -#header #header-inner #quick li a:hover span { - border-left: 1px solid #545454; -} -*/ -/* -#header #header-inner #quick li.current a span.icon, -#header #header-inner #quick li.current a span.icon_short, -#header #header-inner #quick li a:hover span.icon, -#header #header-inner #quick li a:hover span.icon_short { - border-left: none; - border-right: 1px solid #464646; -} -*/ #header #header-inner #quick ul.repo_switcher { max-height: 275px; overflow-x: hidden; @@ -499,7 +450,7 @@ padding-right: 17px; } -#header #header-inner #quick ul.repo_switcher li.qfilter_rs input{ +#header #header-inner #quick ul.repo_switcher li.qfilter_rs input { width: 100%; border-radius: 10px; padding: 2px 7px; @@ -526,7 +477,7 @@ #header #header-inner #quick li ul li a.hg, #header #header-inner #quick li ul li a.hg:hover { background-image: url("../images/icons/hgicon.png"); padding-left: 42px; - background-position: 20px 9px; + background-position: 20px 9px; } #header #header-inner #quick li ul li a.git, #header #header-inner #quick li ul li a.git:hover { @@ -650,7 +601,7 @@ td.quick_repo_menu .menu_items { margin-top: 10px; - margin-left:-6px; + margin-left: -6px; width: 150px; position: absolute; background-color: #FFF; @@ -955,7 +906,6 @@ #content div.box { clear: both; -/* overflow: hidden;*/ background: #fff; margin: 0 0 10px; padding: 0 0 10px; @@ -1121,18 +1071,18 @@ } #content div.box div.expand { width: 110%; - height:14px; - font-size:10px; - text-align:center; + height: 14px; + font-size: 10px; + text-align: center; cursor: pointer; - color:#666; - - background:-webkit-gradient(linear,0% 50%,100% 50%,color-stop(0%,rgba(255,255,255,0)),color-stop(100%,rgba(64,96,128,0.1))); - background:-webkit-linear-gradient(top,rgba(255,255,255,0),rgba(64,96,128,0.1)); - background:-moz-linear-gradient(top,rgba(255,255,255,0),rgba(64,96,128,0.1)); - background:-o-linear-gradient(top,rgba(255,255,255,0),rgba(64,96,128,0.1)); - background:-ms-linear-gradient(top,rgba(255,255,255,0),rgba(64,96,128,0.1)); - background:linear-gradient(to bottom,rgba(255,255,255,0),rgba(64,96,128,0.1)); + color: #666; + + background: -webkit-gradient(linear,0% 50%,100% 50%,color-stop(0%,rgba(255,255,255,0)),color-stop(100%,rgba(64,96,128,0.1))); + background: -webkit-linear-gradient(top,rgba(255,255,255,0),rgba(64,96,128,0.1)); + background: -moz-linear-gradient(top,rgba(255,255,255,0),rgba(64,96,128,0.1)); + background: -o-linear-gradient(top,rgba(255,255,255,0),rgba(64,96,128,0.1)); + background: -ms-linear-gradient(top,rgba(255,255,255,0),rgba(64,96,128,0.1)); + background: linear-gradient(to bottom,rgba(255,255,255,0),rgba(64,96,128,0.1)); display: none; overflow: hidden; @@ -1471,7 +1421,7 @@ } .reviewer_ac { - padding:10px + padding: 10px } div.form div.fields div.field div.button { @@ -1726,12 +1676,10 @@ } #content div.box #summary { - /*float: left;*/ - /*width: 80%;*/ margin-right: 200px; } -#summary-menu-stats{ +#summary-menu-stats { float: left; width: 180px; position: absolute; @@ -1768,7 +1716,6 @@ #summary-menu-stats a { display: block; - /*color: #000000;*/ padding: 12px 30px; background-repeat: no-repeat; background-position: 10px 50%; @@ -1787,10 +1734,10 @@ text-decoration: none; } -#summary-menu-stats a span{ +#summary-menu-stats a span { background-color: #FFF; border: 1px inset #f0f0f0; - border-radius:7px; + border-radius: 7px; padding: 1px; font-size: 10px; } @@ -1892,15 +1839,15 @@ #footer div#footer-inner { background-color: #003B76; - background-repeat : repeat-x; - background-image : -khtml-gradient( linear, left top, left bottom, from(#003B76), to(#00376E)); - background-image : -moz-linear-gradient(top, #003b76, #00376e); - background-image : -ms-linear-gradient( top, #003b76, #00376e); - background-image : -webkit-gradient( linear, left top, left bottom, color-stop( 0%, #003b76), color-stop( 100%, #00376e)); - background-image : -webkit-linear-gradient( top, #003b76, #00376e)); - background-image : -o-linear-gradient( top, #003b76, #00376e)); - background-image : linear-gradient(to bottom, #003b76, #00376e); - filter :progid : DXImageTransform.Microsoft.gradient ( startColorstr = '#003b76', endColorstr = '#00376e', GradientType = 0); + background-repeat: repeat-x; + background-image: -khtml-gradient( linear, left top, left bottom, from(#003B76), to(#00376E)); + background-image: -moz-linear-gradient(top, #003b76, #00376e); + background-image: -ms-linear-gradient( top, #003b76, #00376e); + background-image: -webkit-gradient( linear, left top, left bottom, color-stop( 0%, #003b76), color-stop( 100%, #00376e)); + background-image: -webkit-linear-gradient( top, #003b76, #00376e)); + background-image: -o-linear-gradient( top, #003b76, #00376e)); + background-image: linear-gradient(to bottom, #003b76, #00376e); + filter: progid : DXImageTransform.Microsoft.gradient ( startColorstr = '#003b76', endColorstr = '#00376e', GradientType = 0); box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6); -webkit-border-radius: 4px 4px 4px 4px; -khtml-border-radius: 4px 4px 4px 4px; @@ -1927,15 +1874,15 @@ overflow: hidden; position: relative; background-color: #003B76; - background-repeat : repeat-x; - background-image : -khtml-gradient( linear, left top, left bottom, from(#003B76), to(#00376E)); - background-image : -moz-linear-gradient( top, #003b76, #00376e); - background-image : -ms-linear-gradient( top, #003b76, #00376e); - background-image : -webkit-gradient( linear, left top, left bottom, color-stop( 0%, #003b76), color-stop( 100%, #00376e)); - background-image : -webkit-linear-gradient( top, #003b76, #00376e)); - background-image : -o-linear-gradient( top, #003b76, #00376e)); - background-image : linear-gradient(to bottom, #003b76, #00376e); - filter : progid : DXImageTransform.Microsoft.gradient ( startColorstr = '#003b76', endColorstr = '#00376e', GradientType = 0); + background-repeat: repeat-x; + background-image: -khtml-gradient( linear, left top, left bottom, from(#003B76), to(#00376E)); + background-image: -moz-linear-gradient( top, #003b76, #00376e); + background-image: -ms-linear-gradient( top, #003b76, #00376e); + background-image: -webkit-gradient( linear, left top, left bottom, color-stop( 0%, #003b76), color-stop( 100%, #00376e)); + background-image: -webkit-linear-gradient( top, #003b76, #00376e)); + background-image: -o-linear-gradient( top, #003b76, #00376e)); + background-image: linear-gradient(to bottom, #003b76, #00376e); + filter: progid : DXImageTransform.Microsoft.gradient ( startColorstr = '#003b76', endColorstr = '#00376e', GradientType = 0); margin: 0 auto; padding: 0; } @@ -1990,7 +1937,7 @@ } .user-menu .container { - padding:0px 4px 0px 4px; + padding: 0px 4px 0px 4px; margin: 0px 0px 0px 0px; } @@ -2072,10 +2019,10 @@ padding: 3px 3px 3px 6px; } #quick_login .big_gravatar { - padding:4px 0px 0px 6px; + padding: 4px 0px 0px 6px; } #quick_login .notifications { - padding:4px 0px 0px 6px; + padding: 4px 0px 0px 6px; color: #FFFFFF; font-weight: bold; } @@ -2150,7 +2097,7 @@ padding: 0; color: #fff; display: block; - float:none !important; + float: none !important; } #quick_login ol.links li a { @@ -2348,16 +2295,16 @@ } .file_history { - padding-top:10px; - font-size:16px; + padding-top: 10px; + font-size: 16px; } .file_author { float: left; } .file_author .item { - float:left; - padding:5px; + float: left; + padding: 5px; color: #888; } @@ -2427,7 +2374,7 @@ .cs_files .changes { float: right; - color:#003367; + color: #003367; } .cs_files .changes .added { @@ -2556,12 +2503,12 @@ } #graph_content .container { - + } #graph_content #changesets td { overflow: hidden; - text-overflow:ellipsis; + text-overflow: ellipsis; white-space: nowrap; height: 31px; border-color: #cdcdcd; @@ -2572,12 +2519,12 @@ width: 105px; } -#graph_content .container .hash{ +#graph_content .container .hash { width: 85px; font-size: 0.85em; } -#graph_content #changesets .container .date{ +#graph_content #changesets .container .date { width: 76px; color: #666; font-size: 10px; @@ -2590,20 +2537,15 @@ position: relative; } -/* -#graph_content .container .column3 { - width: 12% -} -*/ #graph_content .container .mid { padding: 0; } -#graph_content .log-container{ +#graph_content .log-container { position: relative; } -#graph_content #changesets td.checkbox{ +#graph_content #changesets td.checkbox { width: 20px; } @@ -2632,7 +2574,7 @@ position: absolute; top: -15px; right: 0; - padding-left:5px; + padding-left: 5px; background: #FFFFFF; height: 41px; } @@ -2647,7 +2589,6 @@ } #graph_content .comments-container { - /*width: 40px;*/ margin: 0.8em 0; margin-right: 0.5em; } @@ -2655,7 +2596,7 @@ #graph_content .tagcontainer { width: 80px; position: relative; - float:right; + float: right; height: 100%; top: 7px; margin-left: 0.5em; @@ -2696,35 +2637,25 @@ text-decoration: none; } -/* - * Stuff we might want to remove from the changelog, or reposition in a tooltip - */ -#graph_content .container .changeset_id, -#graph_content .container .changes, -#graph_content .container .changed_total, -#graph_content .container .parent { - display: none; -} - .revision-link { - color:#3F6F9F; + color: #3F6F9F; font-weight: bold !important; } .issue-tracker-link { - color:#3F6F9F; + color: #3F6F9F; font-weight: bold !important; } .changeset-status-container { padding-right: 5px; - margin-top:1px; - float:right; - height:14px; + margin-top: 1px; + float: right; + height: 14px; } .code-header .changeset-status-container { - float:left; - padding:2px 0px 0px 2px; + float: left; + padding: 2px 0px 0px 2px; } .changeset-status-container .changeset-status-lbl { color: rgb(136, 136, 136); @@ -2807,10 +2738,9 @@ .right .parent { color: #666666; - clear:both; + clear: both; } .right .logtags { - /*padding: 2px 2px 2px 2px;*/ line-height: 2.2em; } .branchtag, .logtags .tagtag, .logtags .booktag { @@ -2848,9 +2778,7 @@ .logtags .tagtag, .right .merge { float: right; - /*height: 1em;*/ line-height: 1em; - /*padding: 0px 0px !important;*/ margin: 1px 1px !important; display: block; } @@ -2902,7 +2830,7 @@ color: #ffffff; } -.logbooks .bookbook, .logbooks .bookbook a:hover, +.logbooks .bookbook, .logbooks .bookbook a:hover, .logtags .bookbook, .logtags .bookbook a:hover, .bookbook a, .bookbook a:hover { @@ -3021,8 +2949,8 @@ border-style: solid solid solid; border-width: 1px; box-shadow: 2px 8px 4px rgba(0, 0, 0, 0.2); - margin-top:5px; - margin-left:1px; + margin-top: 5px; + margin-left: 1px; } .diffblock .diff-actions { @@ -3275,7 +3203,7 @@ display: block; margin-top: 4px; color: #666; - float:right; + float: right; } .locking_locked { @@ -3432,7 +3360,7 @@ } .error_red { - color:red; + color: red; } .error_msg { @@ -3523,7 +3451,7 @@ width: 16px; } div#legend_data { - padding-left:10px; + padding-left: 10px; } div#legend_container table { border: none !important; @@ -3554,7 +3482,7 @@ float: left; margin-right: 0.7em; padding: 1px 1px 1px 1px; - line-height:0; + line-height: 0; -webkit-border-radius: 3px; -khtml-border-radius: 3px; border-radius: 3px; @@ -3572,7 +3500,6 @@ #content { clear: both; - /*overflow: hidden;*/ padding: 10px 10px 14px 10px; } @@ -3659,7 +3586,7 @@ } .ui-btn.red { - color:#fff; + color: #fff; background-color: #c43c35; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); @@ -3676,7 +3603,7 @@ .ui-btn.blue { - color:#fff; + color: #fff; background-color: #339bb9; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); @@ -3720,7 +3647,6 @@ img, #header #header-inner #quick li a:hover span.normal, -/*#header #header-inner #quick li ul li.last,*/ #content div.box div.form div.fields div.field div.textarea table td table td a, #clone_url, #clone_url_id @@ -3857,7 +3783,6 @@ #content div.box div.form div.fields div.buttons input div.form div.fields div.buttons input, #content div.box div.action div.button input { - /*color: #000;*/ font-size: 11px; font-weight: 700; margin: 0; @@ -4068,12 +3993,12 @@ .group_members .group_member { height: 30px; - padding:0px 0px 0px 0px; + padding: 0px 0px 0px 0px; } .reviewers_member { height: 15px; - padding:0px 0px 0px 10px; + padding: 0px 0px 0px 10px; } .emails_wrap { @@ -4082,7 +4007,7 @@ .emails_wrap .email_entry { height: 30px; - padding:0px 0px 0px 10px; + padding: 0px 0px 0px 10px; } .emails_wrap .email_entry .email { float: left @@ -4097,7 +4022,7 @@ .ips_wrap .ip_entry { height: 30px; - padding:0px 0px 0px 10px; + padding: 0px 0px 0px 10px; } .ips_wrap .ip_entry .ip { float: left @@ -4110,7 +4035,7 @@ /*README STYLE*/ div.readme { - padding:0px; + padding: 0px; } div.readme h2 { @@ -4122,10 +4047,10 @@ } div.readme .readme_box { - clear:both; - overflow:hidden; - margin:0; - padding:0 20px 10px; + clear: both; + overflow: hidden; + margin: 0; + padding: 0 20px 10px; } div.readme .readme_box h1, div.readme .readme_box h2, div.readme .readme_box h3, div.readme .readme_box h4, div.readme .readme_box h5, div.readme .readme_box h6 { @@ -4211,7 +4136,7 @@ div.rst-block { - padding:0px; + padding: 0px; } div.rst-block h2 { @@ -4223,10 +4148,10 @@ } div.rst-block { - clear:both; - overflow:hidden; - margin:0; - padding:0 20px 10px; + clear: both; + overflow: hidden; + margin: 0; + padding: 0 20px 10px; } div.rst-block h1, div.rst-block h2, div.rst-block h3, div.rst-block h4, div.rst-block h5, div.rst-block h6 { @@ -4302,7 +4227,7 @@ /** comment main **/ .comments { - padding:10px 20px; + padding: 10px 20px; } .comments .comment { @@ -4331,7 +4256,7 @@ .comments .comment .meta .date { float: left; - padding:4px 4px 0px 4px; + padding: 4px 4px 0px 4px; } .comments .comment .text { @@ -4342,7 +4267,7 @@ } .comments .comments-number { - padding:0px 0px 10px 0px; + padding: 0px 0px 10px 0px; font-weight: bold; color: #666; font-size: 16px; @@ -4351,8 +4276,8 @@ /** comment form **/ .status-block { - min-height:80px; - clear:both + min-height: 80px; + clear: both } .comment-form .clearfix { @@ -4401,7 +4326,7 @@ } .comment-form .comment-button { - padding-top:5px; + padding-top: 5px; } .add-another-button { @@ -4412,13 +4337,13 @@ .comment .buttons { float: right; - padding:2px 2px 0px 0px; + padding: 2px 2px 0px 0px; } .show-inline-comments { position: relative; - top:1px + top: 1px } /** comment inline form **/ @@ -4426,7 +4351,7 @@ display: none; } .comment-inline-form .overlay.submitting { - display:block; + display: block; background: none repeat scroll 0 0 white; font-size: 16px; opacity: 0.5; @@ -4436,8 +4361,8 @@ } .comment-inline-form .overlay.submitting .overlay-text { - width:100%; - margin-top:5%; + width: 100%; + margin-top: 5%; } .comment-inline-form .clearfix { @@ -4448,23 +4373,8 @@ } div.comment-inline-form { - padding:4px 0px 6px 0px; -} - - -tr.hl-comment { -/* - background-color: #FFFFCC !important; -*/ -} - -/* -tr.hl-comment pre { - border-top: 2px solid #FFEE33; - border-left: 2px solid #FFEE33; - border-right: 2px solid #FFEE33; -} -*/ + padding: 4px 0px 6px 0px; +} .comment-inline-form strong { display: block; @@ -4502,19 +4412,19 @@ } .comment-inline-form .comment-button { - padding-top:5px; + padding-top: 5px; } /** comment inline **/ .inline-comments { - padding:10px 20px; + padding: 10px 20px; } .inline-comments div.rst-block { - clear:both; - overflow:hidden; - margin:0; - padding:0 20px 0px; + clear: both; + overflow: hidden; + margin: 0; + padding: 0 20px 0px; } .inline-comments .comment { border: 1px solid #ddd; @@ -4528,7 +4438,7 @@ } .inline-comments .comment-wrapp { - padding:1px; + padding: 1px; } .inline-comments .comment .meta { background: #f8f8f8; @@ -4543,12 +4453,12 @@ .inline-comments .comment .meta .user { font-weight: bold; - float:left; + float: left; padding: 3px; } .inline-comments .comment .meta .date { - float:left; + float: left; padding: 3px; } @@ -4557,13 +4467,13 @@ } .inline-comments .comments-number { - padding:0px 0px 10px 0px; + padding: 0px 0px 10px 0px; font-weight: bold; color: #666; font-size: 16px; } .inline-comments-button .add-comment { - margin:2px 0px 8px 5px !important + margin: 2px 0px 8px 5px !important } .notification-paginator { @@ -4571,24 +4481,18 @@ float: left; } -.menu_link_user { - /*padding: 10px 8px 8px 8px !important;*/ -} - #context-pages .pull-request span, .menu_link_notifications { padding: 4px 4px !important; - /*margin: 7px 4px 0px 0px !important;*/ text-align: center; - color:#888 !important; - /*font-size: 10px;*/ + color: #888 !important; background-color: #DEDEDE !important; border-radius: 4px !important; -webkit-border-radius: 4px !important; } .notification-header { - padding-top:6px; + padding-top: 6px; } .notification-header .desc { font-size: 16px; @@ -4624,13 +4528,13 @@ cursor: pointer; } .notification-subject { - clear:both; + clear: both; border-bottom: 1px solid #eee; - padding:5px 0px 5px 38px; + padding: 5px 0px 5px 38px; } .notification-body { - clear:both; + clear: both; margin: 34px 2px 2px 8px } @@ -4638,8 +4542,8 @@ PULL REQUESTS *****/ .pullrequests_section_head { - padding:10px 10px 10px 0px; - font-size:16px; + padding: 10px 10px 10px 0px; + font-size: 16px; font-weight: bold; } @@ -4647,8 +4551,8 @@ PERMS *****/ #perms .perms_section_head { - padding:10px 10px 10px 0px; - font-size:16px; + padding: 10px 10px 10px 0px; + font-size: 16px; font-weight: bold; } @@ -4683,12 +4587,12 @@ } .perm-gravatar { - vertical-align:middle; - padding:2px; + vertical-align: middle; + padding: 2px; } .perm-gravatar-ac { - vertical-align:middle; - padding:2px; + vertical-align: middle; + padding: 2px; width: 14px; height: 14px; } @@ -4696,11 +4600,11 @@ /***************************************************************************** DIFFS CSS ******************************************************************************/ -.diff-collapse{ +.diff-collapse { text-align: center; margin-bottom: -15px; } -.diff-collapse-button{ +.diff-collapse-button { cursor: pointer; color: #666; font-size: 16px; @@ -4709,7 +4613,7 @@ } -.diff-container.hidden{ +.diff-container.hidden { display: none; overflow: hidden; } @@ -4733,7 +4637,7 @@ div.diffblock .code-header { border-bottom: 1px solid #CCCCCC; background: #EEEEEE; - padding:10px 0 10px 0; + padding: 10px 0 10px 0; height: 14px; } @@ -4757,12 +4661,12 @@ padding: 2px 0 0 2px; } div.diffblock .code-header .date { - float:left; + float: left; text-transform: uppercase; padding: 2px 0px 0px 2px; } div.diffblock .code-header div { - margin-left:4px; + margin-left: 4px; font-weight: bold; font-size: 14px; } @@ -4770,25 +4674,25 @@ div.diffblock .parents { float: left; height: 26px; - width:100px; + width: 100px; font-size: 10px; font-weight: 400; vertical-align: middle; padding: 0px 2px 2px 2px; - background-color:#eeeeee; + background-color: #eeeeee; border-bottom: 1px solid #CCCCCC; } div.diffblock .children { float: right; height: 26px; - width:100px; + width: 100px; font-size: 10px; font-weight: 400; vertical-align: middle; text-align: right; padding: 0px 2px 2px 2px; - background-color:#eeeeee; + background-color: #eeeeee; border-bottom: 1px solid #CCCCCC; } @@ -4797,7 +4701,7 @@ } div.diffblock pre.raw { background: #FFFFFF; - color:#000000; + color: #000000; } table.code-difftable { border-collapse: collapse; @@ -4807,35 +4711,35 @@ table.code-difftable td { padding: 0 !important; background: none !important; - border:0 !important; + border: 0 !important; vertical-align: baseline !important } table.code-difftable .context { - background:none repeat scroll 0 0 #DDE7EF; + background: none repeat scroll 0 0 #DDE7EF; } table.code-difftable .add { - background:none repeat scroll 0 0 #DDFFDD; + background: none repeat scroll 0 0 #DDFFDD; } table.code-difftable .add ins { - background:none repeat scroll 0 0 #AAFFAA; - text-decoration:none; + background: none repeat scroll 0 0 #AAFFAA; + text-decoration: none; } table.code-difftable .del { - background:none repeat scroll 0 0 #FFDDDD; + background: none repeat scroll 0 0 #FFDDDD; } table.code-difftable .del del { - background:none repeat scroll 0 0 #FFAAAA; - text-decoration:none; + background: none repeat scroll 0 0 #FFAAAA; + text-decoration: none; } /** LINE NUMBERS **/ table.code-difftable .lineno { - padding-left:2px; - padding-right:2px; - text-align:right; - width:32px; - -moz-user-select:none; + padding-left: 2px; + padding-right: 2px; + text-align: right; + width: 32px; + -moz-user-select: none; -webkit-user-select: none; border-right: 1px solid #CCC !important; border-left: 0px solid #CCC !important; @@ -4849,10 +4753,10 @@ table.code-difftable .lineno.old { } table.code-difftable .lineno a { - color:#747474 !important; - font:11px "Bitstream Vera Sans Mono",Monaco,"Courier New",Courier,monospace !important; - letter-spacing:-1px; - text-align:right; + color: #747474 !important; + font: 11px "Bitstream Vera Sans Mono",Monaco,"Courier New",Courier,monospace !important; + letter-spacing: -1px; + text-align: right; padding-right: 2px; cursor: pointer; display: block; @@ -4860,12 +4764,12 @@ } table.code-difftable .lineno-inline { - background:none repeat scroll 0 0 #FFF !important; - padding-left:2px; - padding-right:2px; - text-align:right; - width:30px; - -moz-user-select:none; + background: none repeat scroll 0 0 #FFF !important; + padding-left: 2px; + padding-right: 2px; + text-align: right; + width: 30px; + -moz-user-select: none; -webkit-user-select: none; } @@ -4875,22 +4779,22 @@ width: 100%; } table.code-difftable .code td { - margin:0; - padding:0; + margin: 0; + padding: 0; } table.code-difftable .code pre { - margin:0; - padding:0; + margin: 0; + padding: 0; height: 17px; line-height: 17px; } .diffblock.margined.comm .line .code:hover { - background-color:#FFFFCC !important; + background-color: #FFFFCC !important; cursor: pointer !important; - background-image:url("../images/icons/comment_add.png") !important; - background-repeat:no-repeat !important; + background-image: url("../images/icons/comment_add.png") !important; + background-repeat: no-repeat !important; background-position: right !important; background-position: 0% 50% !important; }
--- a/rhodecode/templates/base/base.html Mon Mar 11 16:26:44 2013 +0100 +++ b/rhodecode/templates/base/base.html Mon Mar 11 16:43:41 2013 +0100 @@ -143,7 +143,7 @@ <li><a href="#">${_('loading...')}</a></li> </ul> </li> - <li ${is_current('options')}> + <li ${is_current('options')}> <a href="#" class="dropdown options"></span>Options</a> <ul> %if h.HasRepoPermissionAll('repository.admin')(c.repo_name): @@ -169,7 +169,7 @@ </ul> </li> <li ${is_current('showpullrequest')}> - <a href="${h.url('pullrequest_show_all',repo_name=c.repo_name)}" title="${_('Show Pull Requests')}" class="pull-request">Pull Requests + <a href="${h.url('pullrequest_show_all',repo_name=c.repo_name)}" title="${_('Show Pull Requests')}" class="pull-request">Pull Requests %if c.repository_pull_requests: <span>${c.repository_pull_requests}</span> %endif
--- a/rhodecode/templates/changelog/changelog.html Mon Mar 11 16:26:44 2013 +0100 +++ b/rhodecode/templates/changelog/changelog.html Mon Mar 11 16:43:41 2013 +0100 @@ -64,7 +64,6 @@ </td> <td class="hash"> <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}"> - <span class="changeset_id">${cs.revision} :</span> <span class="changeset_hash">${h.short_id(cs.raw_id)}</span> </a> </td> @@ -101,105 +100,9 @@ ${h.link_to(h.shorter(cs.branch),h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))} </div> %endif - - <%doc> - %if (h.is_hg(c.rhodecode_repo) and cs.bookmarks) or cs.tags: - <div class="tagcontainer"> - %if h.is_hg(c.rhodecode_repo): - <ul class="logtags"> - ##%if len(cs.parents)>1: - ## <span class="merge">${_('merge')}</span> - ##%endif - - - %for book in cs.bookmarks: - <li class="bookbook" title="${'%s %s' % (_('bookmark'),book)}"> - ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} - </li> - %endfor - - </ul> - %endif - <ul class="logtags tags"> - %for tag in cs.tags: - <li class="tagtag" title="${'%s %s' % (_('tag'),tag)}"> - ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} - </li> - %endfor - </ul> - </div> - %endif - </%doc> </div> </div> </td> - <%doc> - <td class="right"> - <div class="changes"> - <div id="changed_total_${cs.raw_id}" style="float:right;" class="changed_total tooltip" title="${h.tooltip(_('Affected number of files, click to show more details'))}"> - ${len(cs.affected_files)} - </div> - - <div class="changeset-status-container"> - %if c.statuses.get(cs.raw_id): - <div title="${_('Changeset status')}" class="changeset-status-lbl">${c.statuses.get(cs.raw_id)[1]}</div> - <div class="changeset-status-ico"> - %if c.statuses.get(cs.raw_id)[2]: - <a class="tooltip" title="${_('Click to open associated pull request #%s' % c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" /></a> - %else: - <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" /> - %endif - </div> - %endif - </div> - </div> - %if cs.parents: - %for p_cs in reversed(cs.parents): - <div class="parent">${_('Parent')} - <span class="changeset_id">${p_cs.revision}:<span class="changeset_hash">${h.link_to(h.short_id(p_cs.raw_id), - h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}</span></span> - </div> - %endfor - %else: - <div class="parent">${_('No parents')}</div> - %endif - %if len(c.comments.get(cs.raw_id,[])) > 0: - <div class="comments-container"> - <div class="comments-cnt" title="${('comments')}"> - <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}"> - ${len(c.comments[cs.raw_id])} - </a> - </div> - </div> - %endif - %if (h.is_hg(c.rhodecode_repo) and cs.bookmarks) or cs.tags: - <div class="tagcontainer"> - %if h.is_hg(c.rhodecode_repo): - <ul class="logtags"> - ##%if len(cs.parents)>1: - ## <span class="merge">${_('merge')}</span> - ##%endif - - - %for book in cs.bookmarks: - <li class="bookbook" title="${'%s %s' % (_('bookmark'),book)}"> - ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} - </li> - %endfor - - </ul> - %endif - <ul class="logtags tags"> - %for tag in cs.tags: - <li class="tagtag" title="${'%s %s' % (_('tag'),tag)}"> - ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} - </li> - %endfor - </ul> - </div> - %endif - </td> - </%doc> </tr> %endfor </tbody> @@ -221,7 +124,7 @@ var checkboxes = YUD.getElementsByClassName('changeset_range'); var url_tmpl = "${h.url('changeset_home',repo_name=c.repo_name,revision='__REVRANGE__')}"; var pr_tmpl = "${h.url('pullrequest_home',repo_name=c.repo_name)}"; - + var checkbox_checker = function(e){ var clicked_cb = e.currentTarget; var checked_checkboxes = []; @@ -302,14 +205,6 @@ }); - // Fetch changeset details - YUE.on(YUD.getElementsByClassName('changed_total'),'click',function(e){ - var id = e.currentTarget.id; - var url = "${h.url('changelog_details',repo_name=c.repo_name,cs='__CS__')}"; - var url = url.replace('__CS__',id.replace('changed_total_','')); - ypjax(url,id,function(){tooltip_activate()}); - }); - // change branch filter YUE.on(YUD.get('branch_filter'),'change',function(e){ var selected_branch = e.currentTarget.options[e.currentTarget.selectedIndex].value;
--- a/rhodecode/templates/files/files_source.html Mon Mar 11 16:26:44 2013 +0100 +++ b/rhodecode/templates/files/files_source.html Mon Mar 11 16:43:41 2013 +0100 @@ -86,11 +86,11 @@ h_lines.push(parseInt(highlight_ranges[pos])); } } - highlight_lines(h_lines); - var _first_line= YUD.get('L'+h_lines[0]); - if(_first_line){ - _first_line.scrollIntoView() - } + highlight_lines(h_lines); + var _first_line= YUD.get('L'+h_lines[0]); + if(_first_line){ + _first_line.scrollIntoView() + } } // select code link event