Skip to content

Commit

Permalink
more bootstrap migration for 1.3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@Guite
Guite committed Sep 24, 2013
1 parent 68dca04 commit 198f9c4
Show file tree
Hide file tree
Showing 24 changed files with 321 additions and 127 deletions.
15 changes: 11 additions & 4 deletions ...udio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/Forms.xtend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,17 @@ class Forms {
def private templateHeader(Controller it) {
switch it {
AdminController: '''
<div class="z-admin-content-pagetitle">
{icon type=$adminPageIcon size='small' alt=$templateTitle}
<h3>{$templateTitle}</h3>
</div>
«IF container.application.targets('1.3.5')»
<div class="z-admin-content-pagetitle">
{icon type=$adminPageIcon size='small' alt=$templateTitle}
<h3>{$templateTitle}</h3>
</div>
«ELSE»
<h3>
{icon type=$adminPageIcon size='small' alt=$templateTitle}
{$templateTitle}
</h3>
«ENDIF»
'''
default: '''
<div class="z-frontendcontainer">
Expand Down
15 changes: 11 additions & 4 deletions ...nerator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/Config.xtend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,17 @@ class Config {
{gt text='Settings' assign='templateTitle'}
{pagesetvar name='title' value=$templateTitle}
«IF configController.formatForDB == 'admin'»
<div class="z-admin-content-pagetitle">
{icon type='config' size='small' __alt='Settings'}
<h3>{$templateTitle}</h3>
</div>
«IF targets('1.3.5')»
<div class="z-admin-content-pagetitle">
{icon type='config' size='small' __alt='Settings'}
<h3>{$templateTitle}</h3>
</div>
«ELSE»
<h3>
{icon type='config' size='small' __alt='Settings'}
{$templateTitle}
</h3>
«ENDIF»
«ELSE»
<div class="z-frontendcontainer">
<h2>{$templateTitle}</h2>
Expand Down
15 changes: 11 additions & 4 deletions ...nerator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/Custom.xtend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,17 @@ class Custom {
def private templateHeader(Controller it, String actionName) {
switch it {
AdminController: '''
<div class="z-admin-content-pagetitle">
{icon type='options' size='small' __alt='«actionName.formatForDisplayCapital»'}
<h3>{$templateTitle}</h3>
</div>
«IF container.application.targets('1.3.5')»
<div class="z-admin-content-pagetitle">
{icon type='options' size='small' __alt='«actionName.formatForDisplayCapital»'}
<h3>{$templateTitle}</h3>
</div>
«ELSE»
<h3>
{icon type='options' size='small' __alt='«actionName.formatForDisplayCapital»'}
{$templateTitle}
</h3>
«ENDIF»
'''
default: '''
<div class="z-frontendcontainer">
Expand Down
15 changes: 11 additions & 4 deletions ...nerator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/Delete.xtend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,17 @@ class Delete {
def private templateHeader(Controller it) {
switch it {
AdminController: '''
<div class="z-admin-content-pagetitle">
{icon type='delete' size='small' __alt='Delete'}
<h3>{$templateTitle}</h3>
</div>
«IF container.application.targets('1.3.5')»
<div class="z-admin-content-pagetitle">
{icon type='delete' size='small' __alt='Delete'}
<h3>{$templateTitle}</h3>
</div>
«ELSE»
<h3>
{icon type='delete' size='small' __alt='Delete'}
{$templateTitle}
</h3>
«ENDIF»
'''
default: '''
<div class="z-frontendcontainer">
Expand Down
15 changes: 11 additions & 4 deletions ...erator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/Display.xtend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,17 @@ class Display {
def private templateHeader(Controller it, Entity entity, String appName) {
switch it {
AdminController: '''
<div class="z-admin-content-pagetitle">
{icon type='display' size='small' __alt='Details'}
<h3>«templateHeading(entity, appName)»</h3>
</div>
«IF container.application.targets('1.3.5')»
<div class="z-admin-content-pagetitle">
{icon type='display' size='small' __alt='Details'}
<h3>«templateHeading(entity, appName)»</h3>
</div>
«ELSE»
<h3>
{icon type='display' size='small' __alt='Details'}
«templateHeading(entity, appName)»
</h3>
«ENDIF»
'''
default: '''
<div class="z-frontendcontainer">
Expand Down
15 changes: 11 additions & 4 deletions ...generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/View.xtend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,10 +307,17 @@ class View {
def private templateHeader(Controller it) {
switch it {
AdminController: '''
<div class="z-admin-content-pagetitle">
{icon type='view' size='small' alt=$templateTitle}
<h3>{$templateTitle}</h3>
</div>
«IF container.application.targets('1.3.5')»
<div class="z-admin-content-pagetitle">
{icon type='view' size='small' alt=$templateTitle}
<h3>{$templateTitle}</h3>
</div>
«ELSE»
<h3>
{icon type='view' size='small' alt=$templateTitle}
{$templateTitle}
</h3>
«ENDIF»
'''
default: '''
<div class="z-frontendcontainer">
Expand Down
15 changes: 11 additions & 4 deletions .../src/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/ViewHierarchy.xtend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,17 @@ class ViewHierarchy {
def private templateHeader(Controller it) {
switch it {
AdminController: '''
<div class="z-admin-content-pagetitle">
{icon type='view' size='small' alt=$templateTitle}
<h3>{$templateTitle}</h3>
</div>
«IF container.application.targets('1.3.5')»
<div class="z-admin-content-pagetitle">
{icon type='view' size='small' alt=$templateTitle}
<h3>{$templateTitle}</h3>
</div>
«ELSE»
<h3>
{icon type='view' size='small' alt=$templateTitle}
{$templateTitle}
</h3>
«ENDIF»
'''
default: '''
<div class="z-frontendcontainer">
Expand Down
2 changes: 1 addition & 1 deletion ...rc/org/zikula/modulestudio/generator/cartridges/zclassic/view/plugin/form/UserInput.xtend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ class UserInput {
<div id="' . $this->getId() . 'SelectorChoices" class="«prefix»AutoCompleteUser"></div>';

if ($this->mandatory && $this->mandatorysym) {
$result .= '<span class="z-form-mandatory-flag">*</span>';
$result .= '<span class="«IF targets('1.3.5')»z-form-mandatory-flag«ELSE»requires«ENDIF»">*</span>';
}

$result .= '</div>' . "\n";
Expand Down
Binary file modified ...r/xtend-gen/org/zikula/modulestudio/generator/cartridges/zclassic/view/.Forms.java._trace
View file
Binary file not shown.
39 changes: 29 additions & 10 deletions ...generator/xtend-gen/org/zikula/modulestudio/generator/cartridges/zclassic/view/Forms.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import de.guite.modulestudio.metamodel.modulestudio.AdminController;
import de.guite.modulestudio.metamodel.modulestudio.Application;
import de.guite.modulestudio.metamodel.modulestudio.Controller;
import de.guite.modulestudio.metamodel.modulestudio.Controllers;
import de.guite.modulestudio.metamodel.modulestudio.DateField;
import de.guite.modulestudio.metamodel.modulestudio.DatetimeField;
import de.guite.modulestudio.metamodel.modulestudio.DerivedField;
Expand Down Expand Up @@ -336,16 +337,34 @@ private CharSequence templateHeader(final Controller it) {
final AdminController _adminController = (AdminController)it;
_matched=true;
StringConcatenation _builder = new StringConcatenation();
_builder.append("<div class=\"z-admin-content-pagetitle\">");
_builder.newLine();
_builder.append(" ");
_builder.append("{icon type=$adminPageIcon size=\'small\' alt=$templateTitle}");
_builder.newLine();
_builder.append(" ");
_builder.append("<h3>{$templateTitle}</h3>");
_builder.newLine();
_builder.append("</div>");
_builder.newLine();
{
Controllers _container = _adminController.getContainer();
Application _application = _container.getApplication();
boolean _targets = this._utils.targets(_application, "1.3.5");
if (_targets) {
_builder.append("<div class=\"z-admin-content-pagetitle\">");
_builder.newLine();
_builder.append(" ");
_builder.append("{icon type=$adminPageIcon size=\'small\' alt=$templateTitle}");
_builder.newLine();
_builder.append(" ");
_builder.append("<h3>{$templateTitle}</h3>");
_builder.newLine();
_builder.append("</div>");
_builder.newLine();
} else {
_builder.append("<h3>");
_builder.newLine();
_builder.append(" ");
_builder.append("{icon type=$adminPageIcon size=\'small\' alt=$templateTitle}");
_builder.newLine();
_builder.append(" ");
_builder.append("{$templateTitle}");
_builder.newLine();
_builder.append("</h3>");
_builder.newLine();
}
}
_switchResult = _builder;
}
}
Expand Down
Binary file modified ...-gen/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/.Config.java._trace
View file
Binary file not shown.
Binary file modified ...-gen/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/.Custom.java._trace
View file
Binary file not shown.
Binary file modified ...-gen/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/.Delete.java._trace
View file
Binary file not shown.
Binary file modified ...gen/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/.Display.java._trace
View file
Binary file not shown.
Binary file modified ...nd-gen/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/.View.java._trace
View file
Binary file not shown.
Binary file modified ...g/zikula/modulestudio/generator/cartridges/zclassic/view/pages/.ViewHierarchy.java._trace
View file
Binary file not shown.
80 changes: 50 additions & 30 deletions ...or/xtend-gen/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/Config.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,20 +122,40 @@ private CharSequence configView(final Application it) {
String _formatForDB_2 = this._formattingExtensions.formatForDB(_configController_2);
boolean _equals = Objects.equal(_formatForDB_2, "admin");
if (_equals) {
_builder.append(" ");
_builder.append("<div class=\"z-admin-content-pagetitle\">");
_builder.newLine();
_builder.append(" ");
_builder.append(" ");
_builder.append("{icon type=\'config\' size=\'small\' __alt=\'Settings\'}");
_builder.newLine();
_builder.append(" ");
_builder.append(" ");
_builder.append("<h3>{$templateTitle}</h3>");
_builder.newLine();
_builder.append(" ");
_builder.append("</div>");
_builder.newLine();
{
boolean _targets_1 = this._utils.targets(it, "1.3.5");
if (_targets_1) {
_builder.append(" ");
_builder.append("<div class=\"z-admin-content-pagetitle\">");
_builder.newLine();
_builder.append(" ");
_builder.append(" ");
_builder.append("{icon type=\'config\' size=\'small\' __alt=\'Settings\'}");
_builder.newLine();
_builder.append(" ");
_builder.append(" ");
_builder.append("<h3>{$templateTitle}</h3>");
_builder.newLine();
_builder.append(" ");
_builder.append("</div>");
_builder.newLine();
} else {
_builder.append(" ");
_builder.append("<h3>");
_builder.newLine();
_builder.append(" ");
_builder.append(" ");
_builder.append("{icon type=\'config\' size=\'small\' __alt=\'Settings\'}");
_builder.newLine();
_builder.append(" ");
_builder.append(" ");
_builder.append("{$templateTitle}");
_builder.newLine();
_builder.append(" ");
_builder.append("</h3>");
_builder.newLine();
}
}
} else {
_builder.append(" ");
_builder.append("<div class=\"z-frontendcontainer\">");
Expand All @@ -150,17 +170,17 @@ private CharSequence configView(final Application it) {
_builder.append(" ");
_builder.append("{form cssClass=\'");
{
boolean _targets_1 = this._utils.targets(it, "1.3.5");
if (_targets_1) {
boolean _targets_2 = this._utils.targets(it, "1.3.5");
if (_targets_2) {
_builder.append("z-form");
} else {
_builder.append("form-horizontal");
}
}
_builder.append("\'");
{
boolean _targets_2 = this._utils.targets(it, "1.3.5");
boolean _not = (!_targets_2);
boolean _targets_3 = this._utils.targets(it, "1.3.5");
boolean _not = (!_targets_3);
if (_not) {
_builder.append(" role=\'form\'");
}
Expand Down Expand Up @@ -223,8 +243,8 @@ private CharSequence configView(final Application it) {
_builder.append(" ");
_builder.append("<div class=\"");
{
boolean _targets_3 = this._utils.targets(it, "1.3.5");
if (_targets_3) {
boolean _targets_4 = this._utils.targets(it, "1.3.5");
if (_targets_4) {
_builder.append("z-buttons z-formbuttons");
} else {
_builder.append("form-group form-buttons");
Expand All @@ -233,8 +253,8 @@ private CharSequence configView(final Application it) {
_builder.append("\">");
_builder.newLineIfNotEmpty();
{
boolean _targets_4 = this._utils.targets(it, "1.3.5");
boolean _not_1 = (!_targets_4);
boolean _targets_5 = this._utils.targets(it, "1.3.5");
boolean _not_1 = (!_targets_5);
if (_not_1) {
_builder.append(" ");
_builder.append("<div class=\"col-lg-offset-3 col-lg-9\">");
Expand All @@ -244,8 +264,8 @@ private CharSequence configView(final Application it) {
_builder.append(" ");
_builder.append("{formbutton commandName=\'save\' __text=\'Update configuration\' class=\'");
{
boolean _targets_5 = this._utils.targets(it, "1.3.5");
if (_targets_5) {
boolean _targets_6 = this._utils.targets(it, "1.3.5");
if (_targets_6) {
_builder.append("z-bt-save");
} else {
_builder.append("btn btn-success");
Expand All @@ -256,8 +276,8 @@ private CharSequence configView(final Application it) {
_builder.append(" ");
_builder.append("{formbutton commandName=\'cancel\' __text=\'Cancel\' class=\'");
{
boolean _targets_6 = this._utils.targets(it, "1.3.5");
if (_targets_6) {
boolean _targets_7 = this._utils.targets(it, "1.3.5");
if (_targets_7) {
_builder.append("z-bt-cancel");
} else {
_builder.append("btn btn-default");
Expand All @@ -266,8 +286,8 @@ private CharSequence configView(final Application it) {
_builder.append("\'}");
_builder.newLineIfNotEmpty();
{
boolean _targets_7 = this._utils.targets(it, "1.3.5");
boolean _not_2 = (!_targets_7);
boolean _targets_8 = this._utils.targets(it, "1.3.5");
boolean _not_2 = (!_targets_8);
if (_not_2) {
_builder.append(" ");
_builder.append("</div>");
Expand Down Expand Up @@ -302,8 +322,8 @@ private CharSequence configView(final Application it) {
_builder.newLine();
_builder.append("{include file=\'");
{
boolean _targets_8 = this._utils.targets(it, "1.3.5");
if (_targets_8) {
boolean _targets_9 = this._utils.targets(it, "1.3.5");
if (_targets_9) {
String _configController_4 = this._controllerExtensions.configController(it);
String _formatForDB_6 = this._formattingExtensions.formatForDB(_configController_4);
_builder.append(_formatForDB_6, "");
Expand Down
Loading

0 comments on commit 198f9c4

Please sign in to comment.