kallithea Changeset - 6ff50754d22d

Changeset - 6ff50754d22d

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 14 years ago 2011-10-12 19:35:01
marcin@python-works.com

UX improvements

3 files changed with 21 insertions and 29 deletions:

rhodecode/public/css/style.css

rhodecode/templates/files/files_browser.html

rhodecode/templates/summary/summary.html

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -1865,109 +1865,96 @@ div.browserblock { @@
 overflow:hidden;
 border:1px solid #ccc;
 background:#f8f8f8;
 font-size:100%;
 line-height:125%;
 padding:0;
+}
 div.browserblock .browser-header {
 background:#FFF;
 padding:10px 0px 15px 0px;
 width: 100%;
+}
 div.browserblock .browser-nav {
 float:left
+}
 div.browserblock .browser-branch {
 float:left;
+}
 div.browserblock .browser-branch label {
 color:#4A4A4A;
 vertical-align:text-top;
+}
 div.browserblock .browser-header span {
 margin-left:5px;
 font-weight:700;
+}
 div.browserblock .browser-search{
 	clear:both;
 	padding:8px 8px 0px 5px;
 	height: 20px;
+}
 div.browserblock #node_filter_box {
+}
 div.browserblock .search_activate{
     float: left
+}
 div.browserblock .add_node{
     float: left;
     padding-left: 5px;
+}
 div.browserblock .search_activate #filter_activate,div.browserblock .add_node a{
 	vertical-align: sub;
 	border: 1px solid;
 	padding:2px;
 	-webkit-border-radius: 4px 4px 4px 4px;
 	-khtml-border-radius: 4px 4px 4px 4px;
 	-moz-border-radius: 4px 4px 4px 4px;
 	border-radius: 4px 4px 4px 4px;
 	background: url("../images/button.png") repeat-x scroll 0 0 #E5E3E3;
 	border-color: #DDDDDD #DDDDDD #C6C6C6 #C6C6C6;
 	color: #515151;
+}
 div.browserblock .search_activate a:hover,div.browserblock .add_node a:hover{
     text-decoration: none !important;
+}
 div.browserblock .browser-body {
 background:#EEE;
 border-top:1px solid #CCC;
+}
 table.code-browser {
 border-collapse:collapse;
 width:100%;
+}
 table.code-browser tr {
 margin:3px;
+}
 table.code-browser thead th {
 background-color:#EEE;
 height:20px;
 font-size:1.1em;
 font-weight:700;
 text-align:left;
 padding-left:10px;
+}
 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;
+}
 .diffblock .changeset_file{
 background:url("../images/icons/file.png") no-repeat scroll 3px;
 height:16px;
 padding-left:22px;
 text-align:left;
 font-size: 14px;
+}
 .diffblock .changeset_header{
 margin-left: 6px !important;
@@ @@ -2341,135 +2328,140 @@ opacity:0.6px; @@
 table#permissions_manage td.private_repo_msg {
 font-size:0.8em;
+}
 table#permissions_manage tr#add_perm_input td {
 vertical-align:middle;
+}
 div.gravatar {
 background-color:#FFF;
 border:1px solid #D0D0D0;
 float:left;
 margin-right:0.7em;
 padding:2px 2px 0;
 -webkit-border-radius: 6px;
 -khtml-border-radius: 6px;
 -moz-border-radius: 6px;
 border-radius: 6px;
+}
 div.gravatar img {
 -webkit-border-radius: 4px;
 -khtml-border-radius: 4px;
 -moz-border-radius: 4px;
 border-radius: 4px;
+}
 #header,#content,#footer {
 min-width:978px;
+}
 #content {
 clear:both;
 overflow:hidden;
 padding:14px 10px;
+}
 #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;
+}
 input.ui-button-small {
 .ui-button-small a:hover {
+}
 input.ui-button-small,.ui-button-small {
 background:#e5e3e3 url("../images/button.png") repeat-x !important;
 border-top:1px solid #DDD !important;
 border-left:1px solid #c6c6c6 !important;
 border-right:1px solid #DDD !important;
 border-bottom:1px solid #c6c6c6 !important;
 color:#515151 !important;
 outline:none !important;
 margin:0 !important;
 -webkit-border-radius: 4px 4px 4px 4px !important;
 -khtml-border-radius: 4px 4px 4px 4px !important;
 -moz-border-radius: 4px 4px 4px 4px !important;
 border-radius: 4px 4px 4px 4px !important;
 box-shadow: 0 1px 0 #ececec !important;
 cursor: pointer !important;
+}
 input.ui-button-small:hover {
 padding:0px 2px 1px 2px;
+}
 input.ui-button-small:hover,.ui-button-small:hover {
 background:#b4b4b4 url("../images/button_selected.png") repeat-x !important;
 border-top:1px solid #ccc !important;
 border-left:1px solid #bebebe !important;
 border-right:1px solid #b1b1b1 !important;
 border-bottom:1px solid #afafaf !important;
+}
 input.ui-button-small-blue {
 border-bottom:1px solid #afafaf !important;
 text-decoration: none;
+}
 input.ui-button-small-blue,.ui-button-small-blue {
 background:#4e85bb url("../images/button_highlight.png") repeat-x;
 border-top:1px solid #5c91a4;
 border-left:1px solid #2a6f89;
 border-right:1px solid #2b7089;
 border-bottom:1px solid #1a6480;
 color:#fff;
 -webkit-border-radius: 4px 4px 4px 4px;
 -khtml-border-radius: 4px 4px 4px 4px;
 -moz-border-radius: 4px 4px 4px 4px;
 border-radius: 4px 4px 4px 4px;
 box-shadow: 0 1px 0 #ececec;
 cursor: pointer;
 padding:0px 2px 1px 2px;
+}
 input.ui-button-small-blue:hover {
+}
 ins,div.options a:hover {
 text-decoration:none;
+}
 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 {
 border:none;
+}
 img.icon,.right .merge img {
 vertical-align:bottom;
+}
 #header ul#logged-user,#content div.box div.title ul.links,#content div.box div.message div.dismiss,#content div.box div.traffic div.legend ul {
 float:right;
 margin:0;
 padding:0;
+}
 #header #header-inner #home,#header #header-inner #logo,#content div.box ul.left,#content div.box ol.left,#content div.box div.pagination-left,div#commit_history,div#legend_data,div#legend_container,div#legend_choices {
 float:left;
+}
 #header #header-inner #quick li:hover ul ul,#header #header-inner #quick li:hover ul ul ul,#header #header-inner #quick li:hover ul ul ul ul,#content #left #menu ul.closed,#content #left #menu li ul.collapsed,.yui-tt-shadow {
 display:none;
+}
 #header #header-inner #quick li:hover ul,#header #header-inner #quick li li:hover ul,#header #header-inner #quick li li li:hover ul,#header #header-inner #quick li li li li:hover ul,#content #left #menu ul.opened,#content #left #menu li ul.expanded {
 display:block;
+}
 #content div.graph{
 padding:0 10px 10px;
+}
 #content div.box div.title ul.links li a:hover,#content div.box div.title ul.links li.ui-tabs-selected a {
 color:#bfe3ff;
+}
 #content div.box ol.lower-roman,#content div.box ol.upper-roman,#content div.box ol.lower-alpha,#content div.box ol.upper-alpha,#content div.box ol.decimal {
 margin:10px 24px 10px 44px;

rhodecode/templates/files/files_browser.html

➞

Show inline comments

 <%def name="file_class(node)">
 	%if node.is_file():
 		<%return "browser-file" %>
 	%else:
 		<%return "browser-dir"%>
 	%endif
 </%def>
 <div id="body" class="browserblock">
     <div class="browser-header">
 		<div class="browser-nav">
 			${h.form(h.url.current())}
 			<div class="info_box">
 	          <span class="rev">${_('view')}@rev</span>
-	          <a class="rev" href="${c.url_prev}" title="${_('previous revision')}">&laquo;</a>
+	          <a class="ui-button-small" href="${c.url_prev}" title="${_('previous revision')}">&laquo;</a>
 	          ${h.text('at_rev',value=c.changeset.revision,size=5)}
-	          <a class="rev" href="${c.url_next}" title="${_('next revision')}">&raquo;</a>
+	          <a class="ui-button-small" href="${c.url_next}" title="${_('next revision')}">&raquo;</a>
 	          ## ${h.submit('view',_('view'),class_="ui-button-small")}
 		    </div>
 			${h.end_form()}
 		</div>
 	    <div class="browser-branch">
 	       ${h.checkbox('stay_at_branch',c.changeset.branch,c.changeset.branch==c.branch)}
 	       <label>${_('follow current branch')}</label>
 	    </div>
         <div class="browser-search">
               <div id="search_activate_id" class="search_activate">
                   <a id="filter_activate" href="#">${_('search file list')}</a>
+                  <a class="ui-button-small" id="filter_activate" href="#">${_('search file list')}</a>
               </div>
               % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
                     <div  id="add_node_id" class="add_node">
                         <a href="${h.url('files_add_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path)}">${_('add new file')}</a>
                     <div id="add_node_id" class="add_node">
                         <a class="ui-button-small" href="${h.url('files_add_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path)}">${_('add new file')}</a>
                     </div>
               % endif
         <div>
             <div id="node_filter_box_loading" style="display:none">${_('Loading file list...')}</div>
             <div id="node_filter_box" style="display:none">
             ${h.files_breadcrumbs(c.repo_name,c.changeset.raw_id,c.files_list.path)}/<input type="text" value="type to search..." name="filter" size="25" id="node_filter" autocomplete="off">
             <script type="text/javascript">
             YUE.on('stay_at_branch','click',function(e){
                 if(e.target.checked){
                     var uri = "${h.url.current(branch='__BRANCH__')}"
                     uri = uri.replace('__BRANCH__',e.target.value);
                     window.location = uri;
+                }
                 else{
                     window.location = "${h.url.current()}";
+                }
             })
             var n_filter = YUD.get('node_filter');
             var F = YAHOO.namespace('node_filter');
             var url = '${h.url("files_nodelist_home",repo_name="__REPO__",revision="__REVISION__",f_path="__FPATH__")}';
             var node_url = '${h.url("files_home",repo_name="__REPO__",revision="__REVISION__",f_path="__FPATH__")}';
             url  = url.replace('__REPO__','${c.repo_name}');
             url  = url.replace('__REVISION__','${c.changeset.raw_id}');
             url  = url.replace('__FPATH__','${c.files_list.path}');
             node_url  = node_url.replace('__REPO__','${c.repo_name}');
             node_url  = node_url.replace('__REVISION__','${c.changeset.raw_id}');
             F.filterTimeout = null;
             var nodes = null;
             F.initFilter = function(){
               YUD.setStyle('node_filter_box_loading','display','');
               YUD.setStyle('search_activate_id','display','none');
               YUD.setStyle('add_node_id','display','none');
               YUC.initHeader('X-PARTIAL-XHR',true);
               YUC.asyncRequest('GET',url,{
                   success:function(o){
                   	nodes = JSON.parse(o.responseText);
                   	YUD.setStyle('node_filter_box_loading','display','none');

rhodecode/templates/summary/summary.html

➞

Show inline comments

@@ @@ -106,97 +106,97 @@ @@
 			  		${_('Username')}: ${c.dbrepo.user.username}<br/>
 			  		${_('Name')}: ${c.dbrepo.user.name} ${c.dbrepo.user.lastname}<br/>
 			  		${_('Email')}: <a href="mailto:${c.dbrepo.user.email}">${c.dbrepo.user.email}</a>
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Last change')}:</label>
 			  </div>
 			  <div class="input-short">
                   <b>${'r%s:%s' % (h.get_changeset_safe(c.rhodecode_repo,'tip').revision,
                             h.get_changeset_safe(c.rhodecode_repo,'tip').short_id)}</b> -
 			      <span class="tooltip" title="${c.rhodecode_repo.last_change}">
 			      ${h.age(c.rhodecode_repo.last_change)}</span><br/>
 			      ${_('by')} ${h.get_changeset_safe(c.rhodecode_repo,'tip').author}
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Clone url')}:</label>
 			  </div>
 			  <div class="input-short">
 			      <input type="text" id="clone_url" readonly="readonly" value="${c.rhodecode_repo.alias} clone ${c.clone_repo_url}" size="70"/>
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Trending source files')}:</label>
 			  </div>
 			  <div class="input-short">
 			    <div id="lang_stats"></div>
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Download')}:</label>
 			  </div>
 			  <div class="input-short">
 		        %if len(c.rhodecode_repo.revisions) == 0:
 		          ${_('There are no downloads yet')}
 		        %elif c.enable_downloads is False:
 		          ${_('Downloads are disabled for this repository')}
                     %if h.HasPermissionAll('hg.admin')('enable stats on from summary'):
-                        [${h.link_to(_('enable'),h.url('edit_repo',repo_name=c.repo_name))}]
+                        ${h.link_to(_('enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-button-small")}
                     %endif
 		        %else:
 			        ${h.select('download_options',c.rhodecode_repo.get_changeset().raw_id,c.download_options)}
 			        %for cnt,archive in enumerate(c.rhodecode_repo._get_archives()):
 			             %if cnt >=1:
+			             |
 			             %endif
 			             <span class="tooltip" title="${_('Download %s as %s') %('tip',archive['type'])}"
 			                  id="${archive['type']+'_link'}">${h.link_to(archive['type'],
 			                h.url('files_archive_home',repo_name=c.dbrepo.repo_name,
 			                fname='tip'+archive['extension']),class_="archive_icon")}</span>
 			        %endfor
                     <span style="vertical-align: bottom">
                         <input id="archive_subrepos" type="checkbox" name="subrepos"/> <span class="tooltip" title="${_('Check this to download archive with subrepos')}" >${_('with subrepos')}</span>
                     </span>
 			    %endif
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Feeds')}:</label>
 			  </div>
 			  <div class="input-short">
 			   %if c.rhodecode_user.username != 'default':
 	            ${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key),class_='rss_icon')}
 	            ${h.link_to(_('Atom'),h.url('atom_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key),class_='atom_icon')}
 	           %else:
                 ${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.dbrepo.repo_name),class_='rss_icon')}
                 ${h.link_to(_('Atom'),h.url('atom_feed_home',repo_name=c.dbrepo.repo_name),class_='atom_icon')}
 	           %endif
 			  </div>
 			 </div>
 	  </div>
 	</div>
   	<script type="text/javascript">
 	  	YUE.onDOMReady(function(e){
 	  	    id = 'clone_url';
 	  	    YUE.on(id,'click',function(e){
 	  	    	if(YUD.hasClass(id,'selected')){
 	  	    		return
+	  	    	}
 	  	    	else{
 	                YUD.addClass(id,'selected');
 	                YUD.get(id).select();
+	  	    	}
 	  	    })
@@ @@ -272,97 +272,97 @@ @@
   			tbl.appendChild(tr);
+		}
   		YUD.get('lang_stats').appendChild(tbl);
   		YUE.on('code_stats_show_more','click',function(){
   			l = YUD.getElementsByClassName('stats_hidden')
   			for (e in l){
   			    YUD.setStyle(l[e],'display','');
   			};
   			YUD.setStyle(YUD.get('code_stats_show_more'),
   					'display','none');
   		})
              var tmpl_links = {}
               %for cnt,archive in enumerate(c.rhodecode_repo._get_archives()):
                 tmpl_links['${archive['type']}'] = '${h.link_to(archive['type'],
                      h.url('files_archive_home',repo_name=c.dbrepo.repo_name,
                      fname='__CS__'+archive['extension'],subrepos='__SUB__'),class_="archive_icon")}';
               %endfor
              YUE.on(['download_options','archive_subrepos'],'change',function(e){
             	 var sm = YUD.get('download_options');
                  var new_cs = sm.options[sm.selectedIndex];
                  for(k in tmpl_links){
                 	 var s = YUD.get(k+'_link');
                 	 title_tmpl = "${_('Download %s as %s') % ('__CS_NAME__','__CS_EXT__')}";
                 	 s.title = title_tmpl.replace('__CS_NAME__',new_cs.text);
                 	 s.title = s.title.replace('__CS_EXT__',k);
                 	 var url = tmpl_links[k].replace('__CS__',new_cs.value);
                 	 var subrepos = YUD.get('archive_subrepos').checked
                 	 url = url.replace('__SUB__',subrepos);
                 	 s.innerHTML = url
+                 }
              });
   	</script>
 </div>
 <div class="box box-right"  style="min-height:455px">
     <!-- box / title -->
     <div class="title">
         <h5>${_('Commit activity by day / author')}</h5>
     </div>
     <div class="graph">
          <div style="padding:0 10px 10px 15px;font-size: 1.2em;">
          %if c.no_data:
            ${c.no_data_msg}
            %if h.HasPermissionAll('hg.admin')('enable stats on from summary'):
-                [${h.link_to(_('enable'),h.url('edit_repo',repo_name=c.repo_name))}]
+                ${h.link_to(_('enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-button-small")}
            %endif
         %else:
             ${_('Loaded in')} ${c.stats_percentage} %
         %endif
         </div>
         <div id="commit_history" style="width:450px;height:300px;float:left"></div>
         <div style="clear: both;height: 10px"></div>
         <div id="overview" style="width:450px;height:100px;float:left"></div>
     	<div id="legend_data" style="clear:both;margin-top:10px;">
 	    	<div id="legend_container"></div>
 	    	<div id="legend_choices">
 				<table id="legend_choices_tables" style="font-size:smaller;color:#545454"></table>
 	    	</div>
     	</div>
 		<script type="text/javascript">
 		/**
 		 * Plots summary graph
+		 *
 		 * @class SummaryPlot
 		 * @param {from} initial from for detailed graph
 		 * @param {to} initial to for detailed graph
 		 * @param {dataset}
 		 * @param {overview_dataset}
 		 */
 		function SummaryPlot(from,to,dataset,overview_dataset) {
 			var initial_ranges = {
 			    "xaxis":{
 				    "from":from,
 				   	"to":to,
 				},
 			};
 		    var dataset = dataset;
 		    var overview_dataset = [overview_dataset];
 		    var choiceContainer = YUD.get("legend_choices");
 		    var choiceContainerTable = YUD.get("legend_choices_tables");
 		    var plotContainer = YUD.get('commit_history');
 		    var overviewContainer = YUD.get('overview');
 		    var plot_options = {
 				bars: {show:true,align:'center',lineWidth:4},
 				legend: {show:true, container:"legend_container"},
 				points: {show:true,radius:0,fill:false},
 				yaxis: {tickDecimals:0,},
 				xaxis: {
 					mode: "time",
 					timeformat: "%d/%m",

0 comments (0 inline, 0 general)