kallithea Changeset - 6d0474c7e645

Changeset - 6d0474c7e645

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

Marcin Kuzminski - 15 years ago 2010-10-11 00:52:13
marcin@python-works.com

more templates updates

6 files changed with 18 insertions and 39 deletions:

rhodecode/public/css/diff.css

rhodecode/public/css/pygments.css

rhodecode/public/css/style.css

rhodecode/public/images/title_tab_selected.png

bin+mod

rhodecode/templates/index.html

rhodecode/templates/settings/repo_settings.html

0 comments (0 inline, 0 general)

rhodecode/public/css/diff.css

➞

Show inline comments

 div.diffblock {
     overflow: auto;
     padding: 0px;
     border: 1px solid #ccc;
     background: #f8f8f8;
     font-size: 100%;
     line-height: 100%;
     /* new */
     line-height: 125%;
+}
 div.diffblock .code-header{
 	border-bottom: 1px solid #CCCCCC;
 	background: #EEEEEE;
 	color:blue;
 	padding:10px 0 10px 0;
+}
 div.diffblock .code-header div{
 	margin-left:25px;
 	font-weight: bold;
+}
 div.diffblock .code-body{
 	background: #FFFFFF;
+}
 div.diffblock pre.raw{
 	background: #FFFFFF;
 	color:#000000;
+}
 table.code-difftable{
 	border-collapse: collapse;
 	width: 99%;
+}
 table.code-difftable td:target *{
 	background:  repeat scroll 0 0 #FFFFBE !important;
 	text-decoration: underline;
+}
 table.code-difftable td {

rhodecode/public/css/pygments.css

➞

Show inline comments

 div.codeblock {
     overflow: auto;
     padding: 0px;
     border: 1px solid #ccc;
     background: #f8f8f8;
     font-size: 100%;
     line-height: 100%;
     /* new */
     line-height: 125%;
+}
 div.codeblock .code-header{
 	border-bottom: 1px solid #CCCCCC;
 	background: #EEEEEE;
 	color:blue;
 	padding:10px 0 10px 0;
+}
 div.codeblock .code-header .revision{
 	margin-left:25px;
 	font-weight: bold;
+}
 div.codeblock .code-header .commit{
 	margin-left:25px;
 	font-weight: normal;
+}
 div.codeblock .code-body table{
     width: 0 !important;
+}
 div.code-body {
 	background-color: #FFFFFF;
+}
 div.code-body pre .match{
 	background-color: #FAFFA6;
+}
 div.code-body pre .break{
 	background-color: #DDE7EF;
 	width: 100%;
 	color: #747474;

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -38,72 +38,74 @@ del { @@
 	text-decoration: line-through;
+}
 /* tables still need 'cellspacing="0"' in the markup */
 table {
 	border-collapse: collapse;
 	border-spacing: 0;
+}
 /*
 	main stylesheet
 */
 html {
 	height: 100%;
+}
 body {
 	margin: 0;
 	padding: 0;
 	height: 100%;
 	background: #d1d1d1 url("../images/background.png") repeat;
 	font-family: Lucida Grande, Verdana, Lucida Sans Regular,
 		Lucida Sans Unicode, Arial, sans-serif;
 	font-size: 12px;
 	color: #000000;
+}
 /*
 	images
 */
 img {
 	border: none;
+}
 img.icon {
 	vertical-align: bottom;
+}
 /*
 	anchors
 */
 a {
-	color: #0066CC;
+	color: #003367;
 	text-decoration: none;
 	cursor: pointer;
 	font-weight: bold;
+}
 a:hover {
-	color: #000000;
+	color: #316293;
 	text-decoration: underline;
+}
 /*
 	headings
 */
 h1,h2,h3,h4,h5,h6 {
 	color: #292929;
 	font-weight: bold;
+}
 h1 {
 	font-size: 22px;
+}
 h2 {
 	font-size: 20px;
+}
 h3 {
 	font-size: 18px;
+}
 h4 {
@@ @@ -437,49 +439,49 @@ div.options a:hover { @@
 #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;
+	color: #003367;
 	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
 px;
+}
 #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
 px 9px;
+}
 #header #header-inner #quick ul ul {
 	top: auto;
+}
@@ @@ -871,89 +873,90 @@ div.options a:hover { @@
+}
 #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/title.png") repeat-x;
+	background: #336699 url("../images/header_inner.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%;
 	display: block;
 	float: left;
 	background: url("../images/title_link.png") no-repeat top left;
 	border-left: 1px solid #316293;
 	color: #ffffff;
 	font-size: 11px;
 	font-weight: bold;
 	text-decoration: none;
+}
 #content div.box div.title ul.links li a:hover {
 	color: #bfe3ff;
     background: url("../../images/title_tab_selected.png") no-repeat bottom
         center;
     color: #bfe3ff;
+}
 #content div.box div.title ul.links li.ui-tabs-selected a {
 	background: url("../../../resources/images/title_tab_selected.png")
 		no-repeat bottom center;
 	color: #bfe3ff;
+}
 /*
 	content / right / box / headings
 */
 #content div.box h1,#content div.box h2,#content div.box h3,#content div.box h4,#content div.box h5,#content div.box h6
+	{
 	margin: 10px 20px 10px 20px;
 	padding: 0 0 15px 0;
 	clear: both;
 	overflow: hidden;
 	border-bottom: 1px solid #DDDDDD;
+}
 /*
 	content / right / box / paragraphs
 */
 #content div.box p {
@@ @@ -1039,49 +1042,51 @@ div.options a:hover { @@
+}
 #content div.box img.right {
 	margin: 10px 0 10px 10px;
 	border: none;
 	float: right;
+}
 /*
 	content / right / box / messages
 */
 #content div.box div.messages {
 	margin: 0 20px 0 20px;
 	padding: 0;
 	clear: both;
 	overflow: hidden;
+}
 #content div.box div.message {
 	margin: 0 0 0px 0;
 	padding: 10px 0 10px 0;
 	clear: both;
 	overflow: hidden;
+}
 #content div.box div.message a{
     font-weight: normal !important;
+}
 #content div.box div.message div.image {
 	margin: 9px 0 0 5px;
 	padding: 6px;
 	float: left;
+}
 #content div.box div.message div.image img {
 	margin: 0;
 	vertical-align: middle;
+}
 #content div.box div.message div.text {
 	margin: 0;
 	padding: 9px 6px 9px 6px;
 	float: left;
+}
 #content div.box div.message div.dismiss {
 	margin: 0;
 	padding: 0;
 	float: right;
+}
 #content div.box div.message div.dismiss a {
@@ @@ -3003,49 +3008,49 @@ table.code-browser .browser-dir { @@
 /*
     SEARCH
 */
 .box .search {
 	clear: both;
 	margin: 0;
 	overflow: hidden;
 	padding: 0 20px 10px;
+}
 .box .search div.search_path {
 	background: none repeat scroll 0 0 #EEEEEE;
 	border: 1px solid #CCCCCC;
 	color: blue;
 	padding: 10px 0;
 	margin-bottom: 10px;
+}
 .box .search div.search_path div.link {
 	font-weight: bold;
 	margin-left: 25px;
+}
 .box .search div.search_path div.link a {
-	color: #0066CC;
+	color: #003367;
 	cursor: pointer;
 	text-decoration: none;
+}
 /*
 	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;
@@ @@ -3064,49 +3069,49 @@ table.code-browser .browser-dir { @@
 	text-align: center;
+}
 .info_box input#view {
 	padding: 4px 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;
+	border: 2px solid #003367;
 	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%;
@@ @@ -3209,56 +3214,54 @@ table.code-browser .browser-dir { @@
 	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;
 	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;
@@ @@ -3420,55 +3423,48 @@ div.gravatar { @@
 /*
     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;
+}
 /*THEME*/
 /*
     header
 */
 #header #header-inner {
 	background: #b0b0b0 url("../../images/header_inner.png") repeat-x;
+}
 /*
     header / quick
 */
 #header #header-inner #quick li a {
 	background: #336699 url("../../images/quick_l.png") no-repeat top left;
+}
 #header #header-inner #quick li span {
 	background: url("../../images/quick_r.png") no-repeat top right;
 	border-left: 1px solid #3f6f9f;
+}
 #header #header-inner #quick li span.icon {
 	background: url("../../images/quick_l.png") no-repeat top left;
 	border-right: 1px solid #2e5c89;
+}
 #header #header-inner #quick li a:hover {
 	background: #4e4e4e url("../../images/quick_l_selected.png") no-repeat
 		top left;
+}
 #header #header-inner #quick li a:hover span {
 	background: url("../../images/quick_r_selected.png") no-repeat top right;
+}
@@ @@ -3525,65 +3521,49 @@ div.gravatar { @@
+}
 #content #left #menu li a:hover {
 	color: #b9dcff;
+}
 #content #left #menu li.collapsible {
 	background: url("../../images/menu_border.png") no-repeat top left;
+}
 #content #left #menu li.collapsible a.minus {
 	border-bottom: 1px solid #326395;
+}
 #content #left #menu li ul {
 	border-left: 18px solid #326395;
+}
 #content #left #menu li ul li {
 	background: url("../../images/menu_arrow.png") no-repeat 10px 9px;
 	border-top: 1px solid #4377ab;
 	border-bottom: 1px solid #326395;
+}
 /*
     content / right / box / title
 */
 #content div.box div.title {
 	background: #336699 url("../../images/title.png") repeat-x;
+}
 #content div.box div.title ul.links li a {
 	background: url("../../images/title_link.png") no-repeat top left;
 	border-left: 1px solid #316293;
+}
 #content div.box div.title ul.links li a:hover {
 	background: url("../../images/title_tab_selected.png") no-repeat bottom
 		center;
 	color: #bfe3ff;
+}
 #content div.box div.title ul.links li.ui-tabs-selected a {
 	background: url("../../images/title_tab_selected.png") no-repeat bottom
 		center;
 	color: #bfe3ff;
+}
 /*
     content / right / box / search
 */
 #content div.box div.title div.search {
 	background: url("../../images/title_link.png") no-repeat top left;
 	border-left: 1px solid #316293;
+}
 #content div.box div.title div.search div.input input {
 	border: 1px solid #316293;
+}
 #content div.box div.title div.search div.button input.ui-state-default
+	{
 	background: #4e85bb url("../../images/button_highlight.png") repeat-x;
 	border: 1px solid #316293;
 	border-left: none;

rhodecode/public/images/title_tab_selected.png

➞

Show inline comments

binary diff not shown

Show images

rhodecode/templates/index.html

➞

Show inline comments

@@ @@ -10,49 +10,49 @@ @@
 	${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(_('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'))}</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:

rhodecode/templates/settings/repo_settings.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('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',class_="small")}
                 </div>
              </div>
             <div class="field">
                 <div class="label label-textarea">
@@ @@ -235,27 +235,28 @@ @@
                         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>
 </div>
 </%def>

0 comments (0 inline, 0 general)