Skip to content
Snippets Groups Projects
Commit 294dbe44 authored by uhensler's avatar uhensler
Browse files

OO-3924: Show static folder on preview instead of edit view

parent bbe54266
No related branches found
No related tags found
No related merge requests found
...@@ -66,11 +66,6 @@ public class InfoMessageControllerSingleVM extends BasicController { ...@@ -66,11 +66,6 @@ public class InfoMessageControllerSingleVM extends BasicController {
@Autowired @Autowired
private CustomStaticFolderManager staticFolderMgr; private CustomStaticFolderManager staticFolderMgr;
/**
*
* @param ureq
* @param control
*/
public InfoMessageControllerSingleVM(UserRequest ureq, WindowControl control) { public InfoMessageControllerSingleVM(UserRequest ureq, WindowControl control) {
super(ureq, control); super(ureq, control);
infoMsgView = createVelocityContainer("infomsg"); infoMsgView = createVelocityContainer("infomsg");
...@@ -110,10 +105,10 @@ public class InfoMessageControllerSingleVM extends BasicController { ...@@ -110,10 +105,10 @@ public class InfoMessageControllerSingleVM extends BasicController {
// /customizing/static/ // /customizing/static/
staticFolderCtrl = new FolderRunController(staticFolderMgr.getRootContainer(), true, ureq, control); staticFolderCtrl = new FolderRunController(staticFolderMgr.getRootContainer(), true, ureq, control);
listenTo(staticFolderCtrl); listenTo(staticFolderCtrl);
infoMsgEdit.put("staticFolder", staticFolderCtrl.getInitialComponent()); infoMsgView.put("staticFolder", staticFolderCtrl.getInitialComponent());
String url = Settings.getServerContextPathURI() + "/raw/static/"; String url = Settings.getServerContextPathURI() + "/raw/static/";
infoMsgEdit.contextPut("extlink", url); infoMsgView.contextPut("extlink", url);
container = putInitialPanel(infoMsgView); container = putInitialPanel(infoMsgView);
} }
......
...@@ -68,4 +68,12 @@ ...@@ -68,4 +68,12 @@
</div> </div>
</fieldset> </fieldset>
</div> </div>
#end #end
\ No newline at end of file
#if($r.available("staticFolder"))
<div class="o_block_large">
<legend>$r.translate("staticFolder")</legend>
<div class="o_copy_code o_nowrap"><input type="text" value="$extlink" onclick="this.select()"/></div>
$r.render("staticFolder")
</div>
#end
...@@ -14,8 +14,4 @@ ...@@ -14,8 +14,4 @@
$r.render("maintenanceMsgForm") $r.render("maintenanceMsgForm")
#end #end
#end #end
<h4>$r.translate("staticFolder")</h4>
<div class="o_copy_code o_nowrap"><input type="text" value="$extlink" onclick="this.select()"/></div>
$r.render("staticFolder")
</fieldset> </fieldset>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment