From e824a91a04b60a481aefc32fa0a8fc615a62c8fb Mon Sep 17 00:00:00 2001
From: gnaegi <none@none>
Date: Wed, 25 Jun 2014 14:42:33 +0200
Subject: [PATCH] OO-1068 remove old stuff
---
.../fullWebApp/DefaultFooterController.java | 94 -------------------
.../fullWebApp/LayoutMain3ColsController.java | 8 +-
.../LayoutMain3ColsPreviewController.java | 2 +-
.../fullWebApp/_content/defaultfooter.html | 18 ----
.../fullWebApp/_content/fullwebapplayout.html | 13 ++-
.../fullWebApp/_content/main_back.html | 4 +-
.../fullWebApp/_content/main_preview.html | 4 +-
.../commons/fullWebApp/_content/nav_tabs.html | 2 +-
.../gui/control/_spring/fullWebAppContext.xml | 2 +-
.../gui/control/OlatFooterController.java | 4 +-
10 files changed, 19 insertions(+), 132 deletions(-)
delete mode 100644 src/main/java/org/olat/core/commons/fullWebApp/DefaultFooterController.java
delete mode 100644 src/main/java/org/olat/core/commons/fullWebApp/_content/defaultfooter.html
diff --git a/src/main/java/org/olat/core/commons/fullWebApp/DefaultFooterController.java b/src/main/java/org/olat/core/commons/fullWebApp/DefaultFooterController.java
deleted file mode 100644
index 6a0a9ac204e..00000000000
--- a/src/main/java/org/olat/core/commons/fullWebApp/DefaultFooterController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * <a href="http://www.openolat.org">
- * OpenOLAT - Online Learning and Training</a><br>
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); <br>
- * you may not use this file except in compliance with the License.<br>
- * You may obtain a copy of the License at the
- * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
- * <p>
- * Unless required by applicable law or agreed to in writing,<br>
- * software distributed under the License is distributed on an "AS IS" BASIS, <br>
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
- * See the License for the specific language governing permissions and <br>
- * limitations under the License.
- * <p>
- * Initial code contributed and copyrighted by<br>
- * frentix GmbH, http://www.frentix.com
- * <p>
- */
-package org.olat.core.commons.fullWebApp;
-
-import org.olat.core.CoreSpringFactory;
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.Windows;
-import org.olat.core.gui.components.Component;
-import org.olat.core.gui.components.velocity.VelocityContainer;
-import org.olat.core.gui.control.Event;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.core.gui.control.controller.BasicController;
-import org.olat.core.helpers.Settings;
-import org.olat.core.util.session.UserSessionManager;
-import org.olat.user.UserManager;
-
-/**
- * <h3>Description:</h3>
- * This is a simple controller that displays the brasato web app framework
- * default footer.
- * <p>
- * Initial Date: 10.10.2007 <br>
- *
- * @author Florian Gnaegi, frentix GmbH, http://www.frentix.com
- */
-public class DefaultFooterController extends BasicController {
- private VelocityContainer footerVC;
-
- /**
- * Constructor: usedd with AutoCreator
- */
- public DefaultFooterController(UserRequest ureq, WindowControl wControl) {
- super(ureq, wControl);
-
- // Initialize velocity container
- footerVC = createVelocityContainer("defaultfooter");
- footerVC.contextPut("olatversion", Settings.getFullVersionInfo() +" "+ Settings.getNodeInfo());
-
- // Push information about AJAX mode
- boolean ajaxOn = false;
- if (ureq.getUserSession().isAuthenticated()) {
- ajaxOn = Windows.getWindows(ureq).getWindowManager()
- .isAjaxEnabled();
- } else {
- // on construction time only global and browserdependent ajax on
- // settings can be used
- // to show ajax gif :-)
- ajaxOn = Settings.isAjaxGloballyOn();
- }
- footerVC.contextPut("ajaxOn", ajaxOn ? Boolean.TRUE : Boolean.FALSE);
-
- // Push information about logged in users
- footerVC
- .contextPut("userSessionsCnt", CoreSpringFactory.getImpl(UserSessionManager.class).getUserSessionsCnt());
-
- // Push information about user
- if (ureq.getUserSession().isAuthenticated()) {
- footerVC.contextPut("loggedIn", Boolean.TRUE);
- String fullName = CoreSpringFactory.getImpl(UserManager.class).getUserDisplayName(getIdentity());
- footerVC.contextPut("username", fullName);
- } else {
- footerVC.contextPut("loggedIn", Boolean.FALSE);
- }
-
- putInitialPanel(footerVC);
- }
-
- @Override
- protected void doDispose() {
- // nothing to dispose
- }
-
- @Override
- public void event(UserRequest ureq, Component source, Event event) {
- // no events to catch
- }
-}
diff --git a/src/main/java/org/olat/core/commons/fullWebApp/LayoutMain3ColsController.java b/src/main/java/org/olat/core/commons/fullWebApp/LayoutMain3ColsController.java
index 1479d3aa819..aca0a27eed5 100644
--- a/src/main/java/org/olat/core/commons/fullWebApp/LayoutMain3ColsController.java
+++ b/src/main/java/org/olat/core/commons/fullWebApp/LayoutMain3ColsController.java
@@ -396,13 +396,13 @@ public class LayoutMain3ColsController extends MainLayoutBasicController impleme
if (columns[column - 1] == null) {
return;
} else {
- mainCssClasses.add("b_hidecol" + column);
+ mainCssClasses.add("o_hidecol" + column);
}
} else {
if (columns[column - 1] == null) {
return;
} else {
- mainCssClasses.remove("b_hidecol" + column);
+ mainCssClasses.remove("o_hidecol" + column);
}
}
// add new CSS classes for main container
@@ -459,7 +459,7 @@ public class LayoutMain3ColsController extends MainLayoutBasicController impleme
// remove old component from velocity first
if (oldComp == null) {
// css class to indicate if a column is hidden or shown
- mainCssClasses.remove("b_hidecol" + column);
+ mainCssClasses.remove("o_hidecol" + column);
} else {
layoutMainVC.remove(oldComp);
}
@@ -468,7 +468,7 @@ public class LayoutMain3ColsController extends MainLayoutBasicController impleme
if (newComponent == null) {
// tell YAML layout via css class on main container to not display this
// column: this will adjust margin of col3 in normal setups
- mainCssClasses.add("b_hidecol" + column);
+ mainCssClasses.add("o_hidecol" + column);
layoutMainVC.contextPut("existsCol" + column, Boolean.FALSE);
} else {
layoutMainVC.contextPut("existsCol" + column, Boolean.TRUE);
diff --git a/src/main/java/org/olat/core/commons/fullWebApp/LayoutMain3ColsPreviewController.java b/src/main/java/org/olat/core/commons/fullWebApp/LayoutMain3ColsPreviewController.java
index aa0bbac2641..b738d1101fe 100644
--- a/src/main/java/org/olat/core/commons/fullWebApp/LayoutMain3ColsPreviewController.java
+++ b/src/main/java/org/olat/core/commons/fullWebApp/LayoutMain3ColsPreviewController.java
@@ -72,7 +72,7 @@ public class LayoutMain3ColsPreviewController extends MainLayoutBasicController
// create layout and add it to main view
layoutCtr = new LayoutMain3ColsController(ureq, wControl, col1, col3, layoutConfigKey);
- layoutCtr.addCssClassToMain("b_preview");
+ layoutCtr.addCssClassToMain("o_preview");
listenTo(layoutCtr);
previewVC.put("3collayout", layoutCtr.getInitialComponent());
diff --git a/src/main/java/org/olat/core/commons/fullWebApp/_content/defaultfooter.html b/src/main/java/org/olat/core/commons/fullWebApp/_content/defaultfooter.html
deleted file mode 100644
index 080858a747e..00000000000
--- a/src/main/java/org/olat/core/commons/fullWebApp/_content/defaultfooter.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<div id="b_footer_user" class="col-sm-4">
- #if($ajaxOn)
- <a href="http://en.wikipedia.org/wiki/Ajax_%28programming%29" target="_blank" title="$r.translateInAttribute("footer.ajax.hover")" class="o_ajax"></a>
- #end
- #if ($loggedIn)
- $r.translate("footer.logged.in.as", ["$username"]) Â ($userSessionsCnt $r.translate("footer.users.online"))
- #else
- $r.translate("footer.not.logged.in") ($userSessionsCnt $r.translate("footer.users.online"))
- #end
-</div>
-
-<div id="b_footer_version" class="col-sm-4">
- <a href="http://www.openolat.org" title="OpenOLAT" target="_blank">$olatversion</a>
-</div>
-
-<div id="b_footer_powered" class="col-sm-4">
- <a href="http://www.openolat.org" target="_blank" title="OpenOLAT"><img src="$r.staticLink("images/openolat/openolat_powerd_by_120x30.png")" alt="Powered by OpenOLAT" /></a>
-</div>
diff --git a/src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html b/src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html
index dd82ced35a7..825c2ac4087 100644
--- a/src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html
+++ b/src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html
@@ -29,7 +29,6 @@ o_info.lastClickTime = new Date().getTime();
o_info.drop = true;
## olat layout specific
o_info.o_baseURI = "$r.staticLink("")";
-o_info.b_textMarkingIframeIntervals = new Array();
o_info.i18n_noresponse_title = "$r.escapeDoubleQuotes($r.translate("server.no.response.title"))";
o_info.i18n_noresponse = "$r.escapeDoubleQuotes($r.translate("server.no.response"))";
## Initialize zindex manager
@@ -37,7 +36,7 @@ o_info.zseed = 0;
#if($enforceTopFrame)
if (top!=self){top.location=self.location+"?o_winrndo=1";}
#end
-function b_start(){
+function o_start(){
o_init();
## js B
$r.renderBodyOnLoadJSFunctionCall()
@@ -143,7 +142,7 @@ $r.renderHeaderIncludes()
<title>$r.translate("page.appname") - $r.translate("page.title")</title>
</head>
-<body onload="b_start();" id="o_body" class="#foreach($cssClass in $bodyCssClasses)$cssClass #end b_lang_$r.getLanguageCode()">
+<body onload="o_start();" id="o_body" class="#foreach($cssClass in $bodyCssClasses)$cssClass #end o_lang_$r.getLanguageCode()">
## if in debug mode, it is a invisible component which is only visible by wrapping debug information around all other
## components.
<!-- START guiDebug -->
@@ -235,7 +234,7 @@ $r.render("stickymsg")
</div>
## END #o_main -----
-## ----- START #b_footer ----------
+## ----- START #o_footer_wrapper ----------
#if($screenMode.standardScreen && $r.available("footerComponent"))
<div id="o_footer_wrapper">
<div id="o_footer_container" class="o_container_offcanvas container-fluid">
@@ -243,14 +242,14 @@ $r.render("stickymsg")
</div>
</div>
#end
-## ---- END #b_footer ---
+## ---- END #o_footer_wrapper ---
-## ---- START #b_modal
+## ---- START #o_modal
## Modal dialog is absolute positioned, thus it's ok to have it at the end of the page.
## This prevents an ugly IE bug that appears when the modal dialog is at the top of the page.
## IE can't render empty div's properly which results in an ugly white bar.
$r.render("modalpanel")
-## ---- END #b_nav ---
+## ---- END #o_modal ---
## the div for the busy-wait animated-gif
<div id="o_ajax_busy"><i class="o_icon o_icon_busy o_icon-5x o_icon-spin"></i></div>
diff --git a/src/main/java/org/olat/core/commons/fullWebApp/_content/main_back.html b/src/main/java/org/olat/core/commons/fullWebApp/_content/main_back.html
index b1eebfab424..0263a3dc66d 100644
--- a/src/main/java/org/olat/core/commons/fullWebApp/_content/main_back.html
+++ b/src/main/java/org/olat/core/commons/fullWebApp/_content/main_back.html
@@ -1,5 +1,5 @@
-<div id="b_preview_wrapper" class="b_clearfix">
- <div class="b_preview_link b_floatbox">
+<div id="o_preview_wrapper" class="clearfix">
+ <div class="o_preview_link">
$r.render("backLink")
</div>
</div>
diff --git a/src/main/java/org/olat/core/commons/fullWebApp/_content/main_preview.html b/src/main/java/org/olat/core/commons/fullWebApp/_content/main_preview.html
index b1eebfab424..0263a3dc66d 100644
--- a/src/main/java/org/olat/core/commons/fullWebApp/_content/main_preview.html
+++ b/src/main/java/org/olat/core/commons/fullWebApp/_content/main_preview.html
@@ -1,5 +1,5 @@
-<div id="b_preview_wrapper" class="b_clearfix">
- <div class="b_preview_link b_floatbox">
+<div id="o_preview_wrapper" class="clearfix">
+ <div class="o_preview_link">
$r.render("backLink")
</div>
</div>
diff --git a/src/main/java/org/olat/core/commons/fullWebApp/_content/nav_tabs.html b/src/main/java/org/olat/core/commons/fullWebApp/_content/nav_tabs.html
index 54635978daa..a0229269749 100644
--- a/src/main/java/org/olat/core/commons/fullWebApp/_content/nav_tabs.html
+++ b/src/main/java/org/olat/core/commons/fullWebApp/_content/nav_tabs.html
@@ -8,7 +8,7 @@
<li class="#if($tabhelper.isDTabActive($dtab)) active #end $!navel.getIconCSSClass()">
$r.render("a$postfix")
#if($tabhelper.isCanCloseDTab())
- $r.render("c$postfix") ## close link has class b_nav_tab_close
+ $r.render("c$postfix") ## close link has class o_nav_tab_close
#end
</li>
#end
diff --git a/src/main/java/org/olat/core/gui/control/_spring/fullWebAppContext.xml b/src/main/java/org/olat/core/gui/control/_spring/fullWebAppContext.xml
index 2646f004157..ffbda0224bf 100644
--- a/src/main/java/org/olat/core/gui/control/_spring/fullWebAppContext.xml
+++ b/src/main/java/org/olat/core/gui/control/_spring/fullWebAppContext.xml
@@ -107,7 +107,7 @@
******************************************
-->
<bean id="fullWebApp.ContextHelpFooterControllerCreator" class="org.olat.core.gui.control.creator.AutoCreator" >
- <property name="className" value="org.olat.core.commons.fullWebApp.DefaultFooterController"/>
+ <property name="className" value="org.olat.gui.control.OlatFooterController"/>
</bean>
</beans>
diff --git a/src/main/java/org/olat/gui/control/OlatFooterController.java b/src/main/java/org/olat/gui/control/OlatFooterController.java
index ce169f1f1ad..40766d2ff6b 100644
--- a/src/main/java/org/olat/gui/control/OlatFooterController.java
+++ b/src/main/java/org/olat/gui/control/OlatFooterController.java
@@ -26,7 +26,7 @@
package org.olat.gui.control;
import org.olat.core.CoreSpringFactory;
-import org.olat.core.commons.fullWebApp.DefaultFooterController;
+import org.olat.core.commons.fullWebApp.BaseFullWebappController;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.util.UserLoggedInCounter;
@@ -62,7 +62,7 @@ public class OlatFooterController extends BasicController {
public OlatFooterController(UserRequest ureq, WindowControl wControl) {
super(ureq, wControl);
setTranslator(Util.createPackageTranslator(
- DefaultFooterController.class, getLocale(), Util
+ BaseFullWebappController.class, getLocale(), Util
.createPackageTranslator(OlatFooterController.class,
getLocale())));
--
GitLab