Commit 859b25f5 authored by Olga Brani's avatar Olga Brani
Browse files

Various fixes

Change placeholder for homepage url
parent f60ed653
......@@ -646,10 +646,10 @@ app_name_widget = forms.TextInput(
app_home_label = "Homepage URL"
app_home_placeholder = 'http://myteam.myinstitution.org/myproject/'
app_home_placeholder = 'myinstitution.org/myproject/'
app_home_help = _("""
URL pointing at your project's site.
e.g.: http://myteam.myinstitution.org/myproject.
e.g.: myinstitution.org/myproject/.
Leave blank if there is no website.""")
app_home_widget = forms.TextInput(
attrs={'placeholder': app_home_placeholder})
......
......@@ -92,6 +92,8 @@ form.withlabels .extra-img { left:485px; bottom:12px; }
form.innerlabels .extra-img { bottom:10px; left:290px }
form .with-checkbox .extra-img { }
form .with-errors .extra-img { background:url(../images/symbols.png) no-repeat -58px -3px; z-index:101;}
form .with-errors .extra-img:hover + span.info,
form .with-errors .extra-img:hover + span.info span { display:block; }
form .with-errors textarea+.extra-img,
form .with-errors noscript+.extra-img { background:transparent;}
form .with-errors input[type="text"],
......
......@@ -434,9 +434,16 @@ form.quotas-form span.info span { width:285px; }
.quotas-form .with-info .with-checkbox { margin-bottom:12px; }
.quotas-form .quota input[type="text"] { width:150px;}
.quotas-form .quota .error-msg { display:none; color:red; font-size:0.8em; margin:0; margin-left:224px; margin-bottom:5px; padding:5px; }
.quotas-form .quota .with-errors .error-msg { display:block;}
::-webkit-input-placeholder { color: #D4D4D4; font-style:italic; }
:-moz-placeholder { color: #D4D4D4;font-style:italic; }
.quotas-form .quota .with-errors .error-msg { display:block;}
form input[type="text"]::-webkit-input-placeholder,
form textarea::-webkit-input-placeholder { color: #D4D4D4; font-style:italic; }
form input[type="text"]:-moz-placeholder,
form textarea:-moz-placeholder { color: #D4D4D4; font-style:italic; }
form input[type="text"]::-moz-placeholder,
form textarea::-moz-placeholder { color: #D4D4D4; font-style:italic; }
form input[type="text"]:-ms-input-placeholder,
form textarea:-ms-input-placeholder { color: #D4D4D4; font-style:italic; }
/* stats */
.stats ul { margin:0; padding:0; list-style:none outside none; }
......
......@@ -12,8 +12,8 @@
(function ($, window, document) {
function fixLabel (lbl){
if ( lbl.length > 30 ) {
return lbl.substring(0,30)+'...';
if ( lbl.length > 26 ) {
return lbl.substring(0,26)+'...';
} else {
return lbl;
}
......
......@@ -60,6 +60,7 @@
{% if not rp.unit %}s {% endif %} per user
</dt>
<dd>
{% if rp.uplimit %}
{% if rp.unit %}
{{ rp.uplimit|sizeof_fmt }}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment