kallithea Changeset - e82c04f52b9f

Changeset - e82c04f52b9f

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 14 years ago 2012-03-05 04:17:07
marcin@python-works.com

UI
- added clone-url into edit form on /settings page
- added help text into repo add/edit forms

4 files changed with 39 insertions and 8 deletions:

rhodecode/public/css/style.css

rhodecode/templates/admin/repos/repo_add_base.html

rhodecode/templates/admin/repos/repo_edit.html

rhodecode/templates/settings/repo_settings.html

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -92,192 +92,199 @@ h6 { @@
 ul.circle {
 	list-style-type: circle;
+}
 ul.disc {
 	list-style-type: disc;
+}
 ul.square {
 	list-style-type: square;
+}
 ol.lower-roman {
 	list-style-type: lower-roman;
+}
 ol.upper-roman {
 	list-style-type: upper-roman;
+}
 ol.lower-alpha {
 	list-style-type: lower-alpha;
+}
 ol.upper-alpha {
 	list-style-type: upper-alpha;
+}
 ol.decimal {
 	list-style-type: decimal;
+}
 div.color {
 	clear: both;
 	overflow: hidden;
 	position: absolute;
 	background: #FFF;
 	margin: 7px 0 0 60px;
 	padding: 1px 1px 1px 0;
+}
 div.color a {
 	width: 15px;
 	height: 15px;
 	display: block;
 	float: left;
 	margin: 0 0 0 1px;
 	padding: 0;
+}
 div.options {
 	clear: both;
 	overflow: hidden;
 	position: absolute;
 	background: #FFF;
 	margin: 7px 0 0 162px;
 	padding: 0;
+}
 div.options a {
 	height: 1%;
 	display: block;
 	text-decoration: none;
 	margin: 0;
 	padding: 3px 8px;
+}
 .top-left-rounded-corner {
 	-webkit-border-top-left-radius: 8px;
 	-khtml-border-radius-topleft: 8px;
 	-moz-border-radius-topleft: 8px;
 	border-top-left-radius: 8px;
+}
 .top-right-rounded-corner {
 	-webkit-border-top-right-radius: 8px;
 	-khtml-border-radius-topright: 8px;
 	-moz-border-radius-topright: 8px;
 	border-top-right-radius: 8px;
+}
 .bottom-left-rounded-corner {
 	-webkit-border-bottom-left-radius: 8px;
 	-khtml-border-radius-bottomleft: 8px;
 	-moz-border-radius-bottomleft: 8px;
 	border-bottom-left-radius: 8px;
+}
 .bottom-right-rounded-corner {
 	-webkit-border-bottom-right-radius: 8px;
 	-khtml-border-radius-bottomright: 8px;
 	-moz-border-radius-bottomright: 8px;
 	border-bottom-right-radius: 8px;
+}
 .help-block {
     color: #999999;
     display: block;
     margin-bottom: 0;
     margin-top: 5px;
+}
 #header {
 	margin: 0;
 	padding: 0 10px;
+}
 #header ul#logged-user {
 	margin-bottom: 5px !important;
 	-webkit-border-radius: 0px 0px 8px 8px;
 	-khtml-border-radius: 0px 0px 8px 8px;
 	-moz-border-radius: 0px 0px 8px 8px;
 	border-radius: 0px 0px 8px 8px;
 	height: 37px;
     background-color: #eedc94;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1),
         to(#eedc94) );
     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(top, #003b76, #00376e);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b76',
         endColorstr='#00376e', GradientType=0 );
 	box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
+}
 #header ul#logged-user li {
 	list-style: none;
 	float: left;
 	margin: 8px 0 0;
 	padding: 4px 12px;
 	border-left: 1px solid #316293;
+}
 #header ul#logged-user li.first {
 	border-left: none;
 	margin: 4px;
+}
 #header ul#logged-user li.first div.gravatar {
 	margin-top: -2px;
+}
 #header ul#logged-user li.first div.account {
 	padding-top: 4px;
 	float: left;
+}
 #header ul#logged-user li.last {
 	border-right: none;
+}
 #header ul#logged-user li a {
 	color: #fff;
 	font-weight: 700;
 	text-decoration: none;
+}
 #header ul#logged-user li a:hover {
 	text-decoration: underline;
+}
 #header ul#logged-user li.highlight a {
 	color: #fff;
+}
 #header ul#logged-user li.highlight a:hover {
 	color: #FFF;
+}
 #header #header-inner {
 	min-height: 44px;
 	clear: both;
 	position: relative;
     background-color: #eedc94;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1),to(#eedc94) );
     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(top, #003b76, #00376e);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b76',endColorstr='#00376e', GradientType=0 );
 	margin: 0;
 	padding: 0;
 	display: block;
 	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;
 	-moz-border-radius: 4px 4px 4px 4px;
 	border-radius: 4px 4px 4px 4px;
+}
 #header #header-inner.hover{
 	position: fixed !important;
@@ @@ -2706,193 +2713,193 @@ table.code-browser .browser-dir { @@
 .box .search {
 	clear: both;
 	overflow: hidden;
 	margin: 0;
 	padding: 0 20px 10px;
+}
 .box .search div.search_path {
 	background: none repeat scroll 0 0 #EEE;
 	border: 1px solid #CCC;
 	color: blue;
 	margin-bottom: 10px;
 	padding: 10px 0;
+}
 .box .search div.search_path div.link {
 	font-weight: 700;
 	margin-left: 25px;
+}
 .box .search div.search_path div.link a {
 	color: #003367;
 	cursor: pointer;
 	text-decoration: none;
+}
 #path_unlock {
 	color: red;
 	font-size: 1.2em;
 	padding-left: 4px;
+}
 .info_box span {
 	margin-left: 3px;
 	margin-right: 3px;
+}
 .info_box .rev {
 	color: #003367;
 	font-size: 1.6em;
 	font-weight: bold;
 	vertical-align: sub;
+}
 .info_box input#at_rev,.info_box input#size {
 	background: #FFF;
 	border-top: 1px solid #b3b3b3;
 	border-left: 1px solid #b3b3b3;
 	border-right: 1px solid #eaeaea;
 	border-bottom: 1px solid #eaeaea;
 	color: #000;
 	font-size: 12px;
 	margin: 0;
 	padding: 1px 5px 1px;
+}
 .info_box input#view {
 	text-align: center;
 	padding: 4px 3px 2px 2px;
+}
 .yui-overlay,.yui-panel-container {
 	visibility: hidden;
 	position: absolute;
 	z-index: 2;
+}
 .yui-tt {
 	visibility: hidden;
 	position: absolute;
 	color: #666;
 	background-color: #FFF;
 	border: 2px solid #003367;
 	font: 100% sans-serif;
 	width: auto;
 	opacity: 1px;
 	padding: 8px;
 	white-space: pre-wrap;
 	-webkit-border-radius: 8px 8px 8px 8px;
 	-khtml-border-radius: 8px 8px 8px 8px;
 	-moz-border-radius: 8px 8px 8px 8px;
 	border-radius: 8px 8px 8px 8px;
 	box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
+}
 .ac {
 	vertical-align: top;
+}
 .ac .yui-ac {
 	position: relative;
 	font-size: 100%;
+}
 .ac .perm_ac {
-	width: 15em;
+	width: 20em;
+}
 .ac .yui-ac-input {
 	width: 100%;
+}
 .ac .yui-ac-container {
 	position: absolute;
 	top: 1.6em;
 	width: 100%;
+}
 .ac .yui-ac-content {
 	position: absolute;
 	width: 100%;
 	border: 1px solid gray;
 	background: #fff;
 	overflow: hidden;
 	z-index: 9050;
+}
 .ac .yui-ac-shadow {
 	position: absolute;
 	width: 100%;
 	background: #000;
 	-moz-opacity: 0.1px;
 	opacity: .10;
 	filter: alpha(opacity =     10);
 	z-index: 9049;
 	margin: .3em;
+}
 .ac .yui-ac-content ul {
 	width: 100%;
 	margin: 0;
 	padding: 0;
+}
 .ac .yui-ac-content li {
 	cursor: default;
 	white-space: nowrap;
 	margin: 0;
 	padding: 2px 5px;
+}
 .ac .yui-ac-content li.yui-ac-prehighlight {
 	background: #B3D4FF;
+}
 .ac .yui-ac-content li.yui-ac-highlight {
 	background: #556CB5;
 	color: #FFF;
+}
 .follow {
 	background: url("../images/icons/heart_add.png") no-repeat scroll 3px;
 	height: 16px;
 	width: 20px;
 	cursor: pointer;
 	display: block;
 	float: right;
 	margin-top: 2px;
+}
 .following {
 	background: url("../images/icons/heart_delete.png") no-repeat scroll 3px;
 	height: 16px;
 	width: 20px;
 	cursor: pointer;
 	display: block;
 	float: right;
 	margin-top: 2px;
+}
 .currently_following {
 	padding-left: 10px;
 	padding-bottom: 5px;
+}
 .add_icon {
 	background: url("../images/icons/add.png") no-repeat scroll 3px;
 	padding-left: 20px;
 	padding-top: 0px;
 	text-align: left;
+}
 .edit_icon {
 	background: url("../images/icons/folder_edit.png") no-repeat scroll 3px;
 	padding-left: 20px;
 	padding-top: 0px;
 	text-align: left;
+}
 .delete_icon {
 	background: url("../images/icons/delete.png") no-repeat scroll 3px;
 	padding-left: 20px;

rhodecode/templates/admin/repos/repo_add_base.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 ${h.form(url('repos'))}
 <div class="form">
     <!-- fields -->
     <div class="fields">
         <div class="field">
             <div class="label">
                 <label for="repo_name">${_('Name')}:</label>
             </div>
             <div class="input">
                 ${h.text('repo_name',c.new_repo,class_="small")}
                 %if not h.HasPermissionAll('hg.admin')('repo create form'):
                     ${h.hidden('user_created',True)}
                 %endif
             </div>
          </div>
         <div class="field">
             <div class="label">
                 <label for="clone_uri">${_('Clone from')}:</label>
             </div>
             <div class="input">
                 ${h.text('clone_uri',class_="small")}
                 <span class="help-block">${_('Optional http[s] url from which repository should be cloned.')}</span>
             </div>
          </div>
          <div class="field">
              <div class="label">
                  <label for="repo_group">${_('Repository group')}:</label>
              </div>
              <div class="input">
                  ${h.select('repo_group','',c.repo_groups,class_="medium")}
                  <span class="help-block">${_('Optional select a group to put this repository into.')}</span>
              </div>
          </div>
         <div class="field">
             <div class="label">
                 <label for="repo_type">${_('Type')}:</label>
             </div>
             <div class="input">
                 ${h.select('repo_type','hg',c.backends,class_="small")}
                 <span class="help-block">${_('Type of repository to create.')}</span>
             </div>
          </div>
         <div class="field">
             <div class="label label-textarea">
                 <label for="description">${_('Description')}:</label>
             </div>
             <div class="textarea text-area editor">
                 ${h.textarea('description',cols=23,rows=5)}
                 ${h.textarea('description')}
                 <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span>
             </div>
          </div>
         <div class="field">
             <div class="label label-checkbox">
                 <label for="private">${_('Private')}:</label>
+                <label for="private">${_('Private repository')}:</label>
             </div>
             <div class="checkboxes">
                 ${h.checkbox('private',value="True")}
                 <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
             </div>
          </div>
         <div class="buttons">
           ${h.submit('add',_('add'),class_="ui-button")}
         </div>
     </div>
 </div>
 ${h.end_form()}

rhodecode/templates/admin/repos/repo_edit.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Edit repository')} ${c.repo_info.repo_name} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Repositories'),h.url('repos'))}
     &raquo;
     ${_('edit')} &raquo; ${h.link_to(c.repo_info.just_name,h.url('summary_home',repo_name=c.repo_name))}
 </%def>
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box box-left">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('repo', 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">
                     ${h.text('repo_name',class_="medium")}
                 </div>
            </div>
 	       <div class="field">
 	           <div class="label">
 	               <label for="clone_uri">${_('Clone uri')}:</label>
 	           </div>
 	           <div class="input">
 	               ${h.text('clone_uri',class_="medium")}
                  <span class="help-block">${_('Optional http[s] url from which repository should be cloned.')}</span>
 	           </div>
 	        </div>
 	        <div class="field">
 	            <div class="label">
 	                <label for="repo_group">${_('Repository group')}:</label>
 	            </div>
 	            <div class="input">
 	                ${h.select('repo_group','',c.repo_groups,class_="medium")}
                     <span class="help-block">${_('Optional select a group to put this repository into.')}</span>
 	            </div>
 	        </div>
             <div class="field">
                 <div class="label">
                     <label for="repo_type">${_('Type')}:</label>
                 </div>
                 <div class="input">
                     ${h.select('repo_type','hg',c.backends,class_="medium")}
                 </div>
             </div>
             <div class="field">
                 <div class="label label-textarea">
                     <label for="description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${h.textarea('description',cols=23,rows=5)}
                     ${h.textarea('description')}
                     <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span>
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="private">${_('Private')}:</label>
+                    <label for="private">${_('Private repository')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('private',value="True")}
                     <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="enable_statistics">${_('Enable statistics')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('enable_statistics',value="True")}
                     <span class="help-block">${_('Enable statistics window on summary page.')}</span>
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="enable_downloads">${_('Enable downloads')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('enable_downloads',value="True")}
                     <span class="help-block">${_('Enable download menu on summary page.')}</span>
                 </div>
             </div>
             <div class="field">
                 <div class="label">
                     <label for="user">${_('Owner')}:</label>
                 </div>
-                <div class="input input-small ac">
+                <div class="input input-medium ac">
                     <div class="perm_ac">
                        ${h.text('user',class_='yui-ac-input')}
                        <span class="help-block">${_('Change owner of this repository.')}</span>
                        <div id="owner_container"></div>
                     </div>
                 </div>
              </div>
             <div class="field">
                 <div class="label">
                     <label for="input">${_('Permissions')}:</label>
                 </div>
                 <div class="input">
                     <%include file="repo_edit_perms.html"/>
                 </div>
                 <div class="buttons">
                   ${h.submit('save','Save',class_="ui-button")}
                   ${h.reset('reset','Reset',class_="ui-button")}
                 </div>
             </div>
     </div>
     </div>
     ${h.end_form()}
 </div>
 <div class="box box-right">
     <div class="title">
         <h5>${_('Administration')}</h5>
     </div>
         <h3>${_('Statistics')}</h3>
         ${h.form(url('repo_stats', repo_name=c.repo_info.repo_name),method='delete')}
         <div class="form">
            <div class="fields">
                ${h.submit('reset_stats_%s' % c.repo_info.repo_name,_('Reset current statistics'),class_="ui-btn",onclick="return confirm('"+_('Confirm to remove current statistics')+"');")}
                <div class="field" style="border:none;color:#888">
                <ul>
                     <li>${_('Fetched to rev')}: ${c.stats_revision}/${c.repo_last_rev}</li>
                     <li>${_('Stats gathered')}: ${c.stats_percentage}%</li>
                </ul>
                </div>
            </div>
         </div>
         ${h.end_form()}
         %if c.repo_info.clone_uri:
         <h3>${_('Remote')}</h3>
         ${h.form(url('repo_pull', repo_name=c.repo_info.repo_name),method='put')}
         <div class="form">
            <div class="fields">
                ${h.submit('remote_pull_%s' % c.repo_info.repo_name,_('Pull changes from remote location'),class_="ui-btn",onclick="return confirm('"+_('Confirm to pull changes from remote side')+"');")}
                <div class="field" style="border:none">
                <ul>
                     <li><a href="${c.repo_info.clone_uri}">${c.repo_info.clone_uri}</a></li>
                </ul>
                </div>
            </div>
         </div>
         ${h.end_form()}
         %endif
         <h3>${_('Cache')}</h3>
         ${h.form(url('repo_cache', repo_name=c.repo_info.repo_name),method='delete')}
         <div class="form">
            <div class="fields">
                ${h.submit('reset_cache_%s' % c.repo_info.repo_name,_('Invalidate repository cache'),class_="ui-btn",onclick="return confirm('"+_('Confirm to invalidate repository cache')+"');")}
            </div>
         </div>
         ${h.end_form()}
         <h3>${_('Public journal')}</h3>
         ${h.form(url('repo_public_journal', repo_name=c.repo_info.repo_name),method='put')}
         <div class="form">
                 ${h.hidden('auth_token',str(h.get_token()))}
                 <div class="field">
                 %if c.in_public_journal:
                     ${h.submit('set_public_%s' % c.repo_info.repo_name,_('Remove from public journal'),class_="ui-btn")}
                 %else:
 		            ${h.submit('set_public_%s' % c.repo_info.repo_name,_('Add to public journal'),class_="ui-btn")}
 		        %endif
                 </div>
                <div class="field" style="border:none;color:#888">
                <ul>
                     <li>${_('''All actions made on this repository will be accessible to everyone in public journal''')}
                     </li>
                </ul>
                </div>
         </div>
         ${h.end_form()}
         <h3>${_('Delete')}</h3>
         ${h.form(url('repo', repo_name=c.repo_info.repo_name),method='delete')}
         <div class="form">
            <div class="fields">
                ${h.submit('remove_%s' % c.repo_info.repo_name,_('Remove this repository'),class_="ui-btn red",onclick="return confirm('"+_('Confirm to delete this repository')+"');")}
            </div>
            <div class="field" style="border:none;color:#888">
            <ul>

rhodecode/templates/settings/repo_settings.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${c.repo_name} ${_('Settings')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
     ${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 for="clone_uri">${_('Clone uri')}:</label>
 	           </div>
 	           <div class="input">
 	               ${h.text('clone_uri',class_="medium")}
                  <span class="help-block">${_('Optional http[s] url from which repository should be cloned.')}</span>
 	           </div>
 	        </div>
             <div class="field">
                 <div class="label">
                     <label for="repo_group">${_('Repository group')}:</label>
                 </div>
                 <div class="input">
                     ${h.select('repo_group','',c.repo_groups,class_="medium")}
                     <span class="help-block">${_('Optional select a group to put this repository into.')}</span>
                 </div>
             </div>
             <div class="field">
                 <div class="label label-textarea">
                     <label for="description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${h.textarea('description',cols=23,rows=5)}
                     ${h.textarea('description')}
                     <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span>
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="private">${_('Private')}:</label>
+                    <label for="private">${_('Private repository')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('private',value="True")}
                     <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
                 </div>
             </div>
              <div class="field">
                 <div class="label">
                     <label for="">${_('Permissions')}:</label>
                 </div>
                 <div class="input">
                     <%include file="../admin/repos/repo_edit_perms.html"/>
                 </div>
             <div class="buttons">
               ${h.submit('save','Save',class_="ui-button")}
               ${h.reset('reset','Reset',class_="ui-button")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 </div>
 </%def>

0 comments (0 inline, 0 general)