LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed separate labels in ThemeForm and BasicItemForm. Labels are now part of the widget. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2698 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2014-06-13 07:35:37 +00:00
parent 88b61faeb6
commit 8c3b2a4ab4
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicItemForm.java
View File

@ -178,7 +178,7 @@ public abstract class BasicItemForm extends FormSection
// title field to something different than 'title'. // title field to something different than 'title'.
// This can nowbe done by overwriting the getTitleLabel() method. // This can nowbe done by overwriting the getTitleLabel() method.
// (jensp 2011-01-28) // (jensp 2011-01-28)
add(new Label(getTitleLabel())); // add(new Label(getTitleLabel()));
final TextField titleWidget = new TextField(new TrimmedStringParameter(TITLE)); final TextField titleWidget = new TextField(new TrimmedStringParameter(TITLE));
titleWidget.setLabel(getTitleLabel()); titleWidget.setLabel(getTitleLabel());
titleWidget.setHint(getTitleHint()); titleWidget.setHint(getTitleHint());
@ -195,7 +195,7 @@ public abstract class BasicItemForm extends FormSection
// the name (or URL) field to something different than 'name (url)'. // the name (or URL) field to something different than 'name (url)'.
// This can now be accomplished by overwriting the getNameLabel() method. // This can now be accomplished by overwriting the getNameLabel() method.
// (jensp 2011-01-28) // (jensp 2011-01-28)
add(new Label(getNameLabel())); // add(new Label(getNameLabel()));
final TextField nameWidget = new TextField(new TrimmedStringParameter(NAME)); final TextField nameWidget = new TextField(new TrimmedStringParameter(NAME));
nameWidget.setLabel(getNameLabel()); nameWidget.setLabel(getNameLabel());
nameWidget.setHint(getNameHint()); nameWidget.setHint(getNameHint());

7
ccm-core/src/log4j.properties
View File

@ -63,18 +63,17 @@ log4j.logger.com.arsdigita.web.CCMApplicationContextListener=INFO
# Package templating # Package templating
# ================== # ==================
# For debuging XSLT file resolution # For debuging XSLT file resolution
log4j.logger.com.arsdigita.templating.PatternStylesheetResolver=DEBUG #log4j.logger.com.arsdigita.templating.PatternStylesheetResolver=DEBUG
log4j.logger.com.arsdigita.templating.PatternStylesheetResolver=DEBUG
# Package web # Package web
# =========== # ===========
# For debugging the general dispatcher process: # For debugging the general dispatcher process:
#log4j.logger.com.arsdigita.web.BaseServlet=DEBUG #log4j.logger.com.arsdigita.web.BaseServlet=DEBUG
log4j.logger.com.arsdigita.web.CCMDispatcherServlet=DEBUG #log4j.logger.com.arsdigita.web.CCMDispatcherServlet=DEBUG
# For debugging the JSP file dispatcher # For debugging the JSP file dispatcher
#log4j.logger.com.arsdigita.web.ApplicationFileServlet=DEBUG #log4j.logger.com.arsdigita.web.ApplicationFileServlet=DEBUG
#log4j.logger.com.arsdigita.web.DefaultApplicationFileResolver=DEBUG #log4j.logger.com.arsdigita.web.DefaultApplicationFileResolver=DEBUG
log4j.logger.com.arsdigita.web.Web=DEBUG #log4j.logger.com.arsdigita.web.Web=DEBUG

6
ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeForm.java
View File

@ -105,7 +105,7 @@ public class ThemeForm extends Form implements Cancellable, ThemeDirectorConstan
m_theme = theme; // Initialize ThemeSelectionModel m_theme = theme; // Initialize ThemeSelectionModel
// Add the Title input field // Add the Title input field
add(new Label(GlobalizationUtil.globalize("theme.title"))); // add(new Label(GlobalizationUtil.globalize("theme.title")));
m_title = new TextField(new StringParameter("title")); m_title = new TextField(new StringParameter("title"));
// Experimental. We are migrating the Label if a widget as part of the // Experimental. We are migrating the Label if a widget as part of the
// widgets's xml properties. // widgets's xml properties.
@ -115,7 +115,7 @@ public class ThemeForm extends Form implements Cancellable, ThemeDirectorConstan
m_title.setSize(40); m_title.setSize(40);
add(m_title); add(m_title);
add(new Label(GlobalizationUtil.globalize("theme.description"))); // add(new Label(GlobalizationUtil.globalize("theme.description")));
m_description = new TextArea(new StringParameter("description")); m_description = new TextArea(new StringParameter("description"));
// Experimental, see above // Experimental, see above
m_description.setLabel(GlobalizationUtil.globalize("theme.description")); m_description.setLabel(GlobalizationUtil.globalize("theme.description"));
@ -125,7 +125,7 @@ public class ThemeForm extends Form implements Cancellable, ThemeDirectorConstan
.globalize("theme.description_hint")); .globalize("theme.description_hint"));
add(m_description); add(m_description);
add(new Label(GlobalizationUtil.globalize("theme.url"))); // add(new Label(GlobalizationUtil.globalize("theme.url")));
m_url = new TextField(new StringParameter("url")); m_url = new TextField(new StringParameter("url"));
// Experimental, see above // Experimental, see above
m_url.setLabel(GlobalizationUtil.globalize("theme.url")); m_url.setLabel(GlobalizationUtil.globalize("theme.url"));