changeset 2103:e82c04f52b9f beta

UI - added clone-url into edit form on /settings page - added help text into repo add/edit forms
author Marcin Kuzminski <marcin@python-works.com>
date Mon, 05 Mar 2012 05:17:07 +0200
parents 04d26165c3d9
children f21f66abb4f7
files 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
diffstat 4 files changed, 39 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/public/css/style.css	Mon Mar 05 02:46:08 2012 +0200
+++ b/rhodecode/public/css/style.css	Mon Mar 05 05:17:07 2012 +0200
@@ -185,6 +185,13 @@
 	border-bottom-right-radius: 8px;
 }
 
+.help-block {
+    color: #999999;
+    display: block;
+    margin-bottom: 0;
+    margin-top: 5px;
+}
+
 #header {
 	margin: 0;
 	padding: 0 10px;
@@ -2799,7 +2806,7 @@
 }
 
 .ac .perm_ac {
-	width: 15em;
+	width: 20em;
 }
 
 .ac .yui-ac-input {
--- a/rhodecode/templates/admin/repos/repo_add_base.html	Mon Mar 05 02:46:08 2012 +0200
+++ b/rhodecode/templates/admin/repos/repo_add_base.html	Mon Mar 05 05:17:07 2012 +0200
@@ -21,6 +21,7 @@
             </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">
@@ -29,6 +30,7 @@
              </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">
@@ -37,6 +39,7 @@
             </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">
@@ -44,15 +47,17 @@
                 <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">
--- a/rhodecode/templates/admin/repos/repo_edit.html	Mon Mar 05 02:46:08 2012 +0200
+++ b/rhodecode/templates/admin/repos/repo_edit.html	Mon Mar 05 05:17:07 2012 +0200
@@ -41,6 +41,7 @@
 	           </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">
@@ -49,6 +50,7 @@
 	            </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">
@@ -64,16 +66,18 @@
                     <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">
@@ -82,6 +86,7 @@
                 </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">
@@ -90,15 +95,17 @@
                 </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>
--- a/rhodecode/templates/settings/repo_settings.html	Mon Mar 05 02:46:08 2012 +0200
+++ b/rhodecode/templates/settings/repo_settings.html	Mon Mar 05 05:17:07 2012 +0200
@@ -34,12 +34,22 @@
                     ${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">
@@ -47,16 +57,18 @@
                     <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>