Skip to content
GitLab
Commit 9fc319b5 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

CSS fixes, removed IE7/Opera hacks from breezy (kept them in legacy for now)

parent 00dad53a
dev 6342-update-the-locales-for-1-5 6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen 6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account 6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock 6378-orcid-test-method-is-wrong-and-break-orcid-saving core-php8 master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3 fusiondirectory-1.2.3 fusiondirectory-1.2.2 fusiondirectory-1.2.1 fusiondirectory-1.2 fusiondirectory-1.1.1 fusiondirectory-1.1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 34 additions and 57 deletions
+34 -57
html/include/datepicker.js
+ 8
− 8
View file @ 9fc319b5
......@@ -304,9 +304,9 @@ DatePicker.prototype = {
this._id_datepicker = 'datepicker-'+ this._relative;
this._id_datepicker_prev = this._id_datepicker +'-prev';
this._id_datepicker_prev_year = this._id_datepicker +'-prev-year';
this._id_datepicker_prev-year = this._id_datepicker +'-prev-year';
this._id_datepicker_next = this._id_datepicker +'-next';
this._id_datepicker_next_year = this._id_datepicker +'-next-year';
this._id_datepicker_next-year = this._id_datepicker +'-next-year';
this._id_datepicker_hdr = this._id_datepicker +'-header';
this._id_datepicker_ftr = this._id_datepicker +'-footer';
......@@ -317,7 +317,7 @@ DatePicker.prototype = {
style : 'display: none; z-index:'+ this._zindex });
// this._div.innerHTML = '<table><thead><tr><th width="10px" id="'+ this._id_datepicker_prev +'" style="cursor: pointer;">&nbsp;&lt;&lt;&nbsp;</th><th id="'+ this._id_datepicker_hdr +'" colspan="5"></th><th width="10px" id="'+ this._id_datepicker_next +'" style="cursor: pointer;">&nbsp;&gt;&gt;&nbsp;</th></tr></thead><tbody id="'+ this._id_datepicker +'-tbody"></tbody><tfoot><td colspan="7" id="'+ this._id_datepicker_ftr +'"></td></tfoot></table>';
this._div.innerHTML = '<div class="datepicker-header"><table class="header"><tr><td id="'+ this._id_datepicker_prev_year +'" class="prev_year"> << </td><td id="'+ this._id_datepicker_prev +'" class="prev"> < </td><td id="'+ this._id_datepicker_hdr +'" class="header"></td><td id="'+ this._id_datepicker_next +'" class="next"> > </td><td id="'+ this._id_datepicker_next_year +'" class="next_year"> >> </td></tr></table></div><div class="datepicker-calendar"><table class="body"><tbody id="'+ this._id_datepicker +'-tbody"></tbody></table></div><div id="'+ this._id_datepicker_ftr +'" class="datepicker-footer"></div>';
this._div.innerHTML = '<div class="datepicker-header"><table class="header"><tr><td id="'+ this._id_datepicker_prev-year +'" class="prev-year"> << </td><td id="'+ this._id_datepicker_prev +'" class="prev"> < </td><td id="'+ this._id_datepicker_hdr +'" class="header"></td><td id="'+ this._id_datepicker_next +'" class="next"> > </td><td id="'+ this._id_datepicker_next-year +'" class="next-year"> >> </td></tr></table></div><div class="datepicker-calendar"><table class="body"><tbody id="'+ this._id_datepicker +'-tbody"></tbody></table></div><div id="'+ this._id_datepicker_ftr +'" class="datepicker-footer"></div>';
/* Build the datepicker icon */
var datepickeropener = Builder.node('table',{className : "datepicker-opener-table", id: this._id_datepicker + '_image'});
......@@ -398,9 +398,9 @@ DatePicker.prototype = {
/* declare the observers for UI control */
Event.observe($(this._id_datepicker_prev), 'click', this.prevMonth.bindAsEventListener(this), false);
Event.observe($(this._id_datepicker_prev_year), 'click', this.prevYear.bindAsEventListener(this), false);
Event.observe($(this._id_datepicker_prev-year), 'click', this.prevYear.bindAsEventListener(this), false);
Event.observe($(this._id_datepicker_next), 'click', this.nextMonth.bindAsEventListener(this), false);
Event.observe($(this._id_datepicker_next_year), 'click', this.nextYear.bindAsEventListener(this), false);
Event.observe($(this._id_datepicker_next-year), 'click', this.nextYear.bindAsEventListener(this), false);
Event.observe($(this._id_datepicker_ftr), 'click', this.close.bindAsEventListener(this), false);
},
......@@ -666,7 +666,7 @@ DatePicker.prototype = {
if ( compareresult ) {
doBind = true;
} else {
td.className= ( h_ij_c ) ? 'nclick_outbound' : 'nclick';
td.className= ( h_ij_c ) ? 'nclick-outbound' : 'nclick';
}
} else {
doBind = true;
......@@ -779,7 +779,7 @@ DatePicker.prototype = {
/* prev year link */
var a_prevy = this._prevYear();
$(this._id_datepicker_prev_year).setAttribute('title', this.getMonthLocale(a_prevy[0]) +' '+ a_prevy[1]);
$(this._id_datepicker_prev-year).setAttribute('title', this.getMonthLocale(a_prevy[0]) +' '+ a_prevy[1]);
/* prev link */
var a_prev = this._prevMonthYear();
......@@ -791,7 +791,7 @@ DatePicker.prototype = {
/* next year link */
var a_nexty = this._nextYear();
$(this._id_datepicker_next_year).setAttribute('title', this.getMonthLocale(a_nexty[0]) +' '+ a_nexty[1]);
$(this._id_datepicker_next-year).setAttribute('title', this.getMonthLocale(a_nexty[0]) +' '+ a_nexty[1]);
/* header */
$(this._id_datepicker_hdr).update('&nbsp;&nbsp;&nbsp;'+ this.getMonthLocale(this._current_mon) +'&nbsp;'+ this._current_year +'&nbsp;&nbsp;&nbsp;');
......
html/themes/breezy/datepicker.css
+ 13
− 33
View file @ 9fc319b5
div.datepicker {
position: absolute;
text-align: center;
......@@ -36,14 +35,14 @@ border-spacing:0;
border-collapse: collapse;
}
td.prev,td.prev_year,td.next,td.next_year {
td.prev,td.prev-year,td.next,td.next-year {
width: 8%;
cursor: pointer;
font-weight: bold;
line-height: 16px;
}
td.prev:hover,td.prev_year:hover,td.next:hover,td.next_year:hover {
td.prev:hover,td.prev-year:hover,td.next:hover,td.next-year:hover {
background-color: #D0D0D0;
}
......@@ -75,7 +74,9 @@ width: 21px;
cursor: pointer;
}
div.datepicker-calendar table tbody tr td:hover,div.datepicker-calendar table tbody tr td.outbound:hover,div.datepicker-calendar table tbody tr td.today:hover {
div.datepicker-calendar table tbody tr td:hover,
div.datepicker-calendar table tbody tr td.outbound:hover,
div.datepicker-calendar table tbody tr td.today:hover {
border: 1px #CCE9FF solid;
background: #E9F5FF;
cursor: pointer;
......@@ -95,7 +96,8 @@ div.datepicker-calendar table tbody tr td.outbound {
background: #F4F3F3;
}
div.datepicker-calendar table tbody tr td.today {
div.datepicker-calendar table tbody tr td.today,
div.datepicker-calendar table tbody tr td.today:hover {
border: 1px #CCE9FF solid;
background: #E9F5FF;
background-image: url(../../images/date_active.png);
......@@ -105,14 +107,8 @@ height: 16px;
line-height: 16px;
}
div.datepicker-calendar table tbody tr td.today:hover {
border: 1px #CCE9FF solid;
background: #E9F5FF;
background-image: url(../../images/date_active.png);
background-repeat: no-repeat;
}
div.datepicker-calendar table tbody tr td.nclick,div.datepicker-calendar table tbody tr td.nclick_outbound {
div.datepicker-calendar table tbody tr td.nclick,
div.datepicker-calendar table tbody tr td.nclick-outbound {
cursor: default;
color: #aaa;
width: 21px;
......@@ -120,19 +116,20 @@ height: 16px;
line-height: 16px;
}
div.datepicker-calendar table tbody tr td.nclick_outbound {
div.datepicker-calendar table tbody tr td.nclick-outbound {
background: #E8E4E4;
width: 21px;
height: 16px;
line-height: 16px;
}
div.datepicker-calendar table tbody tr td.nclick:hover,div.datepicker-calendar table tbody tr td.nclick_outbound:hover {
div.datepicker-calendar table tbody tr td.nclick:hover,
div.datepicker-calendar table tbody tr td.nclick-outbound:hover {
border: 1px #EAEAEA solid;
background: #fcfcfc;
}
div.datepicker-calendar table tbody tr td.nclick_outbound:hover {
div.datepicker-calendar table tbody tr td.nclick-outbound:hover {
background: #E8E4E4;
}
......@@ -168,23 +165,6 @@ html.rtl .datepicker-opener-table {
margin: 0 93px 0 0;
}
.Opera .datepicker-opener-table {
float: right;
}
html.rtl .Opera .datepicker-opener-table {
float: left;
}
.IE7 .datepicker-opener-table {
position: relative;
top:0;
left: 3px;
}
html.rtl .IE7 .datepicker-opener-table {
right: 3px;
left: auto;
}
.datepicker-opener {
width: 16px;
height: 16px;
......
html/themes/legacy/datepicker.css
+ 13
− 16
View file @ 9fc319b5
div.datepicker {
position: absolute;
text-align: center;
......@@ -36,14 +35,14 @@ border-spacing: 0;
border-collapse: collapse;
}
td.prev,td.prev_year,td.next,td.next_year {
td.prev,td.prev-year,td.next,td.next-year {
width: 8%;
cursor: pointer;
font-weight: bold;
line-height: 16px;
}
td.prev:hover,td.prev_year:hover,td.next:hover,td.next_year:hover {
td.prev:hover,td.prev-year:hover,td.next:hover,td.next-year:hover {
background-color: #D0D0D0;
}
......@@ -75,7 +74,9 @@ width: 21px;
cursor: pointer;
}
div.datepicker-calendar table tbody tr td:hover,div.datepicker-calendar table tbody tr td.outbound:hover,div.datepicker-calendar table tbody tr td.today:hover {
div.datepicker-calendar table tbody tr td:hover,
div.datepicker-calendar table tbody tr td.outbound:hover,
div.datepicker-calendar table tbody tr td.today:hover {
border: 1px #CCE9FF solid;
background: #E9F5FF;
cursor: pointer;
......@@ -95,7 +96,8 @@ div.datepicker-calendar table tbody tr td.outbound {
background: #F4F3F3;
}
div.datepicker-calendar table tbody tr td.today {
div.datepicker-calendar table tbody tr td.today,
div.datepicker-calendar table tbody tr td.today:hover {
border: 1px #CCE9FF solid;
background: #E9F5FF;
background-image: url(../../images/date_active.png);
......@@ -105,14 +107,8 @@ height: 16px;
line-height: 16px;
}
div.datepicker-calendar table tbody tr td.today:hover {
border: 1px #CCE9FF solid;
background: #E9F5FF;
background-image: url(../../images/date_active.png);
background-repeat: no-repeat;
}
div.datepicker-calendar table tbody tr td.nclick,div.datepicker-calendar table tbody tr td.nclick_outbound {
div.datepicker-calendar table tbody tr td.nclick,
div.datepicker-calendar table tbody tr td.nclick-outbound {
cursor: default;
color: #aaa;
width: 21px;
......@@ -120,19 +116,20 @@ height: 16px;
line-height: 16px;
}
div.datepicker-calendar table tbody tr td.nclick_outbound {
div.datepicker-calendar table tbody tr td.nclick-outbound {
background: #E8E4E4;
width: 21px;
height: 16px;
line-height: 16px;
}
div.datepicker-calendar table tbody tr td.nclick:hover,div.datepicker-calendar table tbody tr td.nclick_outbound:hover {
div.datepicker-calendar table tbody tr td.nclick:hover,
div.datepicker-calendar table tbody tr td.nclick-outbound:hover {
border: 1px #EAEAEA solid;
background: #FFF;
}
div.datepicker-calendar table tbody tr td.nclick_outbound:hover {
div.datepicker-calendar table tbody tr td.nclick-outbound:hover {
background: #E8E4E4;
}
......
Supports Markdown
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