Commit 813d52b6 authored by Olga Brani's avatar Olga Brani
Browse files

Various style fixes

Calender js bug fix
parent b217a79b
......@@ -29,7 +29,7 @@
.form-row .dk_options a:hover,
.form-row .dk_option_current a { text-shadow:none; background-color: #fff; text-decoration:none; color:#F89A1C}
.form-row .dk_toggle { height:17px; overflow:hidden; }
.form-row .dk_toggle span { padding-right:45px; }
.form-row .dk_toggle span { width:240px; overflow:hidden; display:block; }
/* end custom theme */
......
......@@ -228,7 +228,7 @@ a.button:hover { background-color: #F89A1C; border:0 none; color:#fff;}
/* Style for im/projects */
table.alt-style { color:#000; width:100%; }
table.alt-style caption { font-weight:normal; font-size:1.154em; margin-bottom:15px;}
table.alt-style caption { font-weight:normal; font-size:1.154em; margin-bottom:15px; text-transform:uppercase; }
table.alt-style tr th { font-weight:normal; color:#3582AC }
table.alt-style tr th a { color:#3582AC }
table.alt-style tr td { color:#222; }
......@@ -236,10 +236,10 @@ table.alt-style tr td:first-child,
table.alt-style tr th:first-child { padding-left:5px; }
table.alt-style tr td a { margin:0; }
table.alt-style tr td:first-child a { margin:0; }
table.alt-style tr th.sortable a { padding-right:20px; background:url(../images/arrow_th_bg.png) no-repeat right -48px; }
table.alt-style tr th.asc a { background-position:right 6px }
table.alt-style tr th.asc a { padding-right:20px; background:url(../images/arrow_th_bg.png) no-repeat right -48px; }
table.alt-style tr th.desc a { padding-right:20px; background:url(../images/arrow_th_bg.png) no-repeat right 6px; }
table.alt-style tr th:first-child,
table.alt-style tr td:first-child { width:40% }
table.alt-style tr td:first-child { width:30% }
.content a.submit { margin:0; display:inline-block; margin:10px 0 ; height:auto; min-width:100px; text-align:center;}
table.alt-style tr:nth-child(2n) td { background:#F2F2F2 }
dl.alt-style dt { width:30%; float:left; color:#3582AC; font-weight:normal;}
......
......@@ -157,58 +157,23 @@ $(document).ready(function() {
);
///if ($('.widjets'.length > 0)) {
///$('.widjets li div .txt').equalHeights();
///}
$(function() {
if($("#id_issue_date").length > 0 ){
$( "#id_issue_date" ).datepicker({
defaultDate: "+0",
dateFormat: "yy-mm-dd",
onSelect: function( selectedDate ) {
$( "#id_expiration_date" ).datepicker( "option", "minDate", selectedDate );
}
});
$( "#id_expiration_date" ).datepicker({
defaultDate: "+1w",
dateFormat: "yy-mm-dd",
onSelect: function( selectedDate ) {
$( "#id_issue_date" ).datepicker( "option", "maxDate", selectedDate );
}
});
}
if($("#id_issue_date_demo").length > 0 ){
$( "#id_issue_date_demo" ).datepicker({
defaultDate: "+0",
dateFormat: "yy-mm-dd",
onSelect: function( selectedDate ) {
$( "#id_expiration_date_demo" ).datepicker( "option", "minDate", selectedDate );
}
});
$( "#id_expiration_date_demo" ).datepicker({
defaultDate: "+1w",
dateFormat: "yy-mm-dd",
onSelect: function( selectedDate ) {
$( "#id_issue_date_demo" ).datepicker( "option", "maxDate", selectedDate );
}
});
}
$(function() {
$( "#id_start_date" ).datepicker({
minDate: 0,
defaultDate: "+0",
dateFormat: "yy-mm-dd",
onSelect: function( selectedDate ) {
$( "#id_start_date" ).datepicker( "option", "maxDate", selectedDate );
$( "#id_end_date" ).datepicker( "option", "minDate", selectedDate );
}
});
$( "#id_end_date" ).datepicker({
defaultDate: "+3w",
dateFormat: "yy-mm-dd",
onSelect: function( selectedDate ) {
$( "#id_end_date" ).datepicker( "option", "maxDate", selectedDate );
$( "#id_start_date" ).datepicker( "option", "maxDate", selectedDate );
}
});
});
......
......@@ -97,7 +97,7 @@
<dl class="alt-style">
{% for rp in object.projectresourcegrant_set.all %}
<dt>
Max {% if rp.resource.is_abbreviation %}{{ rp.resource.verbose_name|upper }}{% else %}{{ rp.resource.verbose_name }}{% endif %}{% if not q.unit %}s {% endif %} per user
Max {% if rp.resource.is_abbreviation %}{{ rp.resource.verbose_name|upper }}{% else %}{{ rp.resource.verbose_name }}{% endif %}{% if not rp.resource.unit %}s {% endif %} per user
</dt>
<dd>
{% if rp.member_capacity %}
......
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