diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java
index 0f173105992b8b6dc16f447587ace0b26254ef8d..888e98a9f63b278302f161d018da2a230a9f1168 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java
@@ -1271,11 +1271,11 @@ public class RichTextConfiguration implements Disposable {
*/
public void setContentCSSFromTheme(Theme theme) {
// Always use default content css, then add the one from the theme
- if (theme.getIdentifyer().equals("default")) {
+ if (theme.getIdentifyer().equals("openolat")) {
setContentCSS(theme.getBaseURI() + "all/content.css");
} else {
StringOutput cssFiles = new StringOutput();
- StaticMediaDispatcher.renderStaticURI(cssFiles, "themes/default/all/content.css");
+ StaticMediaDispatcher.renderStaticURI(cssFiles, "themes/openolat/all/content.css");
cssFiles.append(",");
cssFiles.append(theme.getBaseURI()).append("all/content.css");
setContentCSS(cssFiles.toString());
diff --git a/src/main/java/org/olat/core/gui/control/guistack/_content/modalDialog.html b/src/main/java/org/olat/core/gui/control/guistack/_content/modalDialog.html
index af874f25045c50ae2c4be8ffece68cbd112f889f..7152abbfd8df84bfdaf4a375edeefef4572bc78a 100644
--- a/src/main/java/org/olat/core/gui/control/guistack/_content/modalDialog.html
+++ b/src/main/java/org/olat/core/gui/control/guistack/_content/modalDialog.html
@@ -36,13 +36,3 @@
## 3)
<div class="b_modal_overlay" style="z-index: $zindexoverlay" id="b_modal_overlay_$r.getCId()"></div>
-<!--[if lte IE 7]>
- ## fix brocken transparend overlay in IE6, set height manually with javascript
- <script type="text/javascript">
- try {
- $('b_modal_overlay_$r.getCId()').setStyle({ height: $('b_page').getHeight() + 'px' });
- } catch (e) {
- //
- }
- </script>
-<![endif]-->
diff --git a/src/main/java/org/olat/instantMessaging/rosterandchat/InstantMessagingMainController.java b/src/main/java/org/olat/instantMessaging/rosterandchat/InstantMessagingMainController.java
index b1c4efae875b04a6c329a47cd2499353ba9bb6d4..88e301a009ff9c028c44c22800554b15a76aa911 100644
--- a/src/main/java/org/olat/instantMessaging/rosterandchat/InstantMessagingMainController.java
+++ b/src/main/java/org/olat/instantMessaging/rosterandchat/InstantMessagingMainController.java
@@ -128,7 +128,7 @@ public class InstantMessagingMainController extends BasicController implements G
File soundFile = new File(WebappHelper.getContextRoot() + "/themes/" + guiTheme.getIdentifyer() + "/sounds/new_message.wav");
if (!soundFile.exists()) {
// fallback to default theme when file does not exist in configured theme
- newMessageSoundURL = newMessageSoundURL.replace("/themes/" + guiTheme.getIdentifyer(), "/themes/default");
+ newMessageSoundURL = newMessageSoundURL.replace("/themes/" + guiTheme.getIdentifyer(), "/themes/openolat");
}
newMsgIcon.contextPut("newMessageSoundURL", newMessageSoundURL);
diff --git a/src/main/webapp/static/movie/popup.html b/src/main/webapp/static/movie/popup.html
index 6d098d3ddd3ebadd7055ae48a01aa931627af8fc..c30a32cea651e9b4158b516172bd34c8238aa3d0 100644
--- a/src/main/webapp/static/movie/popup.html
+++ b/src/main/webapp/static/movie/popup.html
@@ -11,7 +11,7 @@
<meta http-equiv="cache-directive" content="no-cache" />
<title>Timemarker</title>
<!-- use default layout css here, no fancy layouting -->
-<link rel="StyleSheet" href="../themes/default/layout.css" type="text/css" media="screen" />
+<link rel="StyleSheet" href="../themes/openolat/layout.css" type="text/css" media="screen" />
<script type="text/javascript">
/* <![CDATA[ */
// Parse startup parameters passed by OLAT
diff --git a/src/main/webapp/static/themes/openolat/all/modules/_dialogs.scss b/src/main/webapp/static/themes/openolat/all/modules/_dialogs.scss
index 9b3aebdb1622dfe73871e760e5390f52e5fc9655..bc851ec15a26806ccb34b616bf1ebd5065900372 100644
--- a/src/main/webapp/static/themes/openolat/all/modules/_dialogs.scss
+++ b/src/main/webapp/static/themes/openolat/all/modules/_dialogs.scss
@@ -38,8 +38,7 @@ div.b_modal_overlay {
position: fixed; top: 0; left: 0; width:100%; height:100%; zoom:1;
}
/* modal overlay color */
-div.b_modal_overlay, div.ext-el-mask { background: #fff; -moz-opacity: 0.75; opacity:0.75; filter: alpha(opacity=75);}
-
+div.b_modal_overlay, div.ext-el-mask { background: #000; -moz-opacity: 0.25; opacity:0.25; filter: alpha(opacity=25);}
.b_floatscrollbox {
overflow-x: hidden;
@@ -101,7 +100,9 @@ div.b_msg_dialog {
/* sticky info (admins can create stick-messages that will show for all users) */
#b_msg_sticky {
- clear:both; padding: 10px 10px 10px 50px; min-height: 32px; background: #ebcccc url(../openolat/images/icon_warning_32.png) no-repeat 10px 10px; border-bottom: 1px #ccc dotted; border-top: 1px #ccc dotted;
+ clear:both; padding: 10px 10px 10px 50px;
+ min-height: 32px; background: #FFB651 url(../openolat/images/icon_warning_32.png) no-repeat 10px 10px;
+ border:none;
}
/* info message ( slide-in, top) */
@@ -138,9 +139,12 @@ div.b_msg_error_winicon { background: url(../openolat/images/icon_error_32.png)
.o_infomessage_wrapper {
border: 1px solid #ccc;
background:#FAFAFA;
+ margin-bottom:20px;
+
.o_infomessage{
padding: 10px 10px 10px 50px;
text-align: left;
+ min-height:40px;
background: url(../openolat/images/icon_warning_32.png) no-repeat 10px 10px;
.o_infomessage_inner {
diff --git a/src/main/webapp/static/themes/openolat/layout.css b/src/main/webapp/static/themes/openolat/layout.css
index dec59eb53cc2d60f502ee1bc96576f9f945e6883..0c303d2f1f3d166c734086d6e755240e56893db8 100644
--- a/src/main/webapp/static/themes/openolat/layout.css
+++ b/src/main/webapp/static/themes/openolat/layout.css
@@ -2333,10 +2333,10 @@ div.b_modal_overlay {
/* modal overlay color */
div.b_modal_overlay, div.ext-el-mask {
- background: #fff;
- -moz-opacity: 0.75;
- opacity: 0.75;
- filter: alpha(opacity=75); }
+ background: #000;
+ -moz-opacity: 0.25;
+ opacity: 0.25;
+ filter: alpha(opacity=25); }
.b_floatscrollbox {
overflow-x: hidden;
@@ -2425,9 +2425,8 @@ div.b_msg_dialog .b_msg_title {
clear: both;
padding: 10px 10px 10px 50px;
min-height: 32px;
- background: #ebcccc url(../openolat/images/icon_warning_32.png) no-repeat 10px 10px;
- border-bottom: 1px #ccc dotted;
- border-top: 1px #ccc dotted; }
+ background: #ffb651 url(../openolat/images/icon_warning_32.png) no-repeat 10px 10px;
+ border: none; }
/* info message ( slide-in, top) */
div.b_msg-div {
@@ -2472,10 +2471,12 @@ div.b_msg_error_winicon {
/* "info-message" on login screen */
.o_infomessage_wrapper {
border: 1px solid #ccc;
- background: #FAFAFA; }
+ background: #FAFAFA;
+ margin-bottom: 20px; }
.o_infomessage_wrapper .o_infomessage {
padding: 10px 10px 10px 50px;
text-align: left;
+ min-height: 40px;
background: url(../openolat/images/icon_warning_32.png) no-repeat 10px 10px; }
/* OPEN / CLOSE BOX TOGGLER */
diff --git a/src/main/webapp/static/themes/openolat/sounds/Pop.wav b/src/main/webapp/static/themes/openolat/sounds/Pop.wav
new file mode 100644
index 0000000000000000000000000000000000000000..8bfaaede7b5ee12f423fe3d26c7cbfc0d40b1814
Binary files /dev/null and b/src/main/webapp/static/themes/openolat/sounds/Pop.wav differ
diff --git a/src/main/webapp/static/themes/openolat/sounds/beep5.wav b/src/main/webapp/static/themes/openolat/sounds/beep5.wav
new file mode 100644
index 0000000000000000000000000000000000000000..452991578153fbe5aa2a6852b7ad07e40f0c0800
Binary files /dev/null and b/src/main/webapp/static/themes/openolat/sounds/beep5.wav differ
diff --git a/src/main/webapp/static/themes/openolat/sounds/click3.wav b/src/main/webapp/static/themes/openolat/sounds/click3.wav
new file mode 100644
index 0000000000000000000000000000000000000000..9e260d9c2fc6658235fb0627797b470fe61f68b4
Binary files /dev/null and b/src/main/webapp/static/themes/openolat/sounds/click3.wav differ
diff --git a/src/main/webapp/static/themes/openolat/sounds/new_message.wav b/src/main/webapp/static/themes/openolat/sounds/new_message.wav
new file mode 100644
index 0000000000000000000000000000000000000000..b516b917de09a31c97d59e2ddb12a7d7561bb17a
Binary files /dev/null and b/src/main/webapp/static/themes/openolat/sounds/new_message.wav differ
diff --git a/src/main/webapp/static/themes/openolatexample/layout.css b/src/main/webapp/static/themes/openolatexample/layout.css
index 49d4932ff35b4abb42bdf76feba1585334563356..f893f2bd2b958b822a3ae89f4587ffa6710bbe95 100644
--- a/src/main/webapp/static/themes/openolatexample/layout.css
+++ b/src/main/webapp/static/themes/openolatexample/layout.css
@@ -2342,10 +2342,10 @@ div.b_modal_overlay {
/* modal overlay color */
div.b_modal_overlay, div.ext-el-mask {
- background: #fff;
- -moz-opacity: 0.75;
- opacity: 0.75;
- filter: alpha(opacity=75); }
+ background: #000;
+ -moz-opacity: 0.25;
+ opacity: 0.25;
+ filter: alpha(opacity=25); }
.b_floatscrollbox {
overflow-x: hidden;
@@ -2434,9 +2434,8 @@ div.b_msg_dialog .b_msg_title {
clear: both;
padding: 10px 10px 10px 50px;
min-height: 32px;
- background: #ebcccc url(../openolat/images/icon_warning_32.png) no-repeat 10px 10px;
- border-bottom: 1px #ccc dotted;
- border-top: 1px #ccc dotted; }
+ background: #ffb651 url(../openolat/images/icon_warning_32.png) no-repeat 10px 10px;
+ border: none; }
/* info message ( slide-in, top) */
div.b_msg-div {
@@ -2481,10 +2480,12 @@ div.b_msg_error_winicon {
/* "info-message" on login screen */
.o_infomessage_wrapper {
border: 1px solid #ccc;
- background: #FAFAFA; }
+ background: #FAFAFA;
+ margin-bottom: 20px; }
.o_infomessage_wrapper .o_infomessage {
padding: 10px 10px 10px 50px;
text-align: left;
+ min-height: 40px;
background: url(../openolat/images/icon_warning_32.png) no-repeat 10px 10px; }
/* OPEN / CLOSE BOX TOGGLER */