@@ -306,7 +306,7 @@ |
||
| 306 | 306 | * See http://trac.midgard-project.org/ticket/1442 |
| 307 | 307 | $topic->set_parameter($this->_request_data['name'], var_export($value, true)); |
| 308 | 308 | */ |
| 309 | - continue; |
|
| 309 | + continue; |
|
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | if ($value === false) { |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | |
| 4 | 4 | if ($data['first_post']) { |
| 5 | 5 | $summary .= ' ' . sprintf($data['l10n']->get('first post was made on %s.'), |
| 6 | - $data['l10n']->get_formatter()->date($data['first_post'])); |
|
| 6 | + $data['l10n']->get_formatter()->date($data['first_post'])); |
|
| 7 | 7 | } |
| 8 | 8 | ?> |
| 9 | 9 | |
@@ -82,25 +82,25 @@ discard block |
||
| 82 | 82 | <tr> |
| 83 | 83 | <td class="title"><?php echo $data['l10n']->get('cost'); ?></td> |
| 84 | 84 | <?php |
| 85 | - if ($data['deliverable']->costType == '%') { |
|
| 86 | - ?> |
|
| 85 | + if ($data['deliverable']->costType == '%') { |
|
| 86 | + ?> |
|
| 87 | 87 | <td class="numeric"><?php echo $view['costPerUnit']; ?> %</td> |
| 88 | 88 | <td class="numeric"> </td> |
| 89 | 89 | <td class="numeric"> </td> |
| 90 | 90 | <?php |
| 91 | - } else { |
|
| 92 | - ?> |
|
| 91 | + } else { |
|
| 92 | + ?> |
|
| 93 | 93 | <td class="numeric"><?php echo $formatter->number($data['deliverable']->costPerUnit); ?></td> |
| 94 | 94 | <td class="numeric"><?php echo $view['plannedUnits']; ?></td> |
| 95 | 95 | <td class="numeric"><?php echo $view['units']; ?></td> |
| 96 | 96 | <?php |
| 97 | - } ?> |
|
| 97 | + } ?> |
|
| 98 | 98 | <td class="numeric"><?php echo $formatter->number($data['deliverable']->cost); ?></td> |
| 99 | 99 | </tr> |
| 100 | 100 | </tbody> |
| 101 | 101 | </table> |
| 102 | 102 | <?php if ($data['deliverable']->invoiceByActualUnits) { |
| 103 | - ?> |
|
| 103 | + ?> |
|
| 104 | 104 | <ul> |
| 105 | 105 | <li><?php echo $data['l10n']->get('invoice by actual units'); ?></li> |
| 106 | 106 | <?php |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | } ?> |
| 110 | 110 | </ul> |
| 111 | 111 | <?php |
| 112 | - } ?> |
|
| 112 | + } ?> |
|
| 113 | 113 | </div> |
| 114 | 114 | </div> |
| 115 | 115 | <?php |
@@ -130,25 +130,25 @@ discard block |
||
| 130 | 130 | <tr> |
| 131 | 131 | <td class="title"><?php echo $data['l10n']->get('cost'); ?></td> |
| 132 | 132 | <?php |
| 133 | - if ($data['deliverable']->costType == '%') { |
|
| 134 | - ?> |
|
| 133 | + if ($data['deliverable']->costType == '%') { |
|
| 134 | + ?> |
|
| 135 | 135 | <td class="numeric"><?php echo $view['costPerUnit']; ?> %</td> |
| 136 | 136 | <td class="numeric"> </td> |
| 137 | 137 | <td class="numeric"> </td> |
| 138 | 138 | <?php |
| 139 | - } else { |
|
| 140 | - ?> |
|
| 139 | + } else { |
|
| 140 | + ?> |
|
| 141 | 141 | <td class="numeric"><?php echo $formatter->number($data['deliverable']->costPerUnit); ?></td> |
| 142 | 142 | <td class="numeric"><?php echo $view['plannedUnits']; ?></td> |
| 143 | 143 | <td class="numeric"><?php echo $view['units']; ?></td> |
| 144 | 144 | <?php |
| 145 | - } ?> |
|
| 145 | + } ?> |
|
| 146 | 146 | <td class="numeric"><?php echo $formatter->number($data['deliverable']->cost); ?></td> |
| 147 | 147 | </tr> |
| 148 | 148 | </tbody> |
| 149 | 149 | </table> |
| 150 | 150 | <?php if ($data['deliverable']->invoiceByActualUnits) { |
| 151 | - ?> |
|
| 151 | + ?> |
|
| 152 | 152 | <ul> |
| 153 | 153 | <li><?php echo $data['l10n']->get('invoice by actual units'); ?></li> |
| 154 | 154 | <?php |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | } ?> |
| 158 | 158 | </ul> |
| 159 | 159 | <?php |
| 160 | - } ?> |
|
| 160 | + } ?> |
|
| 161 | 161 | </div> |
| 162 | 162 | </div> |
| 163 | 163 | <div class="field"> |
@@ -144,7 +144,7 @@ |
||
| 144 | 144 | fields: { |
| 145 | 145 | index_title: '<?php echo $data['l10n']->get('title'); ?>', |
| 146 | 146 | <?php |
| 147 | - if ($data['mode'] != 'customer') { |
|
| 147 | + if ($data['mode'] != 'customer') { |
|
| 148 | 148 | ?> |
| 149 | 149 | index_customer: '<?php echo $data['l10n']->get('customer'); ?>', |
| 150 | 150 | <?php |
@@ -52,14 +52,14 @@ |
||
| 52 | 52 | data: entries, |
| 53 | 53 | colNames: ["id", |
| 54 | 54 | <?php |
| 55 | - //index is needed for sorting |
|
| 56 | - echo "'index_name',"; |
|
| 57 | - echo "'" . $data['l10n']->get('entry title') ."',"; |
|
| 58 | - echo "'" . $data['l10n']->get('entry text') . "',"; |
|
| 59 | - echo "'" . $data['l10n']->get('entry created') . "',"; |
|
| 60 | - echo "'index_creator', '" . $data['l10n_midcom']->get('creator') . "',"; |
|
| 61 | - echo "'" . $data['l10n']->get('status') . "'"; |
|
| 62 | - ?> |
|
| 55 | + //index is needed for sorting |
|
| 56 | + echo "'index_name',"; |
|
| 57 | + echo "'" . $data['l10n']->get('entry title') ."',"; |
|
| 58 | + echo "'" . $data['l10n']->get('entry text') . "',"; |
|
| 59 | + echo "'" . $data['l10n']->get('entry created') . "',"; |
|
| 60 | + echo "'index_creator', '" . $data['l10n_midcom']->get('creator') . "',"; |
|
| 61 | + echo "'" . $data['l10n']->get('status') . "'"; |
|
| 62 | + ?> |
|
| 63 | 63 | ], |
| 64 | 64 | colModel: [ |
| 65 | 65 | {name:'id',index:'id', hidden: true, key: true }, |
@@ -120,13 +120,13 @@ |
||
| 120 | 120 | $grid->set_option('loadonce', true) |
| 121 | 121 | ->set_option('grouping', true) |
| 122 | 122 | ->set_option('groupingView', [ |
| 123 | - 'groupField' => ['status'], |
|
| 124 | - 'groupColumnShow' => [false], |
|
| 125 | - 'groupText' => ['<strong>{0}</strong> ({1})'], |
|
| 126 | - 'groupOrder' => ['asc'], |
|
| 127 | - 'groupSummary' => [true], |
|
| 128 | - 'showSummaryOnHide' => true |
|
| 129 | - ]) |
|
| 123 | + 'groupField' => ['status'], |
|
| 124 | + 'groupColumnShow' => [false], |
|
| 125 | + 'groupText' => ['<strong>{0}</strong> ({1})'], |
|
| 126 | + 'groupOrder' => ['asc'], |
|
| 127 | + 'groupSummary' => [true], |
|
| 128 | + 'showSummaryOnHide' => true |
|
| 129 | + ]) |
|
| 130 | 130 | ->set_option('sortname', $sortname) |
| 131 | 131 | ->set_option('sortorder', $sortorder); |
| 132 | 132 | |
@@ -1,11 +1,11 @@ |
||
| 1 | 1 | <?php echo $data['renderer']->block($data['form'], 'form_start'); ?> |
| 2 | 2 | <div class="maa_permissions_assignees"> |
| 3 | 3 | <?php |
| 4 | - if (empty($data['form']->children['add_assignee']->vars['value'])) { |
|
| 5 | - echo $data['renderer']->label($data['form']->children['add_assignee']); |
|
| 4 | + if (empty($data['form']->children['add_assignee']->vars['value'])) { |
|
| 5 | + echo $data['renderer']->label($data['form']->children['add_assignee']); |
|
| 6 | 6 | echo $data['renderer']->widget($data['form']->children['add_assignee']); |
| 7 | - } |
|
| 8 | - ?> |
|
| 7 | + } |
|
| 8 | + ?> |
|
| 9 | 9 | </div> |
| 10 | 10 | <table class="maa_permissions_items"> |
| 11 | 11 | <thead> |
@@ -8,6 +8,6 @@ |
||
| 8 | 8 | echo '<li' . ($link['selected'] ? ' class="selected"' : '') . '>'; |
| 9 | 9 | echo '<a href="' . $link['url'] . '/">' . $link['label'] . '</a></li>'; |
| 10 | 10 | } |
| 11 | - ?> |
|
| 11 | + ?> |
|
| 12 | 12 | </ul> |
| 13 | 13 | </div> |
| 14 | 14 | \ No newline at end of file |