# HG changeset patch # User Mads Kiilerich # Date 1438350247 -7200 # Node ID 40cfdd004bf60a0b8d7e8396e6ed54ce57de43e3 # Parent 2b1928873c0adaf0a4c33bbc61c1c47b992617d8 css: match on the readonly-ness instead of explicitly setting 'disabled' class on input elements Note: the 'disabled' class is 'readonly' and different from the html/css 'disabled' concept. diff -r 2b1928873c0a -r 40cfdd004bf6 kallithea/public/css/style.css --- a/kallithea/public/css/style.css Fri Jul 31 15:44:07 2015 +0200 +++ b/kallithea/public/css/style.css Fri Jul 31 15:44:07 2015 +0200 @@ -1227,9 +1227,11 @@ padding: 7px 7px 6px; } +input[readonly], input.disabled { background-color: #F5F5F5 !important; } + #content div.box div.form div.fields div.field div.input input.small { width: 30%; } diff -r 2b1928873c0a -r 40cfdd004bf6 kallithea/templates/admin/my_account/my_account_profile.html --- a/kallithea/templates/admin/my_account/my_account_profile.html Fri Jul 31 15:44:07 2015 +0200 +++ b/kallithea/templates/admin/my_account/my_account_profile.html Fri Jul 31 15:44:07 2015 +0200 @@ -20,11 +20,9 @@ <% readonly = None %> - <% disabled = "" %>
%if c.user.extern_type != c.EXTERN_TYPE_INTERNAL: <% readonly = "readonly" %> - <% disabled = " disabled" %> ${_('Your user is in an external Source of Record; some details cannot be managed here')}. %endif
@@ -32,7 +30,7 @@
- ${h.text('username',class_='medium%s' % disabled, readonly=readonly)} + ${h.text('username',class_='medium', readonly=readonly)}
diff -r 2b1928873c0a -r 40cfdd004bf6 kallithea/templates/admin/settings/settings_vcs.html --- a/kallithea/templates/admin/settings/settings_vcs.html Fri Jul 31 15:44:07 2015 +0200 +++ b/kallithea/templates/admin/settings/settings_vcs.html Fri Jul 31 15:44:07 2015 +0200 @@ -64,7 +64,7 @@
- ${h.text('paths_root_path',size=60,readonly="readonly", class_="disabled")} + ${h.text('paths_root_path',size=60,readonly="readonly")}
@@ -74,7 +74,7 @@
%else: ## form still requires this but we cannot internally change it anyway - ${h.hidden('paths_root_path',size=30,readonly="readonly", class_="disabled")} + ${h.hidden('paths_root_path',size=30,readonly="readonly")} %endif
${h.submit('save',_('Save Settings'),class_="btn")} @@ -90,7 +90,6 @@ $('#path_unlock_icon').removeClass('icon-lock'); $('#path_unlock_icon').addClass('icon-lock-open-alt'); $('#paths_root_path').removeAttr('readonly'); - $('#paths_root_path').removeClass('disabled'); }); }); diff -r 2b1928873c0a -r 40cfdd004bf6 kallithea/templates/admin/users/user_edit_profile.html --- a/kallithea/templates/admin/users/user_edit_profile.html Fri Jul 31 15:44:07 2015 +0200 +++ b/kallithea/templates/admin/users/user_edit_profile.html Fri Jul 31 15:44:07 2015 +0200 @@ -18,12 +18,10 @@
<% readonly = None %> - <% disabled = "" %>
%if c.user.extern_type != c.EXTERN_TYPE_INTERNAL:
<% readonly = "readonly" %> - <% disabled = " disabled" %> ${_('This user is in an external Source of Record (%s); some details cannot be managed here.' % c.user.extern_type)}.
%endif @@ -33,7 +31,7 @@
- ${h.text('username',class_='medium%s' % disabled, readonly=readonly)} + ${h.text('username',class_='medium', readonly=readonly)}
@@ -51,7 +49,7 @@
- ${h.text('extern_type',class_='medium disabled',readonly="readonly")} + ${h.text('extern_type',class_='medium',readonly="readonly")}
@@ -60,7 +58,7 @@
- ${h.text('extern_name',class_='medium disabled',readonly="readonly")} + ${h.text('extern_name',class_='medium',readonly="readonly")}
@@ -69,7 +67,7 @@
- ${h.password('new_password',class_='medium%s' % disabled,readonly=readonly)} + ${h.password('new_password',class_='medium',readonly=readonly)}
@@ -78,7 +76,7 @@
- ${h.password('password_confirmation',class_="medium%s" % disabled,readonly=readonly)} + ${h.password('password_confirmation',class_="medium",readonly=readonly)}