Completed
Pull Request — master (#22)
by Lars
25:44 queued 10:42
created
Intraface/modules/cms/Controller/templates/template-section-edit.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
 
44 44
     case 'longtext':
45 45
         if (empty($value['html_format'])) {
46
-            $value['html_format'] = array ();
46
+            $value['html_format'] = array();
47 47
         }
48 48
 ?>
49 49
         <fieldset>
Please login to merge, or discard this patch.
src/Intraface/modules/cms/Controller/templates/pages.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 </ul>
27 27
 
28 28
 <ul class="options">
29
-    <li><a class="new" href="<?php e(url(null, array('create' => '', 'type' => $type)));?>"><?php e(t('create '.$type)); ?></a></li>
29
+    <li><a class="new" href="<?php e(url(null, array('create' => '', 'type' => $type))); ?>"><?php e(t('create '.$type)); ?></a></li>
30 30
     <li><a  href="<?php e(url('../')); ?>"><?php e(t('go to site overview')); ?></a></li>
31 31
 </ul>
32 32
 
Please login to merge, or discard this patch.
src/Intraface/modules/cms/Controller/templates/navigation.tpl.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,13 +26,13 @@
 block discarded – undo
26 26
             <tr>
27 27
                 <td><input id="category_<?php e($category['id']); ?>" type="checkbox" name="category[]" value="<?php e($category['id']); ?>" /></td>
28 28
                 <td><?php e(str_repeat('- ', $level)); ?><a href="<?php e(url($category['id'])); ?>"><?php e($category['name']); ?></a></td>
29
-                <td><a href="<?php e(url($category['id'] . '/edit')); ?>"><?php e(t('Edit')); ?></a></td>
29
+                <td><a href="<?php e(url($category['id'].'/edit')); ?>"><?php e(t('Edit')); ?></a></td>
30 30
             </tr>
31 31
             <?php
32 32
             # If there is subcategories to the category
33 33
             if (is_array($category['categories']) && count($category['categories']) > 0) {
34 34
                 # We make the items for the next level the sub categories of this category
35
-                $level_categories[$level+1] = $category['categories'];
35
+                $level_categories[$level + 1] = $category['categories'];
36 36
 
37 37
                 # We move to next level
38 38
                 $level++;
Please login to merge, or discard this patch.
src/Intraface/modules/cms/Controller/templates/page-edit.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@
 block discarded – undo
122 122
                 }
123 123
                     $context->getKernel()->useModule('filemanager');
124 124
                     $filehandler = new FileHandler($kernel, $value['pic_id']);
125
-                    e('file_id ' . $filehandler->get('id') . ' chosen');
125
+                    e('file_id '.$filehandler->get('id').' chosen');
126 126
                     //$filehandler_html = new FileHandlerHTML($filehandler);
127 127
                     //$filehandler_html->printFormUploadTag('pic_id', 'new_pic', 'choose_file', array('image_size' => 'small'));
128 128
                 ?>
Please login to merge, or discard this patch.
src/Intraface/modules/cms/Controller/templates/templates.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 
27 27
 <?php foreach ($templates as $s) : ?>
28 28
     <tr>
29
-        <td><a href="<?php e(url($s['id'])); ?>"><?php e($s['name']);  ?></a></td>
29
+        <td><a href="<?php e(url($s['id'])); ?>"><?php e($s['name']); ?></a></td>
30 30
         <td><?php e($s['identifier']); ?></td>
31 31
         <td>
32 32
             <?php
Please login to merge, or discard this patch.
src/Intraface/modules/cms/Controller/templates/template.tpl.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -30,8 +30,8 @@
 block discarded – undo
30 30
             <td><?php e($s['type']); ?></td>
31 31
             <td class="options"><a href="<?php e(url(null, array('moveup' =>  $s['id']))); ?>"><?php e(t('Up')); ?></a>
32 32
             <a href="<?php e(url(null, array('movedown' =>  $s['id']))); ?>"><?php e(t('Down')); ?></a>
33
-            <a class="edit" href="<?php e(url('section/' . $s['id'], array('edit'))); ?>"><?php e(t('Edit settings')); ?></a>
34
-            <a class="delete" href="<?php e(url('section/' . $s['id'], array('delete'))); ?>"><?php e(t('Delete')); ?></a></td>
33
+            <a class="edit" href="<?php e(url('section/'.$s['id'], array('edit'))); ?>"><?php e(t('Edit settings')); ?></a>
34
+            <a class="delete" href="<?php e(url('section/'.$s['id'], array('delete'))); ?>"><?php e(t('Delete')); ?></a></td>
35 35
         </tr>
36 36
     <?php endforeach; ?>
37 37
         </tbody>
Please login to merge, or discard this patch.
src/Intraface/modules/cms/Controller/templates/page.tpl.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
         href="<?php e(url('../../', array('type' => $cmspage->get('type')))); ?>"><?php e(t('close')); ?></a></li>
7 7
         <?php if ($kernel->user->hasSubAccess('cms', 'edit_templates')) : ?>
8 8
     <li><a
9
-        href="<?php e(url('../../../templates/' . $cmspage->get('template_id'))); ?>"><?php e(t('edit template')); ?></a></li>
9
+        href="<?php e(url('../../../templates/'.$cmspage->get('template_id'))); ?>"><?php e(t('edit template')); ?></a></li>
10 10
         <?php endif; ?>
11 11
 </ul>
12 12
 
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 <p class="warning"><?php echo e(t('no sections added to the template')); ?>
29 29
         <?php if ($kernel->user->hasSubAccess('cms', 'edit_templates')) :
30 30
 ?> <a
31
-    href="<?php e(url('../../template/' . $cmspage->get('template_id'))); ?>"><?php e(t('edit template')); ?></a>.
31
+    href="<?php e(url('../../template/'.$cmspage->get('template_id'))); ?>"><?php e(t('edit template')); ?></a>.
32 32
     <?php else :
33 33
 ?> <strong><?php echo e(t('you cannot edit templates')); ?></strong>
34 34
     <?php endif; ?></p>
Please login to merge, or discard this patch.
src/Intraface/modules/cms/Controller/templates/index.tpl.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,11 +19,11 @@
 block discarded – undo
19 19
 <tbody>
20 20
 <?php foreach ($sites as $s) : ?>
21 21
 <tr>
22
-    <td><a href="<?php e(url($s['id'])); ?>"><?php e($s['name']);  ?></a></td>
22
+    <td><a href="<?php e(url($s['id'])); ?>"><?php e($s['name']); ?></a></td>
23 23
     <td>
24
-        <a href="<?php e(url($s['id'] . '/pages', array('type' => 'page'))); ?>"><?php e(t('pages'));  ?></a>,
25
-        <a href="<?php e(url($s['id'] . '/pages', array('type' => 'article'))); ?>"><?php e(t('articles'));  ?></a>,
26
-        <a href="<?php e(url($s['id'] . '/pages', array('type' => 'news'))); ?>"><?php e(t('news'));  ?></a>
24
+        <a href="<?php e(url($s['id'].'/pages', array('type' => 'page'))); ?>"><?php e(t('pages')); ?></a>,
25
+        <a href="<?php e(url($s['id'].'/pages', array('type' => 'article'))); ?>"><?php e(t('articles')); ?></a>,
26
+        <a href="<?php e(url($s['id'].'/pages', array('type' => 'news'))); ?>"><?php e(t('news')); ?></a>
27 27
     </td>
28 28
     <td class="options">
29 29
         <a class="edit" href="<?php e(url($s['id'], array('edit'))); ?>"><?php e(t('edit settings')); ?></a>
Please login to merge, or discard this patch.
src/Intraface/modules/cms/Controller/templates/site.tpl.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -36,22 +36,22 @@
 block discarded – undo
36 36
 <h2><?php e(t('pages')); ?></h2>
37 37
 
38 38
 <ul class="options">
39
-    <li><a href="<?php e(url('pages', array('type' => 'page'))); ?>"><?php e(t('go to pages'));  ?></a></li>
40
-    <li><a href="<?php e(url('pages', array('create', 'type' => 'page'))); ?>"><?php e(t('create a new page'));  ?></a></li>
39
+    <li><a href="<?php e(url('pages', array('type' => 'page'))); ?>"><?php e(t('go to pages')); ?></a></li>
40
+    <li><a href="<?php e(url('pages', array('create', 'type' => 'page'))); ?>"><?php e(t('create a new page')); ?></a></li>
41 41
 </ul>
42 42
 
43 43
 <h2><?php e(t('articles')); ?></h2>
44 44
 
45 45
 <ul class="options">
46
-    <li><a href="<?php e(url('pages', array('type' => 'article'))); ?>"><?php e(t('go to articles'));  ?></a></li>
46
+    <li><a href="<?php e(url('pages', array('type' => 'article'))); ?>"><?php e(t('go to articles')); ?></a></li>
47 47
     <li><a href="<?php e(url('pages', array('create', 'type' => 'article'))); ?>"><?php e(t('create a new article')); ?></a></li>
48 48
 </ul>
49 49
 
50 50
 <h2><?php e(t('news')); ?></h2>
51 51
 
52 52
 <ul class="options">
53
-    <li><a href="<?php e(url('pages', array('type' => 'news'))); ?>"><?php e(t('go to news'));  ?></a></li>
54
-    <li><a href="<?php e(url('pages', array('create', 'type' => 'news'))); ?>"><?php e(t('create a news'));  ?></a></li>
53
+    <li><a href="<?php e(url('pages', array('type' => 'news'))); ?>"><?php e(t('go to news')); ?></a></li>
54
+    <li><a href="<?php e(url('pages', array('create', 'type' => 'news'))); ?>"><?php e(t('create a news')); ?></a></li>
55 55
 </ul>
56 56
 
57 57
 <?php endif; ?>
Please login to merge, or discard this patch.