Skip to content
Snippets Groups Projects
Commit ab85f0ea authored by gnaegi's avatar gnaegi
Browse files

Merge with 7dc5c4bd5083bc64b56f8f379a142363dc666295

parents a3e20df2 0cae0cf2
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 97 additions and 41 deletions
src/main/java/org/olat/group/ui/main/_content/accept_reservations.html
+ 28
− 15
View file @ ab85f0ea
......@@ -2,25 +2,38 @@
#set($id = $reservation.key)
<div>
<div class="o_reservation b_clearfix">
<span class="o_reservation_name #if($reservation.accepted) o_reservation_accepted #elseif($reservation.refused) o_reservation_refused #end">
${reservation.name}
<div>
<span class="o_reservation_name b_with_small_icon_left b_group_icon">
${reservation.name}
</span>
#if($reservation.coach)
$r.translate("reservation.coach")
#end
</span>
<div class="o_buttons_box_right">
<a href="#" class="o_reservation_details_link" id="o_reservation_details_show_$id">$r.translate("show")</a>
<a href="#" class="o_reservation_details_link" id="o_reservation_details_hide_$id" style="display:none">$r.translate("hide")</a>
$r.render("accept_$id")
$r.render("reject_$id")
<span class="o_reservation_role_coach">
($r.translate("reservation.coach"))
</span>
#end
#if($reservation.accepted)
<span class="o_reservation_accepted">
$r.translate("confirm.accept")
</span>
#elseif($reservation.refused)
<span class="o_reservation_refused">
$r.translate("confirm.reject")
</span>
#end
<div class="b_float_right">
<a href="#" class="o_reservation_details_link" id="o_reservation_details_show_$id">$r.translate("show")</a>
<a href="#" class="o_reservation_details_link" id="o_reservation_details_hide_$id" style="display:none">$r.translate("hide")</a>
$r.render("accept_$id")
$r.render("reject_$id")
</div>
</div>
<div class="o_reservation_details" style="display: none" id="o_reservation_details_$id">
<div>
<strong>$r.translate("table.header.description")</strong>: $reservation.description
<div class="o_reservation_details_desc">
$reservation.description
</div>
<div>
#if($reservation.courses)
<strong>$r.translate("table.header.resources")</strong>:
<div class="o_reservation_details_resources">
#if(!$reservation.courses.isEmpty())
<strong>$r.translate("table.header.resources")</strong>
<ul>
#foreach($course in $reservation.courses)
<li class=""><span class="b_with_small_icon_left o_CourseModule_icon">$course</span></li>
......
src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties
+ 10
− 6
View file @ ab85f0ea
......@@ -79,7 +79,7 @@ table.header.leave.waiting=Verlassen
table.header.group.full=Voll belegt
table.header.mark=Favorit
table.header.type=Typ
table.header.resources=Kurs
table.header.resources=Kurse
table.header.role=Rolle
table.header.firstTime=Beitritt
table.header.lastTime=Zuletzt besucht
......@@ -119,7 +119,7 @@ notification.mail.removed.self.subject=Gruppe $groupname\: Sie haben sich ausget
notification.mail.removed.subject=Gruppe $groupname\: Sie wurden ausgetragen.
pending.reservations=Pending reservations
pending.reservations=<h4>Bestätigung Gruppenmitgliedschaften</h4>Sie wurden in die folgenden Gruppen eingeladen. Wählen Sie für jede aufgeführte Gruppe die Schaltfläche "$:accept" oder "$:reject" und schliessen Sie mit "$org.olat.core:ok" ab. Sie können die Bestätigung auch zu einem späteren Zeitpunkt durchführen, wählen Sie in dem Fall "$org.olat.core:cancel".
course.membership.creation=Kurs Beitritt
course.lastTime=Zuletzt geöffnet
......@@ -162,11 +162,15 @@ table.header.participants=Teilnehmer
table.header.waitingList=Warteliste
reservation.coach=als Betreuer
accept=Accept
reject=Reject
accept=Bestätigen
reject=Ablehnen
confirm.accept=Gruppenmitgliedschaft wird bestätigt
confirm.reject=Gruppenmitgliedschaft wird abgelehnt
nomembers=Es wurden keine Mitglieder gefunden die Ihren Kriterien entsprechen.
hide=Hide
show=Show
hide=Informationen ausblenden
show=Weitere Informationen
......
src/main/webapp/static/themes/openolat/all/_definitions.scss
+ 4
− 0
View file @ ab85f0ea
......@@ -30,6 +30,10 @@ $glossColor2 : #444 !default;
$glossColor3 : #222 !default;
$glossColor4 : #3C3C3C !default;
/* colors for ok (green) and not ok (red) in assessment, accept workflows etc */
$okcolor : #009900 !default;
$nokcolor : #990000 !default;
/* full screen margins. Set to 0% to have have no surrounding border at all */
$fullScreenModalMarginPercents: 2% !default;
......
src/main/webapp/static/themes/openolat/all/_icons.scss
+ 2
− 2
View file @ ab85f0ea
......@@ -255,8 +255,8 @@ li a.b_toolbox_copy, .b_copy_icon { background-image: url('../openolat/images/do
.o_midpub{ top: -2px; left: 9px; background-image: url('../openolat/images/decorator/deco_ok.png'); }
/* --- assessment and efficiency statement eff -- */
span.o_passed { background: url(../openolat/images/tick.png) no-repeat right 50%; padding: 0 25px 0 0; color: #009900; }
span.o_notpassed { background: url(../openolat/images/cross.png) no-repeat right 50%; padding: 0 25px 0 0; color: #990000; }
span.o_passed { background: url(../openolat/images/tick.png) no-repeat right 50%; padding: 0 25px 0 0; color: $okcolor; }
span.o_notpassed { background: url(../openolat/images/cross.png) no-repeat right 50%; padding: 0 25px 0 0; color: $nokcolor; }
.o_efficiencystatement_icon { background-image: url(../openolat/images/seal.png);}
span.o_green_led { background: url(../openolat/images/green_led.png) no-repeat left 50%; padding: 0 0 0 25px; }
......
src/main/webapp/static/themes/openolat/all/_mixins.scss
+ 1
− 1
View file @ ab85f0ea
......@@ -177,7 +177,7 @@
@include o-border-radius(2px);
white-space: nowrap;
cursor:pointer;
margin: 0 0.5em 0.5em 0;
margin: 0 0.5em 0 0;
padding: 0;
color: #444;
background: transparent;
......
src/main/webapp/static/themes/openolat/all/content.scss
+ 1
− 1
View file @ ab85f0ea
......@@ -229,7 +229,7 @@ div.b_form_auto_completer_item { background-color:#FFF; text-align: left; paddin
div.b_form_auto_completer_item.x-combo-selected { background-color: $basecolor_ultra_light; border-left:0 ! important; border-right:0 ! important;}
div.b_form_auto_completer_item span.b_key { color: #999; margin-right: 2px; }
div.b_form_auto_completer_item span.b_value { }
div.b_form_auto_completer_item.b_error_icon { color: #990000; font-style: italic;}
div.b_form_auto_completer_item.b_error_icon { color: $nokcolor; font-style: italic;}
/* ---------- smilies / emoticons in tinyMCE ------------------------ */
......
src/main/webapp/static/themes/openolat/all/modules/_formsandbuttons.scss
+ 12
− 3
View file @ ab85f0ea
......@@ -220,7 +220,7 @@ fieldset {
div.b_form {
div.b_form_desc { padding-bottom: 1em; font-style: italic;}
div.b_form_general_error { padding: 10px 10px 10px 50px; margin-bottom: 20px; text-align: left; background: url(../openolat/images/icon_error_32.png) no-repeat 10px 10px; min-height: 32px; border: 1px solid #990000; color: #990000; font-style: italic;}
div.b_form_general_error { padding: 10px 10px 10px 50px; margin-bottom: 20px; text-align: left; background: url(../openolat/images/icon_error_32.png) no-repeat 10px 10px; min-height: 32px; border: 1px solid $nokcolor; color: $nokcolor; font-style: italic;}
div.b_form_spacer { margin: 10px 0; }
hr {
......@@ -257,9 +257,9 @@ div.b_form {
/** errors **/
&.b_form_error {
input,select {border: 1px solid #990000; background: #ebcccc;}
input,select {border: 1px solid $nokcolor; background: #ebcccc;}
}
div.b_form_error_msg { clear: both; color: #990000; font-style: italic; display: block;}
div.b_form_error_msg { clear: both; color: $nokcolor; font-style: italic; display: block;}
div.b_form_element_wrapper {
margin: 0;
......@@ -389,5 +389,14 @@ div.b_mark {
}
/* Fix for firefox strange spacing in button and other input elements (http://stackoverflow.com/questions/5517744/remove-extra-button-spacing-padding-in-firefox) */
button::-moz-focus-inner,
input[type="reset"]::-moz-focus-inner,
input[type="button"]::-moz-focus-inner,
input[type="submit"]::-moz-focus-inner,
input[type="file"] > input[type="button"]::-moz-focus-inner {
padding: 0;
border: 0
}
\ No newline at end of file
src/main/webapp/static/themes/openolat/all/modules/_misc.scss
+ 33
− 7
View file @ ab85f0ea
......@@ -33,26 +33,52 @@ div.o_bcard_footer {text-align: right; clear: both; font-size: 95%; color:rgb(31
/* Resume reservations */
div.o_reservation {
position:relative;
padding-bottom: 15px;
margin-top: 2em;
padding: 1em;
background: #F7F7F7;
border:1px solid #eee;
@include o-border-radius(4px);
span.o_reservation_name {
padding-left: 20px;
font-weight: bold;
line-height: 2em;
}
span.o_reservation_role_coach {
margin-left: 1em;
}
span.o_reservation_accepted {
background: transparent url(../openolat/images/tick.png) top left no-repeat;
margin-left: 2em;
background: transparent url(../openolat/images/tick.png) 0 50% no-repeat;
color: $okcolor;
padding-left: 20px;
font-style: italic;
line-height: 2em;
}
span.o_reservation_refused {
background: transparent url(../openolat/images/cross.png) top left no-repeat;
margin-left: 2em;
background: transparent url(../openolat/images/cross.png) 0 50% no-repeat;
color: $nokcolor;
padding-left: 20px;
font-style: italic;
line-height: 2em;
}
a.o_reservation_details_link {
padding: 0 1em;
}
div.o_reservation_details {
padding: 5px 0 0 20px;
padding: 1em 0 0 0;
}
ul {
list-style:none;
padding:0;
margin:0;
li {
background-repeat: no-repeat;
padding:0;
margin:0;
}
}
}
......@@ -216,11 +242,11 @@ div.o_notifications_news_url { }
span.o_search_highlight { padding-left: 2em;}
}
#o_search_results_header.o_search_did_you_mean,
#o_search_results_header.o_search_no_results { background-image: url(../openolat/images/exclamation.png); color: #990000; }
#o_search_results_header.o_search_no_results { background-image: url(../openolat/images/exclamation.png); color: $nokcolor; }
#o_search_results_header.o_search_did_you_mean span.o_search_did_you_mean_words{ color: #000; font-weight: bold;}
#o_search_results_header #o_search_pageing { padding-left: 2em; display: inline; }
#o_search_pageing_bottom { text-align: center; background: #F8F8F8; border-bottom: 1px solid #eee; padding: 3px;}
#o_search_results_toomany { background: url(../openolat/images/exclamation.png) no-repeat center left #F8F8F8; color: #990000; padding: 5px 0 3px 20px; position: relative; top: -5px; margin-bottom: 5px;}
#o_search_results_toomany { background: url(../openolat/images/exclamation.png) no-repeat center left #F8F8F8; color: $nokcolor; padding: 5px 0 3px 20px; position: relative; top: -5px; margin-bottom: 5px;}
div.o_search_result {margin: 0 0 1em 0; padding: 1em 0 0 0; }
div.o_search_result_title a {font-weight: bold; }
div.o_search_result_title a.o_search_result_details_link { margin-left: 1em; font-weight: normal; font-size: 90%; vertical-align: bottom;}
......
src/main/webapp/static/themes/openolat/layout.css
+ 2
− 2
View file @ ab85f0ea
source diff could not be displayed: it is too large. Options to address this: view the blob.
src/main/webapp/static/themes/openolatexample/all/content.css
+ 1
− 1
View file @ ab85f0ea
@import url("../../openolat/all/content.css");body{font-family:Courier;font-size:90%;color:#444}h1,h2,h3,h4,h5,fieldset legend{text-shadow:0 3px 3px rgba(0, 0, 0, 0.4);-moz-text-shadow:0 3px 3px rgba(0, 0, 0, 0.4);font-family:Comic Sans, Comic Sans MS, cursive}a,a:visited{text-decoration:none;color:red}a:hover{text-decoration:underline;color:red}
@import url("../../openolat/all/content.css");body{font-family:Courier;font-size:90%;color:#444}h1,h2,h3,h4,h5,fieldset legend{text-shadow:0 3px 3px rgba(0,0,0,0.4);-moz-text-shadow:0 3px 3px rgba(0,0,0,0.4);font-family:Comic Sans,Comic Sans MS,cursive}a,a:visited{text-decoration:none;color:red}a:hover{text-decoration:underline;color:red}
src/main/webapp/static/themes/openolatexample/layout.css
+ 2
− 2
View file @ ab85f0ea
source diff could not be displayed: it is too large. Options to address this: view the blob.
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