Skip to content

Commit

Permalink
basic migration of 1.3.6 target to bootstrap css
Browse files Browse the repository at this point in the history
  • Loading branch information
@Guite
Guite committed Sep 22, 2013
1 parent 46b6847 commit 345a6d7
Show file tree
Hide file tree
Showing 105 changed files with 6,816 additions and 1,793 deletions.
7 changes: 4 additions & 3 deletions ...rc/org/zikula/modulestudio/generator/cartridges/zclassic/controller/ControllerLayer.xtend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,8 @@ class ControllerLayer {
if (SecurityUtil::checkPermission($this->name . '::', '::', ACCESS_ADMIN)) {
$links[] = array('url' => ModUtil::url($this->name, '«app.configController.formatForDB»', 'config'),
'text' => $this->__('Configuration'),
'title' => $this->__('Manage settings for this application'));
'title' => $this->__('Manage settings for this application')«IF !app.targets('1.3.5')»,
'icon' => 'wrench'«ENDIF»);
}
«ENDIF»

Expand All @@ -439,7 +440,7 @@ class ControllerLayer {
$links[] = array('url' => ModUtil::url($this->name, '«userController.formattedName»', «userController.indexUrlDetails»),
'text' => $this->__('Frontend'),
'title' => $this->__('Switch to user area.'),
'class' => 'z-icon-es-home');
«IF container.application.targets('1.3.5')»'class' => 'z-icon-es-home'«ELSE»'icon' => 'home'«ENDIF»);
}
'''
UserController case !container.getAdminControllers.empty: '''
Expand All @@ -448,7 +449,7 @@ class ControllerLayer {
$links[] = array('url' => ModUtil::url($this->name, '«adminController.formattedName»', «adminController.indexUrlDetails»),
'text' => $this->__('Backend'),
'title' => $this->__('Switch to administration area.'),
'class' => 'z-icon-es-options');
«IF container.application.targets('1.3.5')»'class' => 'z-icon-es-options'«ELSE»'icon' => 'wrench'«ENDIF»);
}
'''
}
Expand Down
16 changes: 8 additions & 8 deletions ...a/modulestudio/generator/cartridges/zclassic/controller/javascript/DisplayFunctions.xtend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class DisplayFunctions {
// process normal links
$$('#' + containerId + ' a').each(function (elem) {
// hide it
elem.addClassName('z-hide');
elem.addClassName('«IF targets('1.3.5')»z-«ENDIF»hide');
// determine the link text
var linkText = '';
if (func === 'display') {
Expand Down Expand Up @@ -133,7 +133,7 @@ class DisplayFunctions {
}
});
});
$(triggerId).removeClassName('z-hide');
$(triggerId).removeClassName('«IF targets('1.3.5')»z-«ENDIF»hide');
}
'''
Expand Down Expand Up @@ -244,7 +244,7 @@ class DisplayFunctions {
var newWindow;

// show the container (hidden for users without JavaScript)
containerElem.removeClassName('z-hide');
containerElem.removeClassName('«IF targets('1.3.5')»z-«ENDIF»hide');

// define the new window instance
newWindow = new Zikula.UI.Window(
Expand Down Expand Up @@ -278,7 +278,7 @@ class DisplayFunctions {
}
$('toggle' + idSuffix).observe('click', function() {
«prefix()»ToggleFlag(objectType, fieldName, itemId);
}).removeClassName('z-hide');
}).removeClassName('«IF targets('1.3.5')»z-«ENDIF»hide');
}

'''
Expand Down Expand Up @@ -309,11 +309,11 @@ class DisplayFunctions {
var idSuffix = fieldName.toLowerCase() + '_' + itemId;
var state = data.state;
if (state === true) {
$('no' + idSuffix).addClassName('z-hide');
$('yes' + idSuffix).removeClassName('z-hide');
$('no' + idSuffix).addClassName('«IF targets('1.3.5')»z-«ENDIF»hide');
$('yes' + idSuffix).removeClassName('«IF targets('1.3.5')»z-«ENDIF»hide');
} else {
$('yes' + idSuffix).addClassName('z-hide');
$('no' + idSuffix).removeClassName('z-hide');
$('yes' + idSuffix).addClassName('«IF targets('1.3.5')»z-«ENDIF»hide');
$('no' + idSuffix).removeClassName('«IF targets('1.3.5')»z-«ENDIF»hide');
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions ...kula/modulestudio/generator/cartridges/zclassic/controller/javascript/EditFunctions.xtend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class EditFunctions {
if ($(fieldName + 'LiveSearch') === undefined) {
return;
}
$(fieldName + 'LiveSearch').removeClassName('z-hide');
$(fieldName + 'LiveSearch').removeClassName('«IF targets('1.3.5')»z-«ENDIF»hide');
new Ajax.Autocompleter(
fieldName + 'Selector',
fieldName + 'SelectorChoices',
Expand Down Expand Up @@ -104,7 +104,7 @@ class EditFunctions {
$('reset' + fieldName.capitalize() + 'Val').observe('click', function (evt) {
evt.preventDefault();
«prefix»ResetUploadField(fieldName);
}).removeClassName('z-hide');
}).removeClassName('«IF targets('1.3.5')»z-«ENDIF»hide');
}
}
'''
Expand Down Expand Up @@ -134,7 +134,7 @@ class EditFunctions {
$('reset' + fieldName.capitalize() + 'Val').observe('click', function (evt) {
evt.preventDefault();
«prefix»ResetDateField(fieldName);
}).removeClassName('z-hide');
}).removeClassName('«IF targets('1.3.5')»z-«ENDIF»hide');
}
}
'''
Expand Down Expand Up @@ -189,7 +189,7 @@ class EditFunctions {
this.stopIndicator();
var idPrefix = this.options.indicator.replace('Indicator', '');
if ($(idPrefix + 'NoResultsHint') != undefined) {
$(idPrefix + 'NoResultsHint').removeClassName('z-hide');
$(idPrefix + 'NoResultsHint').removeClassName('«IF targets('1.3.5')»z-«ENDIF»hide');
}
} else {
this.update.innerHTML = choices;
Expand Down Expand Up @@ -254,10 +254,10 @@ class EditFunctions {
}

// show/hide the toggle link
$(idPrefix + 'AddLink').toggleClassName('z-hide');
$(idPrefix + 'AddLink').toggleClassName('«IF targets('1.3.5')»z-«ENDIF»hide');

// hide/show the fields
$(idPrefix + 'AddFields').toggleClassName('z-hide');
$(idPrefix + 'AddFields').toggleClassName('«IF targets('1.3.5')»z-«ENDIF»hide');
}
'''
Expand Down Expand Up @@ -472,7 +472,7 @@ class EditFunctions {
}

if ($(idPrefix + 'NoResultsHint') != undefined) {
$(idPrefix + 'NoResultsHint').addClassName('z-hide');
$(idPrefix + 'NoResultsHint').addClassName('«IF targets('1.3.5')»z-«ENDIF»hide');
}

return queryString;
Expand Down
10 changes: 5 additions & 5 deletions .../org/zikula/modulestudio/generator/cartridges/zclassic/controller/javascript/Finder.xtend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class Finder {
$('«appName»_pagesize').observe('change', «name.formatForDB».finder.onParamChanged);
$('«appName»_gosearch').observe('click', «name.formatForDB».finder.onParamChanged)
.observe('keypress', «name.formatForDB».finder.onParamChanged);
$('«appName»_submit').addClassName('z-hide');
$('«appName»_submit').addClassName('«IF targets('1.3.5')»z-«ENDIF»hide');
$('«appName»_cancel').observe('click', «name.formatForDB».finder.handleCancel);
};

Expand Down Expand Up @@ -225,7 +225,7 @@ class Finder {

«name.formatForDB».itemSelector.onParamChanged = function ()
{
$('ajax_indicator').removeClassName('z-hide');
$('ajax_indicator').removeClassName('«IF targets('1.3.5')»z-«ENDIF»hide');

«name.formatForDB».itemSelector.getItemList();
};
Expand Down Expand Up @@ -253,7 +253,7 @@ class Finder {
var baseId;
baseId = «name.formatForDB».itemSelector.baseId;
«name.formatForDB».itemSelector.items[baseId] = req.getData();
$('ajax_indicator').addClassName('z-hide');
$('ajax_indicator').addClassName('«IF targets('1.3.5')»z-«ENDIF»hide');
«name.formatForDB».itemSelector.updateItemDropdownEntries();
«name.formatForDB».itemSelector.updatePreview();
}
Expand Down Expand Up @@ -286,7 +286,7 @@ class Finder {
baseId = «name.formatForDB».itemSelector.baseId;
items = «name.formatForDB».itemSelector.items[baseId];

$(baseId + '_previewcontainer').addClassName('z-hide');
$(baseId + '_previewcontainer').addClassName('«IF targets('1.3.5')»z-«ENDIF»hide');

if (items.length === 0) {
return;
Expand All @@ -304,7 +304,7 @@ class Finder {

if (selectedElement !== null) {
$(baseId + '_previewcontainer').update(window.atob(selectedElement.previewInfo))
.removeClassName('z-hide');
.removeClassName('«IF targets('1.3.5')»z-«ENDIF»hide');
}
};

Expand Down
65 changes: 48 additions & 17 deletions .../org/zikula/modulestudio/generator/cartridges/zclassic/controller/util/WorkflowUtil.xtend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,21 @@ class WorkflowUtil {

'''
def private stateInfo(ListFieldItem it) '''
$states[] = array('value' => '«value»',
'text' => $this->__('«name»'),
'icon' => '«stateIcon»led.png');
def private stateInfo(Application it, ListFieldItem item) '''
$states[] = array('value' => '«item.value»',
'text' => $this->__('«item.name»'),
'ui' => '«uiFeedback(item)»');
'''
def private stateIcon(ListFieldItem it) {
def private uiFeedback(Application it, ListFieldItem item) {
if (targets('1.3.5')) {
return item.stateIcon135
} else {
return item.stateLabel
}
}
def private stateIcon135(ListFieldItem it) {
switch (it.value) {
case 'initial': 'red'
case 'deferred': 'red'
Expand All @@ -112,6 +120,21 @@ class WorkflowUtil {
}
}
def private stateLabel(ListFieldItem it) {
switch (it.value) {
case 'initial': 'danger'
case 'deferred': 'danger'
case 'waiting': 'warning'
case 'accepted': 'warning'
case 'approved': 'success'
case 'suspended': 'primary'
case 'archived': 'info'
case 'trashed': 'danger'
case 'deleted': 'danger'
default: 'default'
}
}
def private getStateInfo(Application it) '''
/**
* This method returns information about a certain state.
Expand Down Expand Up @@ -240,10 +263,10 @@ class WorkflowUtil {
break;
«ENDIF»
case 'submit':
$buttonClass = 'ok';//'new';
$buttonClass = '«IF targets('1.3.5')»ok«ELSE»success«ENDIF»';
break;
case 'update':
$buttonClass = 'save';//'edit';
$buttonClass = '«IF targets('1.3.5')»ok«ELSE»success«ENDIF»';
break;
«IF hasWorkflowState('deferred')»
case 'reject':
Expand All @@ -252,12 +275,12 @@ class WorkflowUtil {
«ENDIF»
«IF hasWorkflowState('accepted')»
case 'accept':
$buttonClass = 'ok';
$buttonClass = '«IF targets('1.3.5')»ok«ELSE»default«ENDIF»';
break;
«ENDIF»
«IF hasWorkflow(EntityWorkflowType::STANDARD) || hasWorkflow(EntityWorkflowType::ENTERPRISE)»
case 'approve':
$buttonClass = 'ok';
$buttonClass = '«IF targets('1.3.5')»ok«ENDIF»';
break;
«ENDIF»
«IF hasWorkflowState('accepted')»
Expand All @@ -267,33 +290,41 @@ class WorkflowUtil {
«ENDIF»
«IF hasWorkflowState('suspended')»
case 'unpublish':
$buttonClass = '';//'filter';
$buttonClass = '';
break;
case 'publish':
$buttonClass = 'ok';
$buttonClass = '«IF targets('1.3.5')»ok«ENDIF»';
break;
«ENDIF»
«IF hasWorkflowState('archived')»
case 'archive':
$buttonClass = 'archive';
$buttonClass = '«IF targets('1.3.5')»archive«ENDIF»';
break;
«ENDIF»
«IF hasWorkflowState('trashed')»
case 'trash':
$buttonClass = '';
break;
case 'recover':
$buttonClass = 'ok';
$buttonClass = '«IF targets('1.3.5')»ok«ENDIF»';
break;
«ENDIF»
case 'delete':
$buttonClass = 'delete z-btred';
$buttonClass = '«IF targets('1.3.5')»delete z-btred«ELSE»danger«ENDIF»';
break;
}

if (!empty($buttonClass)) {
$buttonClass = 'z-bt-' . $buttonClass;
}
«IF targets('1.3.5')»
if (!empty($buttonClass)) {
$buttonClass = 'z-bt-' . $buttonClass;
}
«ELSE»
if (empty($buttonClass)) {
$buttonClass = 'default';
}

$buttonClass = 'btn btn-' . $buttonClass;
«ENDIF»

return $buttonClass;
}
Expand Down
2 changes: 1 addition & 1 deletion ...tor/src/org/zikula/modulestudio/generator/cartridges/zclassic/smallstuff/FileHelper.xtend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class FileHelper {
'''

def msWeblink(Application it) '''
<p class="z-center">
<p class="«IF targets('1.3.5')»z«ELSE»text«ENDIF»-center">
Powered by <a href="«msUrl»" title="Get the MOST out of Zikula!">ModuleStudio «msVersion»</a>
</p>
'''
Expand Down
Loading

0 comments on commit 345a6d7

Please sign in to comment.