Completed
Pull Request — master (#27)
by Lars
11:31 queued 01:30
created
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.
src/Intraface/modules/cms/Controller/templates/page/pages.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
             </thead>
13 13
             <?php foreach ($pages as $p) :?>
14 14
                 <tr>
15
-                    <td><a href="<?php e(url($p['id'])); ?>"><?php e(str_repeat("- ", $p['level']) . $p['navigation_name']); ?></a></td>
15
+                    <td><a href="<?php e(url($p['id'])); ?>"><?php e(str_repeat("- ", $p['level']).$p['navigation_name']); ?></a></td>
16 16
                     <td><?php e($p['identifier']); ?></td>
17 17
                     <td>
18 18
                         <?php if ($p['status'] == 'published') {
Please login to merge, or discard this patch.
src/Intraface/modules/cms/Controller/templates/element/htmltext.tpl.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -67,11 +67,11 @@
 block discarded – undo
67 67
     if (!isset($value['text'])) {
68 68
         $value['text'] = '';
69 69
     }
70
-    require_once dirname(__FILE__) . '/../../../CKEditor.php';
70
+    require_once dirname(__FILE__).'/../../../CKEditor.php';
71 71
     $config['language'] = 'da';
72 72
     $config['toolbar'] = array(
73
-         array( 'Source', '-', 'Cut','Copy','Paste','PasteText','PasteFromWord', '', 'Undo','Redo', '-', 'Format', 'Bold', 'Italic', 'Strike' ),
74
-         array( 'Image', 'Link', 'Unlink', 'NumberedList', 'BulletedList', 'Blockquote', 'Outdent', 'Indent', '-', 'Maximize' )
73
+         array('Source', '-', 'Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '', 'Undo', 'Redo', '-', 'Format', 'Bold', 'Italic', 'Strike'),
74
+         array('Image', 'Link', 'Unlink', 'NumberedList', 'BulletedList', 'Blockquote', 'Outdent', 'Indent', '-', 'Maximize')
75 75
      );
76 76
     $config['filebrowserBrowseUrl'] = url('/restricted/module/filemanager/ckeditor', array('images' => 1));
77 77
     $CKEditor = new CKEditor();
Please login to merge, or discard this patch.
src/Intraface/modules/cms/Controller/templates/element/picture.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
                 */
10 10
             if (!empty($value['pic_id'])) {
11 11
                 $filehandler = new Ilib_Filehandler($kernel, $value['pic_id']);
12
-                e('Filehandler id: ' . $filehandler->get('id'). ' chosen');
12
+                e('Filehandler id: '.$filehandler->get('id').' chosen');
13 13
             }
14 14
             ?>
15 15
      <input type="submit" value="<?php e(t('Choose picture')); ?>" name="choose_file" />
Please login to merge, or discard this patch.
Intraface/modules/cms/Controller/templates/element/randompicture.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
         $appender = $filemanager->getKeywordAppender();
13 13
         $keywords = $appender->getUsedKeywords();
14 14
     if (count($keywords) > 0) {
15
-        echo '<div>'. e(t('keywords', 'keyword')) . ': <ul style="display: inline;">';
15
+        echo '<div>'.e(t('keywords', 'keyword')).': <ul style="display: inline;">';
16 16
         foreach ($keywords as $keyword_value) {
17 17
             if (in_array($keyword_value['keyword'], $selected_keywords) === true) {
18 18
                 $checked = 'checked="checked"';
Please login to merge, or discard this patch.