Skip to content

Commit

Permalink
new layout system finished. decided drag and drop was not practicable…
Browse files Browse the repository at this point in the history 
… for mobile devices.
  • Loading branch information
@danielkerr
danielkerr committed Apr 29, 2016
1 parent 06585d1 commit 339b431
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 38 deletions.
7 changes: 4 additions & 3 deletions upload/admin/controller/design/layout.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,8 @@ protected function getForm() {

$data['cancel'] = $this->url->link('design/layout', 'token=' . $this->session->data['token'] . $url, true);

$data['token'] = $this->session->data['token'];

if (isset($this->request->get['layout_id']) && ($this->request->server['REQUEST_METHOD'] != 'POST')) {
$layout_info = $this->model_design_layout->getLayout($this->request->get['layout_id']);
}
Expand Down Expand Up @@ -373,8 +375,7 @@ protected function getForm() {
foreach ($modules as $module) {
$module_data[] = array(
'name' => strip_tags($module['name']),
'code' => $code . '.' . $module['module_id'],
'edit' => $this->url->link('module/' . $code, 'token=' . $this->session->data['token'] . '&module_id=' . $module['module_id'], true)
'code' => $code . '.' . $module['module_id']
);
}

Expand All @@ -383,7 +384,7 @@ protected function getForm() {
'name' => strip_tags($this->language->get('heading_title')),
'code' => $code,
'module' => $module_data
);
);
}
}

Expand Down
8 changes: 4 additions & 4 deletions upload/admin/controller/sale/order.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,6 @@ public function getForm() {
$data['tab_voucher'] = $this->language->get('tab_voucher');
$data['tab_total'] = $this->language->get('tab_total');

$data['token'] = $this->session->data['token'];

$url = '';

if (isset($this->request->get['filter_order_id'])) {
Expand Down Expand Up @@ -471,6 +469,8 @@ public function getForm() {

$data['cancel'] = $this->url->link('sale/order', 'token=' . $this->session->data['token'] . $url, true);

$data['token'] = $this->session->data['token'];

if (isset($this->request->get['order_id'])) {
$order_info = $this->model_sale_order->getOrder($this->request->get['order_id']);
}
Expand Down Expand Up @@ -787,8 +787,6 @@ public function info() {
$data['tab_history'] = $this->language->get('tab_history');
$data['tab_additional'] = $this->language->get('tab_additional');

$data['token'] = $this->session->data['token'];

$url = '';

if (isset($this->request->get['filter_order_id'])) {
Expand Down Expand Up @@ -844,6 +842,8 @@ public function info() {
$data['edit'] = $this->url->link('sale/order/edit', 'token=' . $this->session->data['token'] . '&order_id=' . (int)$this->request->get['order_id'], true);
$data['cancel'] = $this->url->link('sale/order', 'token=' . $this->session->data['token'] . $url, true);

$data['token'] = $this->session->data['token'];

$data['order_id'] = $this->request->get['order_id'];

$data['store_name'] = $order_info['store_name'];
Expand Down
1 change: 0 additions & 1 deletion upload/admin/language/en-gb/design/layout.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
$_['text_add'] = 'Add Layout';
$_['text_edit'] = 'Edit Layout';
$_['text_remove'] = 'Remove';
$_['text_module'] = 'Modules';

$_['text_legend'] = 'Choose the position of the modules';

Expand Down
72 changes: 42 additions & 30 deletions upload/admin/view/template/design/layout_form.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,8 @@
</select>
<input type="hidden" name="layout_module[<?php echo $module_row; ?>][position]" value="<?php echo $layout_module['position']; ?>" />
<input type="hidden" name="layout_module[<?php echo $module_row; ?>][sort_order]" value="<?php echo $layout_module['sort_order']; ?>" />
<div class="input-group-btn">
<a href="<?php echo $layout_module['edit']; ?>" type="button" data-toggle="tooltip" title="<?php echo $button_edit; ?>" class="btn btn-primary btn-sm"><i class="fa fa-pencil"></i></a>
<button type="button" data-toggle="tooltip" title="<?php echo $button_remove; ?>" class="btn btn-danger btn-sm"><i class="fa fa fa-minus-circle"></i></button>
<div class="input-group-btn"><a href="" type="button" data-toggle="tooltip" title="<?php echo $button_edit; ?>" target="_blank" class="btn btn-primary btn-sm"><i class="fa fa-pencil"></i></a>
<button type="button" onclick="$('#module-row<?php echo $module_row; ?>').remove();" data-toggle="tooltip" title="<?php echo $button_remove; ?>" class="btn btn-danger btn-sm"><i class="fa fa fa-minus-circle"></i></button>
</div>
</div></td>
</tr>
Expand All @@ -124,7 +123,7 @@
<tfoot>
<tr>
<td class="text-left"><div class="input-group">
<select name="layout_module[<?php echo $module_row; ?>][code]" class="form-control input-sm">
<select class="form-control input-sm">
<?php foreach ($extensions as $extension) { ?>
<optgroup label="<?php echo $extension['name']; ?>">
<?php if (!$extension['module']) { ?>
Expand All @@ -140,7 +139,7 @@
<input type="hidden" name="layout_module[<?php echo $module_row; ?>][position]" value="<?php echo $layout_module['position']; ?>" />
<input type="hidden" name="layout_module[<?php echo $module_row; ?>][sort_order]" value="<?php echo $layout_module['sort_order']; ?>" />
<div class="input-group-btn">
<button type="button" onclick="addModule('layout-column-left');" data-toggle="tooltip" title="<?php echo $button_module_add; ?>" class="btn btn-primary btn-sm"><i class="fa fa-plus-circle"></i></button>
<button type="button" onclick="addModule('column-left');" data-toggle="tooltip" title="<?php echo $button_module_add; ?>" class="btn btn-primary btn-sm"><i class="fa fa-plus-circle"></i></button>
</div>
</div></td>
</tr>
Expand Down Expand Up @@ -182,9 +181,8 @@
</select>
<input type="hidden" name="layout_module[<?php echo $module_row; ?>][position]" value="<?php echo $layout_module['position']; ?>" />
<input type="hidden" name="layout_module[<?php echo $module_row; ?>][sort_order]" value="<?php echo $layout_module['sort_order']; ?>" />
<div class="input-group-btn">
<a href="<?php echo $layout_module['edit']; ?>" type="button" data-toggle="tooltip" title="<?php echo $button_edit; ?>" class="btn btn-primary btn-sm"><i class="fa fa-pencil"></i></a>
<button type="button" data-toggle="tooltip" title="<?php echo $button_remove; ?>" class="btn btn-danger btn-sm"><i class="fa fa fa-minus-circle"></i></button>
<div class="input-group-btn"> <a href="" type="button" data-toggle="tooltip" title="<?php echo $button_edit; ?>" target="_blank" class="btn btn-primary btn-sm"><i class="fa fa-pencil"></i></a>
<button type="button" onclick="$('#module-row<?php echo $module_row; ?>').remove();" data-toggle="tooltip" title="<?php echo $button_remove; ?>" class="btn btn-danger btn-sm"><i class="fa fa fa-minus-circle"></i></button>
</div>
</div></td>
</tr>
Expand All @@ -195,7 +193,7 @@
<tfoot>
<tr>
<td class="text-left"><div class="input-group">
<select name="layout_module[<?php echo $module_row; ?>][code]" class="form-control input-sm">
<select class="form-control input-sm">
<?php foreach ($extensions as $extension) { ?>
<optgroup label="<?php echo $extension['name']; ?>">
<?php if (!$extension['module']) { ?>
Expand All @@ -208,9 +206,8 @@
</optgroup>
<?php } ?>
</select>

<div class="input-group-btn">
<button type="button" onclick="addModule('layout-column-left');" data-toggle="tooltip" title="<?php echo $button_module_add; ?>" class="btn btn-primary btn-sm"><i class="fa fa-plus-circle"></i></button>
<button type="button" onclick="addModule('content-top');" data-toggle="tooltip" title="<?php echo $button_module_add; ?>" class="btn btn-primary btn-sm"><i class="fa fa-plus-circle"></i></button>
</div>
</div></td>
</tr>
Expand Down Expand Up @@ -250,9 +247,8 @@
</select>
<input type="hidden" name="layout_module[<?php echo $module_row; ?>][position]" value="<?php echo $layout_module['position']; ?>" />
<input type="hidden" name="layout_module[<?php echo $module_row; ?>][sort_order]" value="<?php echo $layout_module['sort_order']; ?>" />
<div class="input-group-btn">
<a href="<?php echo $layout_module['edit']; ?>" type="button" data-toggle="tooltip" title="<?php echo $button_edit; ?>" class="btn btn-primary btn-sm"><i class="fa fa-pencil"></i></a>
<button type="button" data-toggle="tooltip" title="<?php echo $button_remove; ?>" class="btn btn-danger btn-sm"><i class="fa fa fa-minus-circle"></i></button>
<div class="input-group-btn"><a href="" type="button" data-toggle="tooltip" title="<?php echo $button_edit; ?>" target="_blank" class="btn btn-primary btn-sm"><i class="fa fa-pencil"></i></a>
<button type="button" onclick="$('#module-row<?php echo $module_row; ?>').remove();" data-toggle="tooltip" title="<?php echo $button_remove; ?>" class="btn btn-danger btn-sm"><i class="fa fa fa-minus-circle"></i></button>
</div>
</div></td>
</tr>
Expand All @@ -277,7 +273,7 @@
<?php } ?>
</select>
<div class="input-group-btn">
<button type="button" data-toggle="tooltip" title="<?php echo $button_module_add; ?>" class="btn btn-primary btn-sm"><i class="fa fa-plus-circle"></i></button>
<button type="button" onclick="addModule('content-bottom');" data-toggle="tooltip" title="<?php echo $button_module_add; ?>" class="btn btn-primary btn-sm"><i class="fa fa-plus-circle"></i></button>
</div>
</div></td>
</tr>
Expand Down Expand Up @@ -319,9 +315,8 @@
</select>
<input type="hidden" name="layout_module[<?php echo $module_row; ?>][position]" value="<?php echo $layout_module['position']; ?>" />
<input type="hidden" name="layout_module[<?php echo $module_row; ?>][sort_order]" value="<?php echo $layout_module['sort_order']; ?>" />
<div class="input-group-btn">
<a href="<?php echo $layout_module['edit']; ?>" type="button" data-toggle="tooltip" title="<?php echo $button_edit; ?>" class="btn btn-primary btn-sm"><i class="fa fa-pencil"></i></a>
<button type="button" data-toggle="tooltip" title="<?php echo $button_remove; ?>" class="btn btn-danger btn-sm"><i class="fa fa fa-minus-circle"></i></button>
<div class="input-group-btn"><a href="" data-toggle="tooltip" title="<?php echo $button_edit; ?>" target="_blank" class="btn btn-primary btn-sm"><i class="fa fa-pencil"></i></a>
<button type="button" onclick="$('#module-row<?php echo $module_row; ?>').remove();" data-toggle="tooltip" title="<?php echo $button_remove; ?>" class="btn btn-danger btn-sm"><i class="fa fa fa-minus-circle"></i></button>
</div>
</div></td>
</tr>
Expand All @@ -346,7 +341,7 @@
<?php } ?>
</select>
<div class="input-group-btn">
<button type="button" data-toggle="tooltip" title="<?php echo $button_module_add; ?>" class="btn btn-primary btn-sm"><i class="fa fa-plus-circle"></i></button>
<button type="button" onclick="addModule('column-right');" data-toggle="tooltip" title="<?php echo $button_module_add; ?>" class="btn btn-primary btn-sm"><i class="fa fa-plus-circle"></i></button>
</div>
</div></td>
</tr>
Expand Down Expand Up @@ -382,33 +377,50 @@ function addRoute() {
var module_row = <?php echo $module_row; ?>;
function addModule(type) {
html = '<tr id="module-row<?php echo $module_row; ?>">
html = '<tr id="module-row' + module_row + '">';
html += ' <td class="text-left"><div class="input-group"><select name="layout_module[' + module_row + '][code]" class="form-control input-sm">';
<?php foreach ($extensions as $extension) { ?>
html += ' <optgroup label="<?php echo addslashes($extension['name']); ?>">';
html += ' <optgroup label="<?php echo addslashes($extension['name']); ?>">';
<?php if (!$extension['module']) { ?>
html += ' <option value="<?php echo $extension['code']; ?>"><?php echo $extension['name']; ?></option>';
html += ' <option value="<?php echo $extension['code']; ?>"><?php echo addslashes($extension['name']); ?></option>';
<?php } else { ?>
<?php foreach ($extension['module'] as $module) { ?>
html += ' <option value="<?php echo $module['code']; ?>"><?php echo addslashes($module['name']); ?></option>';
html += ' <option value="<?php echo $module['code']; ?>"><?php echo addslashes($module['name']); ?></option>';
<?php } ?>
<?php } ?>
html += ' </optgroup>';
html += ' </optgroup>';
<?php } ?>
html += ' </select>';
html += '<input type="hidden" name="layout_module[' + module_row + '][position]" value="<?php echo $layout_module['position']; ?>" />';
html += '<input type="hidden" name="layout_module[' + module_row + '][sort_order]" value="<?php echo $layout_module['sort_order']; ?>" />';
html += '<div class="input-group-btn"><a href="<?php echo $layout_module['edit']; ?>" type="button" data-toggle="tooltip" title="<?php echo $button_edit; ?>" class="btn btn-primary btn-sm"><i class="fa fa-pencil"></i></a> <button type="button" data-toggle="tooltip" title="<?php echo $button_remove; ?>" class="btn btn-danger btn-sm"><i class="fa fa fa-minus-circle"></i></button></div></div></td>';
html += ' <input type="hidden" name="layout_module[' + module_row + '][position]" value="' + type.replace('-', '_') + '" />';
html += ' <input type="hidden" name="layout_module[' + module_row + '][sort_order]" value="" />';
html += ' <div class="input-group-btn"><a href="" target="_blank" type="button" data-toggle="tooltip" title="<?php echo $button_edit; ?>" class="btn btn-primary btn-sm"><i class="fa fa-pencil"></i></a><button type="button" onclick="$(\'#module-row' + module_row + '\').remove();" data-toggle="tooltip" title="<?php echo $button_remove; ?>" class="btn btn-danger btn-sm"><i class="fa fa fa-minus-circle"></i></button></div></div></td>';
html += '</tr>';
$('#module tbody').append(html);
$('#module-' + type + ' tbody').append(html);
$('#module-' + type + ' tbody select[name=\'layout_module[' + module_row + '][code]\']').val($('#module-' + type + ' tfoot select').val());
$('#module-' + type + ' select[name*=\'code\']').trigger('change');
$('#module-' + type + ' tbody input[name*=\'sort_order\']').each(function(i, element) {
$(element).val(i);
});
module_row++;
}
$('#layout-column-left tbody, #layout-column-right tbody, #layout-content-top tbody, #layout-content-bottom tbody').delegate('button', 'click', function() {
$(this).parent().parent().parent().parent().remove();
$('#module-column-left, #module-column-right, #module-content-top, #module-content-bottom').delegate('select[name*=\'code\']', 'change', function() {
var part = this.value.split('.');
if (!part[1]) {
$(this).parent().find('a').attr('href', 'index.php?route=module/' + part[0] + '&token=<?php echo $token; ?>');
} else {
$(this).parent().find('a').attr('href', 'index.php?route=module/' + part[0] + '&token=<?php echo $token; ?>&module_id=' + part[1]);
}
});
$('#module-column-left, #module-column-right, #module-content-top, #module-content-bottom').trigger('change');
//--></script>
</div>
<?php echo $footer; ?>

0 comments on commit 339b431

Please sign in to comment.