Skip to content
Snippets Groups Projects
Commit d374f92a authored by srosse's avatar srosse
Browse files

OO-1142: save about me, save layout info

parent d98122d4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/main/java/org/olat/course/config/ui/CourseLayoutController.java deleted 100644 → 0
+ 0
− 157
View file @ d98122d4
/**
* OLAT - Online Learning and Training<br>
* http://www.olat.org
* <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
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <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>
* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
* University of Zurich, Switzerland.
* <hr>
* <a href="http://www.openolat.org">
* OpenOLAT - Online Learning and Training</a><br>
* This file has been modified by the OpenOLAT community. Changes are licensed
* under the Apache 2.0 license as the original file.
*/
package org.olat.course.config.ui;
import org.olat.core.commons.controllers.filechooser.FileChoosenEvent;
import org.olat.core.commons.controllers.filechooser.FileChooserController;
import org.olat.core.commons.controllers.filechooser.FileChooserUIFactory;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.link.Link;
import org.olat.core.gui.components.link.LinkFactory;
import org.olat.core.gui.components.velocity.VelocityContainer;
import org.olat.core.gui.control.Controller;
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.gui.control.generic.closablewrapper.CloseableModalController;
import org.olat.core.logging.activity.ILoggingAction;
import org.olat.core.logging.activity.LearningResourceLoggingAction;
import org.olat.core.util.vfs.VFSContainer;
import org.olat.core.util.vfs.filters.VFSItemFileTypeFilter;
import org.olat.course.config.CourseConfig;
/**
* Description: <br>
* Configuration of course layout settings: standard or customized
*
* Initial Date: Jun 21, 2005 <br>
* @author patrick
*/
public class CourseLayoutController extends BasicController {
private static final VFSItemFileTypeFilter cssTypeFilter = new VFSItemFileTypeFilter(new String[] { "css" });
private VelocityContainer myContent;
private FileChooserController fileChooserCtr;
private Link changeCustomCSSButton;
private Link chooseSystemCSSButton;
private Link chooseCustomCSSButton;
private CloseableModalController cmc;
private VFSContainer vfsCourseRoot;
private CourseConfig courseConfig;
private ILoggingAction loggingAction;
/**
* @param ureq
* @param control
* @param theCourse
*/
public CourseLayoutController(UserRequest ureq, WindowControl wControl, CourseConfig courseConfig, VFSContainer vfsCourseRoot) {
super(ureq,wControl);
this.courseConfig = courseConfig;
this.vfsCourseRoot = vfsCourseRoot;
myContent = this.createVelocityContainer("CourseLayout");
changeCustomCSSButton = LinkFactory.createButton("form.layout.changecustomcss", myContent, this);
chooseSystemCSSButton = LinkFactory.createButton("form.layout.choosesystemcss", myContent, this);
chooseCustomCSSButton = LinkFactory.createButton("form.layout.choosecustomcss", myContent, this);
String cssFileRef = courseConfig.getCssLayoutRef();
myContent.contextPut("hasCustomCourseCSS", new Boolean(courseConfig.hasCustomCourseCSS()));
myContent.contextPut("cssFileRef", cssFileRef);
putInitialPanel(myContent);
}
/**
* @see org.olat.core.gui.control.DefaultController#event(org.olat.core.gui.UserRequest,
* org.olat.core.gui.components.Component, org.olat.core.gui.control.Event)
*/
public void event(UserRequest ureq, Component source, Event event) {
if (source == chooseSystemCSSButton){
// applying the default layout
myContent.contextPut("cssFileRef", CourseConfig.VALUE_EMPTY_CSS_FILEREF);
courseConfig.setCssLayoutRef(CourseConfig.VALUE_EMPTY_CSS_FILEREF);
myContent.contextPut("hasCustomCourseCSS", new Boolean(courseConfig.hasCustomCourseCSS()));
// log removing custom course layout
loggingAction = LearningResourceLoggingAction.REPOSITORY_ENTRY_PROPERTIES_COURSELAYOUT_DEFAULT_ADDED;
this.fireEvent(ureq, Event.CHANGED_EVENT);
} else if (source == changeCustomCSSButton || source == chooseCustomCSSButton){
removeAsListenerAndDispose(fileChooserCtr);
fileChooserCtr = FileChooserUIFactory.createFileChooserController(ureq, getWindowControl(), vfsCourseRoot, cssTypeFilter, true);
listenTo(fileChooserCtr);
removeAsListenerAndDispose(cmc);
cmc = new CloseableModalController(getWindowControl(), translate("close"), fileChooserCtr.getInitialComponent());
listenTo(cmc);
cmc.activate();
}
}
/**
* @see org.olat.core.gui.control.DefaultController#event(org.olat.core.gui.UserRequest, org.olat.core.gui.control.Controller, org.olat.core.gui.control.Event)
*/
public void event(UserRequest ureq, Controller source, Event event) {
if (source == fileChooserCtr) {
// from file choosing, in any case remove modal dialog
cmc.deactivate();
if (event instanceof FileChoosenEvent) {
String relPath = FileChooserUIFactory.getSelectedRelativeItemPath((FileChoosenEvent) event, vfsCourseRoot, null);
// user chose a file
myContent.contextPut("cssFileRef", relPath);
courseConfig.setCssLayoutRef(relPath);
myContent.contextPut("hasCustomCourseCSS", new Boolean(courseConfig.hasCustomCourseCSS()));
// log adding custom course layout
loggingAction = LearningResourceLoggingAction.REPOSITORY_ENTRY_PROPERTIES_COURSELAYOUT_CUSTOM_ADDED;
this.fireEvent(ureq, Event.CHANGED_EVENT);
}
} // else user cancelled file selection
}
/**
* @see org.olat.core.gui.control.DefaultController#doDispose(boolean)
*/
protected void doDispose() {
// controllers autodisposed by basic controller
}
/**
*
* @return Returns a log message if the course layout was changed, else null.
*/
public ILoggingAction getLoggingAction() {
return loggingAction;
}
}
\ No newline at end of file
src/main/java/org/olat/course/config/ui/courselayout/CourseLayoutGeneratorController.java
+ 23
− 3
View file @ d374f92a
......@@ -51,15 +51,21 @@ import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.Event;
import org.olat.core.gui.control.WindowControl;
import org.olat.core.gui.translator.Translator;
import org.olat.core.id.OLATResourceable;
import org.olat.core.logging.AssertException;
import org.olat.core.util.ArrayHelper;
import org.olat.core.util.FileUtils;
import org.olat.core.util.Util;
import org.olat.core.util.coordinate.CoordinatorManager;
import org.olat.core.util.vfs.VFSContainer;
import org.olat.core.util.vfs.VFSItem;
import org.olat.core.util.vfs.VFSLeaf;
import org.olat.core.util.vfs.filters.VFSItemSuffixFilter;
import org.olat.course.CourseFactory;
import org.olat.course.ICourse;
import org.olat.course.config.CourseConfig;
import org.olat.course.config.CourseConfigEvent;
import org.olat.course.config.CourseConfigEvent.CourseConfigType;
import org.olat.course.config.ui.courselayout.attribs.AbstractLayoutAttribute;
import org.olat.course.config.ui.courselayout.attribs.PreviewLA;
import org.olat.course.config.ui.courselayout.attribs.SpecialAttributeFormItemHandler;
......@@ -78,11 +84,10 @@ public class CourseLayoutGeneratorController extends FormBasicController {
private static final String ELEMENT_ATTRIBUTE_DELIM = "__";
private static final String PREVIEW_IMAGE_NAME = "preview.png";
private CourseConfig courseConfig;
private SingleSelection styleSel;
private FileElement logoUpl;
private FormLayoutContainer previewImgFlc;
private CourseEnvironment courseEnvironment;
private FormLayoutContainer styleFlc;
private CustomConfigManager customCMgr;
private LinkedHashMap<String, Map<String, FormItem>> guiWrapper;
......@@ -91,12 +96,17 @@ public class CourseLayoutGeneratorController extends FormBasicController {
private FormLink logoDel;
private boolean elWithErrorExists = false;
private final boolean editable;
private final OLATResourceable courseOres;
private CourseConfig courseConfig;
private CourseEnvironment courseEnvironment;
public CourseLayoutGeneratorController(UserRequest ureq, WindowControl wControl, CourseConfig courseConfig,
public CourseLayoutGeneratorController(UserRequest ureq, WindowControl wControl, OLATResourceable courseOres, CourseConfig courseConfig,
CourseEnvironment courseEnvironment, boolean editable) {
super(ureq, wControl);
this.editable = editable;
this.courseOres = courseOres;
this.courseConfig = courseConfig;
this.courseEnvironment = courseEnvironment;
customCMgr = (CustomConfigManager) CoreSpringFactory.getBean("courseConfigManager");
......@@ -361,6 +371,10 @@ public class CourseLayoutGeneratorController extends FormBasicController {
@Override
protected void formOK(UserRequest ureq) {
String selection = styleSel.getSelectedKey();
ICourse course = CourseFactory.openCourseEditSession(courseOres.getResourceableId());
courseEnvironment = course.getCourseEnvironment();
courseConfig = courseEnvironment.getCourseConfig();
courseConfig.setCssLayoutRef(selection);
if(CourseLayoutHelper.CONFIG_KEY_CUSTOM.equals(selection)){
......@@ -370,6 +384,12 @@ public class CourseLayoutGeneratorController extends FormBasicController {
if (!elWithErrorExists) prepareStyleEditor(customConfig);
}
CourseFactory.setCourseConfig(course.getResourceableId(), courseConfig);
CourseFactory.closeCourseEditSession(course.getResourceableId(), true);
CoordinatorManager.getInstance().getCoordinator().getEventBus()
.fireEventToListenersOf(new CourseConfigEvent(CourseConfigType.layout, course.getResourceableId()), course);
// inform course-settings-dialog about changes:
fireEvent(ureq, Event.CHANGED_EVENT);
}
......
src/main/java/org/olat/repository/handlers/CourseHandler.java
+ 1
− 1
View file @ d374f92a
......@@ -394,7 +394,7 @@ public class CourseHandler implements RepositoryHandler {
}
boolean managedLayout = RepositoryEntryManagedFlag.isManaged(entry, RepositoryEntryManagedFlag.layout);
CourseLayoutGeneratorController layoutC = new CourseLayoutGeneratorController(ureq, wControl, courseConfig,
CourseLayoutGeneratorController layoutC = new CourseLayoutGeneratorController(ureq, wControl, course, courseConfig,
course.getCourseEnvironment(), !managedLayout);
pane.appendEditor(pane.getTranslator().translate("tab.layout"), layoutC);
......
src/main/java/org/olat/user/ProfileFormController.java
+ 5
− 0
View file @ d374f92a
......@@ -387,6 +387,11 @@ public class ProfileFormController extends FormBasicController {
if(uploadedImage != null) {
dps.setPortrait(uploadedImage, identityToModify.getName());
}
// Store the "about me" text.
HomePageConfig conf = hpcm.loadConfigFor(identityToModify.getName());
conf.setTextAboutMe(textAboutMe.getValue());
hpcm.saveConfigTo(identityToModify.getName(), conf);
// fire the appropriate event
fireEvent(ureq, Event.DONE_EVENT);
......
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