kallithea Changeset - 9b6c1de4ce9e

Changeset - 9b6c1de4ce9e

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Marcin Kuzminski - 15 years ago 2010-08-18 01:46:18
marcin@python-works.com

some small template fixes

3 files changed with 20 insertions and 7 deletions:

pylons_app/public/css/style.css

pylons_app/templates/admin/settings/settings.html

pylons_app/templates/summary/summary.html

0 comments (0 inline, 0 general)

pylons_app/public/css/style.css

➞

Show inline comments

@@ @@ -2763,445 +2763,458 @@ div.form div.fields div.buttons input @@
     border-bottom: 1px solid #eaeaea;
     color: #000000;
 	font-family: Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
 	font-size: 11px;
+}
 #register div.form div.fields div.field div.input  input.error
+{
 	background: #FBE3E4;
 	border-top: 1px solid #e1b2b3;
 	border-left: 1px solid #e1b2b3;
 	border-right: 1px solid #FBC2C4;
 	border-bottom: 1px solid #FBC2C4;
+}
 #register div.form div.fields div.field div.input  input.success
+{
 	background: #E6EFC2;
 	border-top: 1px solid #cebb98;
 	border-left: 1px solid #cebb98;
 	border-right: 1px solid #c6d880;
 	border-bottom: 1px solid #c6d880;
+}
 #register div.form div.fields div.field div.input div.link
+{
 	margin: 6px 0 0 0;
 	padding: 0;
 	text-align: right;
+}
 #register div.form div.fields div.field div.checkbox
+{
 	margin: 0 0 0 184px;
 	padding: 0;
+}
 #register div.form div.fields div.field div.checkbox label
+{
     color: #565656;
     font-weight: bold;
+}
 #register div.form div.fields div.buttons
+{
 	margin: 0;
 	padding: 10px 0 0 97px;
 	clear: both;
 	overflow: hidden;
 	border-top: 1px solid #DDDDDD;
 	text-align: left;
+}
 #register div.form div.fields div.buttons input
+{
 	margin: 0;
     color: #000000;
 	font-size: 1.0em;
     font-weight: bold;
 	font-family: Verdana, Helvetica, Sans-Serif;
+}
 #register div.form div.fields div.buttons input.ui-state-default
+{
     margin: 0;
     padding: 6px 12px 6px 12px;
     background: #e5e3e3 url("../images/button.png") repeat-x;
     border-top: 1px solid #DDDDDD;
     border-left: 1px solid #c6c6c6;
     border-right: 1px solid #DDDDDD;
     border-bottom: 1px solid #c6c6c6;
     color: #515151;
+}
 #register div.form div.fields div.buttons div.highlight input.ui-state-default
+{
 	background:url("../images/colors/blue/button_highlight.png") repeat-x scroll 0 0 #4E85BB;
 	border-color:#5C91A4 #2B7089 #1A6480 #2A6F89;
 	border-style:solid;
 	border-width:1px;
 	color:#FFFFFF;
+}
 #register div.form div.fields div.buttons input.ui-state-hover
+{
     margin: 0;
     padding: 6px 12px 6px 12px;
     background: #b4b4b4 url("../images/button_selected.png") repeat-x;
     border-top: 1px solid #cccccc;
     border-left: 1px solid #bebebe;
     border-right: 1px solid #b1b1b1;
     border-bottom: 1px solid #afafaf;
     color: #515151;
+}
 /* -----------------------------------------------------------
 	SUMMARY
 ----------------------------------------------------------- */
 #clone_url{
 	border: none;
+}
 /* -----------------------------------------------------------
 	CHANGESETS
 ----------------------------------------------------------- */
 #changeset_content {
 	border:1px solid #CCCCCC;
 	padding:5px;
+}
 #changeset_content .container .wrapper {
 	width: 600px;
+}
 #changeset_content .container {
 	height: 120px;
+}
 #changeset_content .container .left {
 	float: left;
 	width: 70%;
 	padding-left: 5px;
+}
 #changeset_content .container .right {
 	float: right;
 	width: 25%;
 	text-align: right;
+}
 #changeset_content .container .left .date {
 	font-weight: bold;
+}
 #changeset_content .container .left .author {
+}
 #changeset_content .container .left .message {
 	font-style: italic;
 	color: #556CB5;
+}
 .cs_files {
+}
 .cs_files .cs_added {
 	background: url("/images/icons/page_white_add.png") no-repeat scroll 3px;
 	/*background-color:#BBFFBB;*/
 	height: 16px;
 	padding-left: 20px;
 	margin-top: 7px;
 	text-align: left;
+}
 .cs_files .cs_changed {
 	background: url("/images/icons/page_white_edit.png") no-repeat scroll
 px;
 	/*background-color: #FFDD88;*/
 	height: 16px;
 	padding-left: 20px;
 	margin-top: 7px;
 	text-align: left;
+}
 .cs_files .cs_removed {
 	background: url("/images/icons/page_white_delete.png") no-repeat scroll
 px;
 	/*background-color: #FF8888;*/
 	height: 16px;
 	padding-left: 20px;
 	margin-top: 7px;
 	text-align: left;
+}
 /* -----------------------------------------------------------
 	CHANGESETS - CANVAS
 ----------------------------------------------------------- */
 #graph {
 	overflow: hidden;
+}
 #graph_nodes {
 	width: 160px;
 	float: left;
 	margin-left:-50px;
 	margin-top: 5px;
+}
 #graph_content {
 	width: 800px;
 	float: left;
+}
 #graph_content .container_header {
 	border: 1px solid #CCCCCC;
 	padding:10px;
+}
 #graph_content .container .wrapper {
 	width: 600px;
+}
 #graph_content .container {
 	border-bottom: 1px solid #CCCCCC;
 	border-left: 1px solid #CCCCCC;
 	border-right: 1px solid #CCCCCC;
 	min-height: 90px;
 	overflow: hidden;
 	font-size:1.2em;
+}
 #graph_content .container .left {
 	float: left;
 	width: 70%;
 	padding-left: 5px;
+}
 #graph_content .container .right {
 	float: right;
 	width: 25%;
 	text-align: right;
+}
 #graph_content .container .left .date {
 	font-weight: bold;
+}
 #graph_content .container .left .author {
+}
 #graph_content .container .left .message {
 	font-size: 100%;
 	padding-top: 3px;
+}
 .right div {
 	clear: both;
+}
 .right .changes .added,.changed,.removed {
 	border: 1px solid #DDDDDD;
 	display: block;
 	float: right;
 	font-size: 0.75em;
 	text-align: center;
 	min-width: 15px;
+}
 .right .changes .added {
 	background: #BBFFBB;
+}
 .right .changes .changed {
 	background: #FFDD88;
+}
 .right .changes .removed {
 	background: #FF8888;
+}
 .right .merge {
 	vertical-align: top;
 	font-size: 60%;
 	font-weight: bold;
+}
 .right .merge img {
 	vertical-align: bottom;
+}
 .right .parent {
 	font-size: 90%;
 	font-family: monospace;
+}
 /* -----------------------------------------------------------
 	FILE BROWSER
 ----------------------------------------------------------- */
 div.browserblock {
 	overflow: hidden;
 	padding: 0px;
 	border: 1px solid #ccc;
 	background: #f8f8f8;
 	font-size: 100%;
 	line-height: 100%;
 	/* new */
 	line-height: 125%;
+}
 div.browserblock .browser-header {
 	border-bottom: 1px solid #CCCCCC;
 	background: #FFFFFF;
 	color: blue;
 	padding: 10px 0 10px 0;
+}
 div.browserblock .browser-header span {
 	margin-left: 25px;
 	font-weight: bold;
+}
 div.browserblock .browser-body {
 	background: #EEEEEE;
+}
 table.code-browser {
 	border-collapse: collapse;
 	width: 100%;
+}
 table.code-browser tr {
 	margin: 3px;
+}
 table.code-browser thead th {
 	background-color: #EEEEEE;
 	height: 20px;
 	font-size: 1.1em;
 	font-weight: bold;
 	text-align: center;
 	text-align: left;
 	padding-left: 10px;
+}
 table.code-browser tbody tr {
+}
 table.code-browser tbody td {
 	padding-left: 10px;
 	height: 20px;
+}
 table.code-browser .browser-file {
 	background: url("/images/icons/document_16.png") no-repeat scroll 3px;
 	height: 16px;
 	padding-left: 20px;
 	text-align: left;
+}
 table.code-browser .browser-dir {
 	background: url("/images/icons/folder_16.png") no-repeat scroll 3px;
 	height: 16px;
 	padding-left: 20px;
 	text-align: left;
+}
 /* -----------------------------------------------------------
 	ADMIN - SETTINGS
 ----------------------------------------------------------- */
 #path_unlock{
 	color: red;
 	font-size: 1.2em;
 	padding-left: 4px;
+}
 /* -----------------------------------------------------------
     INFOBOX
 ----------------------------------------------------------- */
 .info_box *{
 	background:url("../../images/pager.png") repeat-x scroll 0 0 #EBEBEB;
 	border-color:#DEDEDE #C4C4C4 #C4C4C4 #CFCFCF;
 	border-style:solid;
 	border-width:1px;
 	color:#4A4A4A;
 	display:block;
 	font-weight:bold;
 	height:1%;
 	padding:4px 6px;
 	display: inline;
+}
 .info_box span{
     margin-left:3px;
     margin-righ:3px;
+}
 .info_box input#at_rev {
 	padding:1px 3px 3px 2px;
 	text-align:center;
+}
 .info_box input#view {
 	padding:0px 3px 2px 2px;
 	text-align:center;
+}
 /* -----------------------------------------------------------
     TOOLTIP
 ----------------------------------------------------------- */
 .yui-overlay,.yui-panel-container {
     visibility: hidden;
     position: absolute;
     z-index: 2;
+}
 .yui-tt {
     visibility: hidden;
     position: absolute;
     color: #666666;
     background-color: #FFFFFF;
     font-family: arial, helvetica, verdana, sans-serif;
     padding: 8px;
     border: 2px solid #556CB5;
     font: 100% sans-serif;
     width: auto;
     opacity: 1.0;
+}
 .yui-tt-shadow {
     display: none;
+}
 /* -----------------------------------------------------------
     AUTOCOMPLETE
 ----------------------------------------------------------- */
 .ac{
     vertical-align: top;
+}
 .ac .match {
     font-weight:bold;
+}
 .ac .yui-ac {
     position: relative;
     font-family: arial;
     font-size: 100%;
+}
 .ac .perm_ac{
     width:15em;
+}
 /* styles for input field */
 .ac .yui-ac-input {
     width: 100%;
+}
 /* styles for results container */
 .ac .yui-ac-container {
     position: absolute;
     top: 1.6em;
     width: 100%;
+}
 /* styles for header/body/footer wrapper within container */
 .ac .yui-ac-content {
     position: absolute;
     width: 100%;
     border: 1px solid #808080;
     background: #fff;
     overflow: hidden;
     z-index: 9050;
+}

pylons_app/templates/admin/settings/settings.html

➞

Show inline comments

@@ @@ -27,119 +27,119 @@ @@
         <!-- fields -->
         <div class="fields">
 			<div class="field">
 		        <div class="label label-checkbox">
 		            <label for="destroy">${_('rescan option')}:</label>
 		        </div>
 		        <div class="checkboxes">
 		            <div class="checkbox">
 		                ${h.checkbox('destroy',True)}
 		                <label for="checkbox-1">
 		                <span class="tooltip" tooltip_title="${h.tooltip(_('In case a repository was deleted from filesystem and there are leftovers in the database check this option to scan obsolete data in database and remove it.'))}">
 		                ${_('destroy old data')}</span> </label>
 		            </div>
 		        </div>
 			</div>
             <div class="buttons">
             ${h.submit('rescan','rescan repositories',class_="ui-button ui-widget ui-state-default ui-corner-all")}
             </div>
         </div>
     </div>
     ${h.end_form()}
     <h3>${_('Global application settings')}</h3>
     ${h.form(url('admin_setting', setting_id='global'),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label">
                     <label for="hg_app_title">${_('Application name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('hg_app_title',size=30)}
                 </div>
              </div>
             <div class="field">
                 <div class="label">
                     <label for="hg_app_realm">${_('Realm text')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('hg_app_realm',size=30)}
                 </div>
             </div>
             <div class="buttons">
                 ${h.submit('save','save settings',class_="ui-button ui-widget ui-state-default ui-corner-all")}
            </div>
         </div>
     </div>
     ${h.end_form()}
     <h3>${_('Mercurial settings')}</h3>
     ${h.form(url('admin_setting', setting_id='mercurial'),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="web_push_ssl">${_('Web')}:</label>
                 </div>
                 <div class="checkboxes">
 					<div class="checkbox">
 						${h.checkbox('web_push_ssl','true')}
 						<label for="web_push_ssl">${_('require ssl for pushing')}</label>
 					</div>
 				</div>
              </div>
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="web_push_ssl">${_('Hooks')}:</label>
                 </div>
                 <div class="checkboxes">
 					<div class="checkbox">
 						${h.checkbox('hooks_changegroup_update','True')}
 						<label for="hooks_changegroup_update">${_('Update repository after push (hg update)')}</label>
 					</div>
 					<div class="checkbox">
 						${h.checkbox('hooks_changegroup_repo_size','True')}
 						<label for="hooks_changegroup_repo_size">${_('Show repository size after push')}</label>
 					</div>
 				</div>
              </div>
             <div class="field">
                 <div class="label">
                     <label for="paths_root_path">${_('Repositories location')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('paths_root_path',size=30,readonly="readonly")}
 					<span id="path_unlock" class="tooltip" tooltip_title="${h.tooltip(_('This a crucial application setting. If You really sure you need to change this, you must restart application in order to make this settings take effect. Click this label to unlock.'))}">
                     ${h.text('paths_root_path',size=30,readonly="readonly")}
 					<span id="path_unlock" class="tooltip"
 						tooltip_title="${h.tooltip(_('This a crucial application setting. If You really sure you need to change this, you must restart application in order to make this settings take effect. Click this label to unlock.'))}">
 		                ${_('unlock')}</span>
                 </div>
             </div>
             <div class="buttons">
                 ${h.submit('save','save settings',class_="ui-button ui-widget ui-state-default ui-corner-all")}
            </div>
         </div>
     </div>
     ${h.end_form()}
     <script type="text/javascript">
         YAHOO.util.Event.onDOMReady(function(){
             YAHOO.util.Event.addListener('path_unlock','click',function(){
-                YAHOO.util.Dom.get('paths_root_path').readonly=false;
+                YAHOO.util.Dom.get('paths_root_path').removeAttribute('readonly');
             });
         });
     </script>
 </div>
 </%def>

pylons_app/templates/summary/summary.html

➞

Show inline comments

 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Mercurial Repository Overview')}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
     ${_('summary')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('summary')}
 </%def>
 <%def name="main()">
 <script type="text/javascript">
 var E = YAHOO.util.Event;
 var D = YAHOO.util.Dom;
 E.onDOMReady(function(e){
     id = 'clone_url';
     E.addListener(id,'click',function(e){
         D.get('clone_url').select();
     })
 })
 </script>
 <div class="box box-left">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
 	<div class="form">
 	  <div class="fields">
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Name')}:</label>
 			  </div>
 			  <div class="input-short">
 			      ${c.repo_info.name}
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Description')}:</label>
 			  </div>
 			  <div class="input-short">
 			      ${c.repo_info.description}
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Contact')}:</label>
 			  </div>
 			  <div class="input-short">
 			  	<div class="gravatar">
 			  		<img alt="gravatar" src="${h.gravatar_url(c.repo_info.dbrepo.user.email)}"/>
 			  	</div>
 			  		${_('Username')}: ${c.repo_info.dbrepo.user.username}<br/>
 			  		${_('Name')}: ${c.repo_info.dbrepo.user.name} ${c.repo_info.dbrepo.user.lastname}<br/>
 			  		${_('Email')}: <a href="mailto:${c.repo_info.dbrepo.user.email}">${c.repo_info.dbrepo.user.email}</a>
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Last change')}:</label>
 			  </div>
 			  <div class="input-short">
 			      ${h.age(c.repo_info.last_change)} - ${h.rfc822date(c.repo_info.last_change)}
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Clone url')}:</label>
 			  </div>
 			  <div class="input-short">
-			      <input type="text" id="clone_url"  readonly="readonly" value="hg clone ${c.clone_repo_url}" size="70"/>
 			      <input type="text" id="clone_url" readonly="readonly" value="hg clone ${c.clone_repo_url}" size="70"/>
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Download')}:</label>
 			  </div>
 			  <div class="input-short">
 		        %for cnt,archive in enumerate(c.repo_info._get_archives()):
 		             %if cnt >=1:
+		             |
 		             %endif
 		             ${h.link_to(c.repo_info.name+'.'+archive['type'],
 		                h.url('files_archive_home',repo_name=c.repo_info.name,
 		                revision='tip',fileformat=archive['extension']),class_="archive_icon")}
 		        %endfor
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Feeds')}:</label>
 			  </div>
 			  <div class="input-short">
 	            ${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.repo_info.name),class_='rss_icon')}
 	            ${h.link_to(_('Atom'),h.url('atom_feed_home',repo_name=c.repo_info.name),class_='atom_icon')}
 			  </div>
 			 </div>
 	  </div>
 	</div>
 </div>
 <div class="box box-right">
     <!-- box / title -->
     <div class="title">
         <h5>${_('Last month commit activity')}</h5>
     </div>
     <div class="table">
         <div id="commit_history" style="width:460px;height:370px;float:left"></div>
     	<div id="legend_data">
 	    	<div id="legend_container"></div>
 	    	<div id="legend_choices">
 				<table id="legend_choices_tables" style="font-size:smaller;color:#545454"></table>
 	    	</div>
     	</div>
 		<script type="text/javascript">
 		(function () {
 			var datasets = {${c.commit_data|n}};
 			var i = 0;
 		    var choiceContainer = YAHOO.util.Dom.get("legend_choices");
 		    var choiceContainerTable = YAHOO.util.Dom.get("legend_choices_tables");
 		    for(var key in datasets) {
 		        datasets[key].color = i;
 		        i++;
 		        choiceContainerTable.innerHTML += '<tr>'+
 		        									'<td>'+
 		        									'<input type="checkbox" name="' + key +'" checked="checked" />'+datasets[key].label+
 		        									'</td>'+
 		        								  '</tr>';
 		    };
 		    function plotAccordingToChoices() {
 		        var data = [];
 		        var inputs = choiceContainer.getElementsByTagName("input");
 		        for(var i=0; i<inputs.length; i++) {
 		            if(!inputs[i].checked)
 		                continue;
 		            var key = inputs[i].name;
 		            if (key && datasets[key])
 		                data.push(datasets[key]);
 		        };
 		        if (data.length > 0){
 				    var plot = YAHOO.widget.Flot("commit_history", data,
 					        { bars: { show: true, align:'center',lineWidth:4 },
 			    			  points: { show: true, radius:0,fill:true },
 			    			  legend:{show:true, container:"legend_container"},
 			    	          selection: { mode: "xy" },
 			    	          yaxis: {tickDecimals:0},
 				              xaxis: { mode: "time", timeformat: "%d",tickSize:[1, "day"],min:${c.ts_min},max:${c.ts_max} },
 				              grid: { hoverable: true, clickable: true,autoHighlight:true },
 					        });
 				    function showTooltip(x, y, contents) {
 				        var div=document.getElementById('tooltip');
 				        if(!div) {
 				            div = document.createElement('div');
 				            div.id="tooltip";
 				            div.style.position="absolute";
 				            div.style.border='1px solid #fdd';
 				            div.style.padding='2px';

0 comments (0 inline, 0 general)