Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.html URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.html?rev=1553537&r1=1553536&r2=1553537&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.html (original) +++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.html Thu Dec 26 18:16:54 2013 @@ -34,9 +34,6 @@ $('#adminForm').height(documentHeight-114); $('#adminTable').height(documentHeight-164); }; - function fileDialog() { - $('#fileInput').click(); - } </script> <div class="adminPanel"> <div class="adminPanelColumnTable"> @@ -54,13 +51,15 @@ <select wicket:id="language"></select> </td> <td> - <input wicket:id="export" type="button" wicket:ommessage="value:360"/> + <div class="ui-button ui-widget ui-state-default ui-corner-all" wicket:id="export"> + <span class="btn"><wicket:ommessage key="360"/></span> + </div> </td> <td class="profile"> - <div id="fileLangBtn" onclick="fileDialog();" - class="uploadlang ui-button ui-widget ui-state-default ui-corner-all"><wicket:ommessage key="387"/></div><div class="upload"><input id="fileInput" type="file" - accept="text/xml" wicket:id="fileInput"/><span wicket:id="progress">[progressbar]</span> + <div class="ui-button ui-widget ui-state-default ui-corner-all fileupload fileupload-new" data-provides="fileupload" style="margin: 0;"> + <span class="btn btn-file"><wicket:ommessage key="387"/><input type="file" accept="text/xml" wicket:id="fileInput"/></span> </div> + <span wicket:id="progress">[progressbar]</span> </td> </tr> </table>
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java?rev=1553537&r1=1553536&r2=1553537&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java (original) +++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java Thu Dec 26 18:16:54 2013 @@ -53,7 +53,6 @@ import org.apache.wicket.markup.html.Web import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.upload.FileUpload; -import org.apache.wicket.markup.html.form.upload.FileUploadField; import org.apache.wicket.markup.html.panel.FeedbackPanel; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.util.resource.AbstractResourceStream; @@ -65,6 +64,8 @@ import org.slf4j.Logger; import com.googlecode.wicket.jquery.ui.form.button.AjaxButton; +import de.agilecoders.wicket.extensions.javascript.jasny.FileUploadField; + /** * Language Editor, add/insert/update {@link Fieldlanguagesvalues} and * add/delete {@link FieldLanguage} contains several Forms and one list @@ -182,9 +183,6 @@ public class LangPanel extends AdminPane } getBean(LanguageImport.class) .addLanguageByDocument(language.getLanguage_id(), download.getInputStream(), getUserId()); - } catch (IOException e) { - log.error("IOException on panel language editor import ", e); - importFeedback.error(e); } catch (Exception e) { log.error("Exception on panel language editor import ", e); importFeedback.error(e); Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java?rev=1553537&r1=1553536&r2=1553537&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java (original) +++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java Thu Dec 26 18:16:54 2013 @@ -69,6 +69,8 @@ import ro.fortsoft.wicket.dashboard.Widg import ro.fortsoft.wicket.dashboard.web.DashboardContext; import ro.fortsoft.wicket.dashboard.web.DashboardContextInjector; import ro.fortsoft.wicket.dashboard.web.DashboardSettings; +import de.agilecoders.wicket.core.Bootstrap; +import de.agilecoders.wicket.core.settings.BootstrapSettings; public class Application extends AuthenticatedWebApplication { private DashboardContext dashboardContext; @@ -112,6 +114,8 @@ public class Application extends Authent dashboardSettings.setIncludeJQuery(false); dashboardSettings.setIncludeJQueryUI(false); + Bootstrap.install(Application.get(), new BootstrapSettings()); + getRootRequestMapperAsCompound().add(new NoVersionMapper(getHomePage())); getRootRequestMapperAsCompound().add(new NoVersionMapper("notinited", NotInitedPage.class)); mountPage("swf", SwfPage.class);
