# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 1319063771 -7200
# Node ID f0437ae274df3a58db3edc1b1051a70364b163cf
# Parent  e0b069468de0eb3e97e3921b1eb2be361677360e# Parent  9b80fb893e7f376bf15f68a284ebfaa52b96b7b8
Automated merge with https://bitbucket.org/marcinkuzminski/rhodecode

diff -r 9b80fb893e7f -r f0437ae274df rhodecode/templates/admin/repos_groups/repos_groups_add.html
--- a/rhodecode/templates/admin/repos_groups/repos_groups_add.html	Thu Oct 20 00:35:01 2011 +0200
+++ b/rhodecode/templates/admin/repos_groups/repos_groups_add.html	Thu Oct 20 00:36:11 2011 +0200
@@ -29,7 +29,7 @@
         <div class="fields">
              <div class="field">
                 <div class="label">
-                    <label for="users_group_name">${_('Group name')}:</label>
+                    <label for="group_name">${_('Group name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('group_name',class_='medium')}
@@ -38,7 +38,7 @@
              
             <div class="field">
                 <div class="label label-textarea">
-                    <label for="description">${_('Description')}:</label>
+                    <label for="group_description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${h.textarea('group_description',cols=23,rows=5,class_="medium")}
@@ -47,7 +47,7 @@
              
              <div class="field">
                  <div class="label">
-                     <label for="repo_group">${_('Group parent')}:</label>
+                     <label for="group_parent_id">${_('Group parent')}:</label>
                  </div>
                  <div class="input">
                      ${h.select('group_parent_id','',c.repo_groups,class_="medium")}
diff -r 9b80fb893e7f -r f0437ae274df rhodecode/templates/admin/repos_groups/repos_groups_edit.html
--- a/rhodecode/templates/admin/repos_groups/repos_groups_edit.html	Thu Oct 20 00:35:01 2011 +0200
+++ b/rhodecode/templates/admin/repos_groups/repos_groups_edit.html	Thu Oct 20 00:36:11 2011 +0200
@@ -29,7 +29,7 @@
         <div class="fields">
              <div class="field">
                 <div class="label">
-                    <label for="users_group_name">${_('Group name')}:</label>
+                    <label for="group_name">${_('Group name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('group_name',class_='medium')}
@@ -38,7 +38,7 @@
              
 	        <div class="field">
 	            <div class="label label-textarea">
-	                <label for="description">${_('Description')}:</label>
+	                <label for="group_description">${_('Description')}:</label>
 	            </div>
 	            <div class="textarea text-area editor">
 	                ${h.textarea('group_description',cols=23,rows=5,class_="medium")}
@@ -47,7 +47,7 @@
              
 	         <div class="field">
 	             <div class="label">
-	                 <label for="repo_group">${_('Group parent')}:</label>
+	                 <label for="group_parent_id">${_('Group parent')}:</label>
 	             </div>
 	             <div class="input">
 	                 ${h.select('group_parent_id','',c.repo_groups,class_="medium")}
diff -r 9b80fb893e7f -r f0437ae274df rhodecode/templates/admin/settings/settings.html
--- a/rhodecode/templates/admin/settings/settings.html	Thu Oct 20 00:35:01 2011 +0200
+++ b/rhodecode/templates/admin/settings/settings.html	Thu Oct 20 00:36:11 2011 +0200
@@ -34,7 +34,7 @@
 		        <div class="checkboxes">
 		            <div class="checkbox">
 		                ${h.checkbox('destroy',True)}
-		                <label for="checkbox-1">
+		                <label for="destroy">
 		                <span class="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>
@@ -56,12 +56,12 @@
         <div class="fields">
             <div class="field">
                 <div class="label label-checkbox">
-                    <label for="destroy">${_('index build option')}:</label>
+                    <label>${_('index build option')}:</label>
                 </div>
                 <div class="checkboxes">
                     <div class="checkbox">
                         ${h.checkbox('full_index',True)}
-                        <label for="checkbox-1">${_('build from scratch')}</label>
+                        <label for="full_index">${_('build from scratch')}</label>
                     </div>
                 </div>
             </div>
@@ -100,7 +100,7 @@
             
             <div class="field">
                 <div class="label">
-                    <label for="ga_code">${_('GA code')}:</label>
+                    <label for="rhodecode_ga_code">${_('GA code')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('rhodecode_ga_code',size=30)}
@@ -124,7 +124,7 @@
              
              <div class="field">
                 <div class="label label-checkbox">
-                    <label for="web_push_ssl">${_('Web')}:</label>
+                    <label>${_('Web')}:</label>
                 </div>
                 <div class="checkboxes">
 					<div class="checkbox">
@@ -136,7 +136,7 @@
 
              <div class="field">
                 <div class="label label-checkbox">
-                    <label for="web_push_ssl">${_('Hooks')}:</label>
+                    <label>${_('Hooks')}:</label>
                 </div>
                 <div class="input">
                     ${h.link_to(_('advanced setup'),url('admin_edit_setting',setting_id='hooks'))}
diff -r 9b80fb893e7f -r f0437ae274df rhodecode/templates/admin/users/user_edit.html
--- a/rhodecode/templates/admin/users/user_edit.html	Thu Oct 20 00:35:01 2011 +0200
+++ b/rhodecode/templates/admin/users/user_edit.html	Thu Oct 20 00:36:11 2011 +0200
@@ -132,7 +132,7 @@
         <div class="fields">
              <div class="field">
                 <div class="label label-checkbox">
-                    <label for="">${_('Create repositories')}:</label>
+                    <label for="create_repo_perm">${_('Create repositories')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('create_repo_perm',value=True)}
diff -r 9b80fb893e7f -r f0437ae274df rhodecode/templates/admin/users_groups/users_group_edit.html
--- a/rhodecode/templates/admin/users_groups/users_group_edit.html	Thu Oct 20 00:35:01 2011 +0200
+++ b/rhodecode/templates/admin/users_groups/users_group_edit.html	Thu Oct 20 00:36:11 2011 +0200
@@ -253,7 +253,7 @@
         <div class="fields">
              <div class="field">
                 <div class="label label-checkbox">
-                    <label for="">${_('Create repositories')}:</label>
+                    <label for="create_repo_perm">${_('Create repositories')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('create_repo_perm',value=True)}