You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/09/29 19:54:55 UTC
svn commit: r1527370 [2/2] - in
/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web:
app/ pages/install/
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard%24ParamsStep3.html?rev=1527370&r1=1527369&r2=1527370&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html Sun Sep 29 17:54:54 2013
@@ -21,90 +21,110 @@
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<fieldset id="userConf1">
- <legend>Converters</legend>
+ <legend><wicket:message key="install.wizard.params.step3.converters"/></legend>
<ul>
- <li><label wicket:for="cfg.swfZoom">SWFTools Zoom</label>
- <input wicket:id="cfg.swfZoom" title="Enter the dpi that swftools will use for PDF to SWF conversion"
+ <li><label wicket:for="cfg.swfZoom"><wicket:message key="install.wizard.params.step3.swfZoom"/></label>
+ <input wicket:id="cfg.swfZoom" wicket:message="title:install.wizard.params.step3.swfZoom.title"
type="text" />
<p>
- <i>You can test if swftools is installed into system path by
- opening a shell or cmd-prompt and type pdf2swf Enter the dpi
- that swftools will use for PDF to SWF conversion. Default is 72
- dpi. see also <a
+ <i>
+ <wicket:message key="install.wizard.params.step3.swfZoom.text"/>
+ <wicket:message key="install.wizard.params.step3.seeAlso"/><a
href="http://openmeetings.apache.org/installation.html"
- target="_blank">Installation</a>
+ target="_blank"><wicket:message key="install.wizard.params.step3.installation"/></a>
</i>
- </p></li>
- <li><label wicket:for="cfg.swfJpegQuality">SWFTools JPEG Quality</label>
+ </p>
+ </li>
+ <li><label wicket:for="cfg.swfJpegQuality"><wicket:message key="install.wizard.params.step3.swfJpegQuality"/></label>
<input wicket:id="cfg.swfJpegQuality"
- title="Enter the quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best (big). (default:85)"
+ wicket:message="title:install.wizard.params.step3.swfJpegQuality.title"
type="text" />
<p>
- <i>You can test if swftools is installed into system path by
- opening a shell or cmd-prompt and type pdf2swf Enter the
- quality of embedded jpeg pictures to quality. 0 is worst (small),
- 100 is best (big). (default:85) see also <a
+ <i>
+ <wicket:message key="install.wizard.params.step3.swfJpegQuality.text"/>
+ <wicket:message key="install.wizard.params.step3.seeAlso"/><a
href="http://openmeetings.apache.org/installation.html"
- target="_blank">Installation</a>
+ target="_blank"><wicket:message key="install.wizard.params.step3.installation"/></a>
</i>
</p>
</li>
- <li><label wicket:for="cfg.swfPath">SWFTools Path</label>
+ <li><label wicket:for="cfg.swfPath"><wicket:message key="install.wizard.params.step3.swfPath"/></label>
<input wicket:id="cfg.swfPath"
- title="Enter the path to swftools for example C:/swftools (Windows) or leave blank if swftools is a known to your system path"
+ wicket:message="title:install.wizard.params.step3.swfPath.title"
type="text" />
<p>
- <i>You can test if swftools is installed into system path by
- opening a shell or cmd-prompt and type pdf2swf If this shows
- a list of options leave this field blank otherwise you have to
- specify the path to pdf2swf on your system see also <a
+ <i>
+ <wicket:message key="install.wizard.params.step3.swfPath.text"/>
+ <wicket:message key="install.wizard.params.step3.seeAlso"/><a
href="http://openmeetings.apache.org/installation.html"
- target="_blank">Installation</a>
+ target="_blank"><wicket:message key="install.wizard.params.step3.installation"/></a>
</i>
- </p></li>
- <li><label wicket:for="cfg.imageMagicPath">ImageMagick Path</label>
+ </p>
+ </li>
+ <li><label wicket:for="cfg.imageMagicPath"><wicket:message key="install.wizard.params.step3.imageMagicPath"/></label>
<input wicket:id="cfg.imageMagicPath"
- title="Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path"
+ wicket:message="title:install.wizard.params.step3.imageMagicPath.title"
type="text" />
<p>
- <i>see also <a
+ <i>
+ <wicket:message key="install.wizard.params.step3.imageMagicPath.text"/>
+ <wicket:message key="install.wizard.params.step3.seeAlso"/><a
href="http://openmeetings.apache.org/installation.html"
- target="_blank">Installation</a></i>
- </p></li>
- <li><label wicket:for="cfg.ffmpegPath">FFMPEG Path</label>
+ target="_blank"><wicket:message key="install.wizard.params.step3.installation"/></a>
+ </i>
+ </p>
+ </li>
+ <li><label wicket:for="cfg.ffmpegPath"><wicket:message key="install.wizard.params.step3.ffmpegPath"/></label>
<input wicket:id="cfg.ffmpegPath"
- title="Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path"
- type="text" />
+ wicket:message="title:install.wizard.params.step3.ffmpegPath.title" type="text" />
<p>
- <i>see also <a
+ <i>
+ <wicket:message key="install.wizard.params.step3.ffmpegPath.text"/>
+ <wicket:message key="install.wizard.params.step3.seeAlso"/><a
href="http://openmeetings.apache.org/installation.html"
- target="_blank">Installation</a></i>
- </p></li>
- <li><label wicket:for="cfg.soxPath">SoX Path</label>
+ target="_blank"><wicket:message key="install.wizard.params.step3.installation"/></a>
+ </i>
+ </p>
+ </li>
+ <li><label wicket:for="cfg.soxPath"><wicket:message key="install.wizard.params.step3.soxPath"/></label>
<input wicket:id="cfg.soxPath"
- title="Enter the path to SoX, leave blank if SoX is successfully installed to system-path"
+ wicket:message="title:install.wizard.params.step3.soxPath.title"
type="text" />
<p>
- <i>see also <a
+ <i>
+ <wicket:message key="install.wizard.params.step3.soxPath.text"/>
+ <wicket:message key="install.wizard.params.step3.seeAlso"/><a
href="http://openmeetings.apache.org/installation.html"
- target="_blank">Installation</a></i>
- </p></li>
- <li><label wicket:for="cfg.jodPath">JOD Path</label>
+ target="_blank"><wicket:message key="install.wizard.params.step3.installation"/></a>
+ </i>
+ </p>
+ </li>
+ <li><label wicket:for="cfg.jodPath"><wicket:message key="install.wizard.params.step3.jodPath"/></label>
<input wicket:id="cfg.jodPath"
- title="The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar"
+ wicket:message="title:install.wizard.params.step3.jodPath.title"
type="text" />
<p>
- <i>see also <a
+ <i>
+ <wicket:message key="install.wizard.params.step3.jodPath.text"/>
+ <wicket:message key="install.wizard.params.step3.seeAlso"/><a
href="http://openmeetings.apache.org/installation.html"
- target="_blank">Installation</a></i>
- </p></li>
- <li><label wicket:for="cfg.officePath">OpenOffice/LibreOffice Path for jodconverter</label>
+ target="_blank"><wicket:message key="install.wizard.params.step3.installation"/></a>
+ </i>
+ </p>
+ </li>
+ <li><label wicket:for="cfg.officePath"><wicket:message key="install.wizard.params.step3.officePath"/></label>
<input wicket:id="cfg.officePath"
- title="The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically"
+ wicket:message="title:install.wizard.params.step3.officePath.title"
type="text" />
- <p>The path to OpenOffice/LibreOffice (optional) please set this
- to the real path in case jodconverter is unable to find
- OpenOffice/LibreOffice installation</p></li>
+ <p>
+ <i>
+ <wicket:message key="install.wizard.params.step3.officePath.text"/>
+ <wicket:message key="install.wizard.params.step3.seeAlso"/><a
+ href="http://openmeetings.apache.org/installation.html"
+ target="_blank"><wicket:message key="install.wizard.params.step3.installation"/></a>
+ </i>
+ </p>
+ </li>
</ul>
</fieldset>
</wicket:panel>
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard%24ParamsStep4.html?rev=1527370&r1=1527369&r2=1527370&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html Sun Sep 29 17:54:54 2013
@@ -21,45 +21,41 @@
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<fieldset id="userConf2">
-
- <legend>Crypt Type</legend>
+ <legend><wicket:message key="install.wizard.params.step4.crypt"/></legend>
<ul>
- <li><label wicket:for="cfg.cryptClassName">Crypt Class</label>
- <input wicket:id="cfg.cryptClassName" type="text"
- title="Enter the Class name of the Encryption Class. DO NOT ALTER THIS IF YOU ARE NOT SURE" />
+ <li><label wicket:for="cfg.cryptClassName"><wicket:message key="install.wizard.params.step4.cryptClassName"/></label>
+ <input wicket:id="cfg.cryptClassName" type="text"
+ wicket:message="title:install.wizard.params.step4.cryptClassName.title" />
<p>
- <i> You can use this default crypt type which is equal to
- PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
- for more information or to write your own Crypt-Style see: <a
- href="http://openmeetings.apache.org/CustomCryptMechanism.html"
- target="_blank">Custom Crypt Mechanism</a> You can edit this
- value later BUT previous created Users and Sessions might be not
- usable anymore
+ <i>
+ <wicket:message key="install.wizard.params.step4.cryptClassName.text"/>
</i>
- </p></li>
+ </p>
+ </li>
</ul>
</fieldset>
<fieldset id="red5sip">
- <legend>red5SIP Configuration</legend>
+ <legend><wicket:message key="install.wizard.params.step4.red5SIP"/></legend>
<ul>
- <li><label wicket:for="red5SipEnable">Enable SIP</label>
+ <li><label wicket:for="red5SipEnable"><wicket:message key="install.wizard.params.step4.red5SipEnable"/></label>
<select wicket:id="red5SipEnable"></select>
<p>
- <i> Enable red5SIP integration </i>
- </p> </li>
-
- <li><label wicket:for="cfg.red5SipRoomPrefix">SIP rooms prefix</label>
+ <i><wicket:message key="install.wizard.params.step4.red5SipEnable.text"/></i>
+ </p>
+ </li>
+ <li><label wicket:for="cfg.red5SipRoomPrefix"><wicket:message key="install.wizard.params.step4.red5SipRoomPrefix"/></label>
<input wicket:id="cfg.red5SipRoomPrefix" type="text" />
<p>
- <i>Prefix for phone number of conference rooms</i>
- </p></li>
-
- <li><label wicket:for="cfg.red5SipExtenContext">SIP extensions context</label>
+ <i><wicket:message key="install.wizard.params.step4.red5SipRoomPrefix.text"/></i>
+ </p>
+ </li>
+ <li><label wicket:for="cfg.red5SipExtenContext"><wicket:message key="install.wizard.params.step4.red5SipExtenContext"/></label>
<input wicket:id="cfg.red5SipExtenContext" type="text" />
<p>
- <i>Context of Asterisk extensions</i>
- </p></li>
+ <i><wicket:message key="install.wizard.params.step4.red5SipExtenContext.text"/></i>
+ </p>
+ </li>
</ul>
</fieldset>
</wicket:panel>
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1527370&r1=1527369&r2=1527370&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java Sun Sep 29 17:54:54 2013
@@ -46,6 +46,7 @@ import org.apache.wicket.extensions.wiza
import org.apache.wicket.extensions.wizard.dynamic.DynamicWizardStep;
import org.apache.wicket.extensions.wizard.dynamic.IDynamicWizardStep;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
@@ -309,17 +310,17 @@ public class InstallWizard extends Wizar
private WebMarkupContainer container = new WebMarkupContainer("container");
private AbstractAjaxTimerBehavior timer;
private ProgressBar progressBar;
- private WebMarkupContainer desc = new WebMarkupContainer("desc");
- //private Label value;
+ private Label desc = new Label("desc", getString("install.wizard.install.desc"));
private boolean started = false;
public void startInstallation(AjaxRequestTarget target) {
started = true;
timer.restart(target);
new Thread(new InstallProcess(Application.get()._getBean(ImportInitvalues.class))
- , "Openmeetings - Installation").start(); //TODO remove hardcoded
+ , "Openmeetings - Installation").start();
//progressBar.setVisible(true);
- target.add(container);
+ desc.setDefaultModelObject(getString("install.wizard.install.started"));
+ target.add(desc, container);
}
public InstallStep() {
@@ -340,7 +341,7 @@ public class InstallWizard extends Wizar
timer.stop(target);
//TODO change text, localize
progressBar.setVisible(false);
- target.add(container.replace(new ErrorMessagePanel("status", "Installation is failed", th))
+ target.add(container.replace(new ErrorMessagePanel("status", getString("install.wizard.install.failed"), th))
, desc.setVisible(false)
);
} else {