Passed
Push — master ( 63a7db...fb547d )
by William
02:47
created
dashboard/application/views/computing-support/status/auto.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -6,13 +6,13 @@  discard block
 block discarded – undo
6 6
             $service_id = $status_item["id"];
7 7
             $service_status = 0;
8 8
             $this->status_model->log($service_id, $service_status);
9
-            echo 'Down - ID=' . $status_item['id'] . ' NAME=' . $status_item['name'] . ' TIME=' . date('h:i') . ' DATE=' . date('Y-m-d') . '<br>';
9
+            echo 'Down - ID='.$status_item['id'].' NAME='.$status_item['name'].' TIME='.date('h:i').' DATE='.date('Y-m-d').'<br>';
10 10
             break;
11 11
         case 1:
12 12
             $service_id = $status_item["id"];
13 13
             $service_status = 1;
14 14
             $this->status_model->log($service_id, $service_status);
15
-            echo 'Up - ID=' . $status_item['id'] . ' NAME=' . $status_item['name'] . ' TIME=' . date('h:i') . ' DATE=' . date('Y-m-d') . '<br>';
15
+            echo 'Up - ID='.$status_item['id'].' NAME='.$status_item['name'].' TIME='.date('h:i').' DATE='.date('Y-m-d').'<br>';
16 16
             break;
17 17
         case 2:
18 18
             $file = $status_item['url'];
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
                 $service_status = 1;
32 32
                 $this->status_model->auto_update_ok($service_id, $service_status);
33 33
                 $this->status_model->log($service_id, $service_status);
34
-                echo 'Up - ID=' . $status_item['id'] . ' NAME=' . $status_item['name'] . ' TIME=' . date('h:i') . ' DATE=' . date('Y-m-d') . '<br>';
34
+                echo 'Up - ID='.$status_item['id'].' NAME='.$status_item['name'].' TIME='.date('h:i').' DATE='.date('Y-m-d').'<br>';
35 35
             } else {
36 36
                 if ($status_item['auto_status'] === '1') {
37 37
                     //$this->email->from('[email protected]', 'IT Service Status');
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
                 $service_status = 0;
47 47
                 $this->status_model->auto_update_bad($service_id, $service_status);
48 48
                 $this->status_model->log($service_id, $service_status);
49
-                echo 'Down - ID=' . $status_item['id'] . ' NAME=' . $status_item['name'] . ' TIME=' . date('h:i') . ' DATE=' . date('Y-m-d') . '<br>';
49
+                echo 'Down - ID='.$status_item['id'].' NAME='.$status_item['name'].' TIME='.date('h:i').' DATE='.date('Y-m-d').'<br>';
50 50
             }
51 51
             break;
52 52
     }
Please login to merge, or discard this patch.
dashboard/application/views/computing-support/room-move/pending.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -32,15 +32,15 @@  discard block
 block discarded – undo
32 32
                         <td><?= $room['furniture'] ?></td>
33 33
                         <td>
34 34
                             <?= $room['staff_involved'] ?>
35
-                            <?php if (isset($room['staff_involved2'])) { echo '<br>'. $room['staff_involved2']; } ?>
36
-                            <?php if (isset($room['staff_involved3'])) { echo '<br>'. $room['staff_involved3']; } ?>
37
-                            <?php if (isset($room['staff_involved4'])) { echo '<br>'. $room['staff_involved4']; } ?>
38
-                            <?php if (isset($room['staff_involved5'])) { echo '<br>'. $room['staff_involved5']; } ?>
39
-                            <?php if (isset($room['staff_involved6'])) { echo '<br>'. $room['staff_involved6']; } ?>
40
-                            <?php if (isset($room['staff_involved7'])) { echo '<br>'. $room['staff_involved7']; } ?>
41
-                            <?php if (isset($room['staff_involved8'])) { echo '<br>'. $room['staff_involved8']; } ?>
42
-                            <?php if (isset($room['staff_involved9'])) { echo '<br>'. $room['staff_involved9']; } ?>
43
-                            <?php if (isset($room['staff_involved10'])) { echo '<br>'. $room['staff_involved10']; } ?>
35
+                            <?php if (isset($room['staff_involved2'])) { echo '<br>'.$room['staff_involved2']; } ?>
36
+                            <?php if (isset($room['staff_involved3'])) { echo '<br>'.$room['staff_involved3']; } ?>
37
+                            <?php if (isset($room['staff_involved4'])) { echo '<br>'.$room['staff_involved4']; } ?>
38
+                            <?php if (isset($room['staff_involved5'])) { echo '<br>'.$room['staff_involved5']; } ?>
39
+                            <?php if (isset($room['staff_involved6'])) { echo '<br>'.$room['staff_involved6']; } ?>
40
+                            <?php if (isset($room['staff_involved7'])) { echo '<br>'.$room['staff_involved7']; } ?>
41
+                            <?php if (isset($room['staff_involved8'])) { echo '<br>'.$room['staff_involved8']; } ?>
42
+                            <?php if (isset($room['staff_involved9'])) { echo '<br>'.$room['staff_involved9']; } ?>
43
+                            <?php if (isset($room['staff_involved10'])) { echo '<br>'.$room['staff_involved10']; } ?>
44 44
                         </td>
45 45
                         <td width="20%"><?= $room['reason'] ?></td>
46 46
                             <?php switch ($room['status']) {
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
                           <?php break;
65 65
                                 case 6: ?>
66 66
                                     <td class='success'>Move Complete</td>
67
-                          <?php break;?>
67
+                          <?php break; ?>
68 68
                             <?php } ?>
69 69
                         <td>
70 70
                             <?php if (in_array('CN=Dashboard_Estates_Room_Move,OU=Dashboard_Group,OU=Intranet_Group,OU=Groups,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups'])) { ?>
Please login to merge, or discard this patch.
dashboard/application/views/computing-support/room-move/view.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
 $query = $this->db->get('users_ad');
8 8
 if ($query->num_rows() > 0) {
9 9
     foreach ($query->result_array() as $row) {
10
-        $row_set[] = htmlentities(stripslashes($row['first_name'] . ' ' . $row['last_name'] . ' (' . $row['username'] . ')')); //build an array
10
+        $row_set[] = htmlentities(stripslashes($row['first_name'].' '.$row['last_name'].' ('.$row['username'].')')); //build an array
11 11
     }
12 12
 }
13 13
 ?>
Please login to merge, or discard this patch.
dashboard/application/views/computing-support/room-move/check.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -31,15 +31,15 @@  discard block
 block discarded – undo
31 31
                         <td><?= $room['furniture'] ?></td>
32 32
                         <td>
33 33
                             <?= $room['staff_involved'] ?>
34
-                            <?php if (isset($room['staff_involved2'])) { echo '<br>'. $room['staff_involved2']; } ?>
35
-                            <?php if (isset($room['staff_involved3'])) { echo '<br>'. $room['staff_involved3']; } ?>
36
-                            <?php if (isset($room['staff_involved4'])) { echo '<br>'. $room['staff_involved4']; } ?>
37
-                            <?php if (isset($room['staff_involved5'])) { echo '<br>'. $room['staff_involved5']; } ?>
38
-                            <?php if (isset($room['staff_involved6'])) { echo '<br>'. $room['staff_involved6']; } ?>
39
-                            <?php if (isset($room['staff_involved7'])) { echo '<br>'. $room['staff_involved7']; } ?>
40
-                            <?php if (isset($room['staff_involved8'])) { echo '<br>'. $room['staff_involved8']; } ?>
41
-                            <?php if (isset($room['staff_involved9'])) { echo '<br>'. $room['staff_involved9']; } ?>
42
-                            <?php if (isset($room['staff_involved10'])) { echo '<br>'. $room['staff_involved10']; } ?>
34
+                            <?php if (isset($room['staff_involved2'])) { echo '<br>'.$room['staff_involved2']; } ?>
35
+                            <?php if (isset($room['staff_involved3'])) { echo '<br>'.$room['staff_involved3']; } ?>
36
+                            <?php if (isset($room['staff_involved4'])) { echo '<br>'.$room['staff_involved4']; } ?>
37
+                            <?php if (isset($room['staff_involved5'])) { echo '<br>'.$room['staff_involved5']; } ?>
38
+                            <?php if (isset($room['staff_involved6'])) { echo '<br>'.$room['staff_involved6']; } ?>
39
+                            <?php if (isset($room['staff_involved7'])) { echo '<br>'.$room['staff_involved7']; } ?>
40
+                            <?php if (isset($room['staff_involved8'])) { echo '<br>'.$room['staff_involved8']; } ?>
41
+                            <?php if (isset($room['staff_involved9'])) { echo '<br>'.$room['staff_involved9']; } ?>
42
+                            <?php if (isset($room['staff_involved10'])) { echo '<br>'.$room['staff_involved10']; } ?>
43 43
                         </td>
44 44
                             <?php switch ($room['status']) {
45 45
                                 case 0: ?>
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
                           <?php break;
63 63
                                 case 6: ?>
64 64
                                     <td class='success'>Move Complete</td>
65
-                          <?php break;?>
65
+                          <?php break; ?>
66 66
                             <?php } ?>
67 67
                         <td>
68 68
                             <?php switch ($room['status']) {
Please login to merge, or discard this patch.
dashboard/application/views/computing-support/view.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
                         <td></td><td></td><td></td>
24 24
                     </tr>
25 25
                     <tr>
26
-                        <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/status');?>">Service Status</a></td>
26
+                        <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/status'); ?>">Service Status</a></td>
27 27
                         <td></td><td></td><td></td>
28 28
                     </tr>
29 29
                     <tr>
@@ -74,11 +74,11 @@  discard block
 block discarded – undo
74 74
                               in_array('CN=DG06,OU=Distribution Groups,OU=Email Groups,OU=Accounts,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups']) ||
75 75
                               in_array('CN=Intranet_Edit_HR,OU=Intranet_Group,OU=Groups,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups'])) { ?>
76 76
                         <tr>
77
-                            <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/new-account');?>">New Staff Account</a>
78
-                                - <a href="<?= base_url('/computing-support/new-account/pending');?>">Pending</a>
79
-                                - <a href="<?= base_url('/computing-support/new-account/history');?>">History</a>
77
+                            <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/new-account'); ?>">New Staff Account</a>
78
+                                - <a href="<?= base_url('/computing-support/new-account/pending'); ?>">Pending</a>
79
+                                - <a href="<?= base_url('/computing-support/new-account/history'); ?>">History</a>
80 80
                                 <?php if (in_array('CN=DG06,OU=Distribution Groups,OU=Email Groups,OU=Accounts,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups'])) { ?>
81
-                                    - <a href="<?= base_url('/computing-support/new-account/export');?>">Export New Staff</a>
81
+                                    - <a href="<?= base_url('/computing-support/new-account/export'); ?>">Export New Staff</a>
82 82
                                 <?php } ?>
83 83
                             </td>
84 84
                             <td></td><td></td><td></td>
@@ -88,39 +88,39 @@  discard block
 block discarded – undo
88 88
                               in_array('CN=DG06,OU=Distribution Groups,OU=Email Groups,OU=Accounts,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups']) ||
89 89
                               in_array('CN=Intranet_Edit_HR,OU=Intranet_Group,OU=Groups,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups'])) { ?>
90 90
                         <tr>
91
-                            <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/new-account/disable-account');?>">Disable Staff Account</a>
92
-                                - <a href="<?= base_url('/computing-support/new-account/disable-account/pending');?>">Pending</a>
93
-                                - <a href="<?= base_url('/computing-support/new-account/disable-account/history');?>">History</a>
91
+                            <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/new-account/disable-account'); ?>">Disable Staff Account</a>
92
+                                - <a href="<?= base_url('/computing-support/new-account/disable-account/pending'); ?>">Pending</a>
93
+                                - <a href="<?= base_url('/computing-support/new-account/disable-account/history'); ?>">History</a>
94 94
                             </td>
95 95
                             <td></td><td></td><td></td>
96 96
                         </tr>
97 97
                     <?php } ?>
98 98
                     <tr>
99
-                        <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/address-book');?>">Address Book Update</a>
99
+                        <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/address-book'); ?>">Address Book Update</a>
100 100
                             <?php if (in_array('CN=DG06,OU=Distribution Groups,OU=Email Groups,OU=Accounts,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups'])) { ?>
101
-                                - <a href="<?= base_url('computing-support/address-book/history');?>">History</a>
101
+                                - <a href="<?= base_url('computing-support/address-book/history'); ?>">History</a>
102 102
                             <?php } ?>
103 103
                         </td>
104 104
                         <td></td><td></td><td></td>
105 105
                     </tr>
106 106
                     <tr>
107
-                        <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/mobile-policy');?>">Mobile Phone Policy</a>
107
+                        <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/mobile-policy'); ?>">Mobile Phone Policy</a>
108 108
                             <?php if (in_array('CN=Dashboard_Admin,OU=Dashboard_Group,OU=Intranet_Group,OU=Groups,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups']) || 
109 109
                                       in_array('CN=Dashboard_CS_NS,OU=Dashboard_Group,OU=Intranet_Group,OU=Groups,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups'])) { ?>
110
-                                - <a href="<?= base_url('computing-support/mobile-policy/accepted');?>">Accepted</a>
110
+                                - <a href="<?= base_url('computing-support/mobile-policy/accepted'); ?>">Accepted</a>
111 111
                             <?php } ?>
112 112
                         </td>
113 113
                         <td></td><td></td><td></td>
114 114
                     </tr>
115 115
                     <tr>
116 116
                         <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/room-move')?>">Room Move Request</a>
117
-                            - <a href="<?= base_url('computing-support/room-move/check');?>">Check</a>
117
+                            - <a href="<?= base_url('computing-support/room-move/check'); ?>">Check</a>
118 118
                             <?php if (in_array('CN=Dashboard_CS_NS,OU=Dashboard_Group,OU=Intranet_Group,OU=Groups,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups']) ||
119 119
                                       in_array('CN=Dashboard_Estates_Room_Move,OU=Dashboard_Group,OU=Intranet_Group,OU=Groups,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups'])) { ?>
120
-                                - <a href="<?= base_url('computing-support/room-move/pending');?>">Pending</a>
120
+                                - <a href="<?= base_url('computing-support/room-move/pending'); ?>">Pending</a>
121 121
                             <?php } if (in_array('CN=DG06,OU=Distribution Groups,OU=Email Groups,OU=Accounts,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups']) ||
122 122
                                       in_array('CN=Dashboard_Estates_Room_Move,OU=Dashboard_Group,OU=Intranet_Group,OU=Groups,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups'])) { ?>
123
-                                    - <a href="<?= base_url('computing-support/room-move/history');?>">History</a>
123
+                                    - <a href="<?= base_url('computing-support/room-move/history'); ?>">History</a>
124 124
                             <?php } ?>
125 125
                         </td>
126 126
                         <td></td><td></td><td></td>
@@ -147,8 +147,8 @@  discard block
 block discarded – undo
147 147
                     </thead>
148 148
                     <tbody>
149 149
                         <tr>
150
-                            <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/equipment-loan');?>">Equipment Loan</a>
151
-                                - <a href="<?= base_url('computing-support/equipment-loan/history');?>">History</a></td>
150
+                            <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/equipment-loan'); ?>">Equipment Loan</a>
151
+                                - <a href="<?= base_url('computing-support/equipment-loan/history'); ?>">History</a></td>
152 152
                             <td></td><td></td><td></td>
153 153
                         </tr>
154 154
                         <tr>
Please login to merge, or discard this patch.
dashboard/application/views/computing-support/ownership/history.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -45,13 +45,13 @@
 block discarded – undo
45 45
                                 <?php if (in_array('CN=Dashboard_Admin,OU=Dashboard_Group,OU=Intranet_Group,OU=Groups,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups'])) { ?>
46 46
                                 <td>
47 47
                                     <?php if ($ownership_item['status'] == 0) { ?>
48
-                                        <input type="button" value="Overide Approve" name="overide_approve" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/ownership/approve?id=' . $ownership_item['id']); ?>';"/>
49
-                                        <input type="button" value="Reject" name="reject" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/ownership/reject?id=' . $ownership_item['id']); ?>';"/>
48
+                                        <input type="button" value="Overide Approve" name="overide_approve" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/ownership/approve?id='.$ownership_item['id']); ?>';"/>
49
+                                        <input type="button" value="Reject" name="reject" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/ownership/reject?id='.$ownership_item['id']); ?>';"/>
50 50
                                     <?php } elseif ($ownership_item['status'] == 1) { ?>
51
-                                        <input type="button" value="Approve" name="approve" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/ownership/approve?id=' . $ownership_item['id']); ?>';"/>
52
-                                        <input type="button" value="Reject" name="reject" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/ownership/reject?id=' . $ownership_item['id']); ?>';"/>
51
+                                        <input type="button" value="Approve" name="approve" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/ownership/approve?id='.$ownership_item['id']); ?>';"/>
52
+                                        <input type="button" value="Reject" name="reject" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/ownership/reject?id='.$ownership_item['id']); ?>';"/>
53 53
                                     <?php } elseif ($ownership_item['status'] == 2) { ?>
54
-                                        <input type = "button" value = "Approve" name = "approve" class = "btn btn-default" onclick = "location.href = '<?= base_url('computing-support/ownership/approve?id=' . $ownership_item['id']); ?>';"/>
54
+                                        <input type = "button" value = "Approve" name = "approve" class = "btn btn-default" onclick = "location.href = '<?= base_url('computing-support/ownership/approve?id='.$ownership_item['id']); ?>';"/>
55 55
                                     <?php } else { ?>
56 56
                                         No action required
57 57
                                 <?php } ?>
Please login to merge, or discard this patch.
dashboard/application/views/computing-support/temporary-account/view.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
 $query = $this->db->get('users_ad');
8 8
 if ($query->num_rows() > 0) {
9 9
     foreach ($query->result_array() as $row) {
10
-        $row_set[] = htmlentities(stripslashes($row['first_name'] . ' ' . $row['last_name'])); //build an array
10
+        $row_set[] = htmlentities(stripslashes($row['first_name'].' '.$row['last_name'])); //build an array
11 11
     }
12 12
 }
13 13
 ?>
Please login to merge, or discard this patch.
dashboard/assets/grocery_crud/themes/dashboard/views/list.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -1,21 +1,21 @@  discard block
 block discarded – undo
1 1
 <?php 
2 2
 
3
-	$column_width = (int)(80/count($columns));
3
+	$column_width = (int) (80 / count($columns));
4 4
 	
5
-	if(!empty($list)){
5
+	if (!empty($list)) {
6 6
 ?><div class="bDiv" >
7 7
     <table cellspacing="0" cellpadding="0" border="0" id="flex1" class="sortable">
8 8
 		<thead>
9 9
 			<tr class='hDiv'>
10
-				<?php foreach($columns as $column){?>
10
+				<?php foreach ($columns as $column) {?>
11 11
 				<th width='<?php echo $column_width?>%'>
12
-					<div class="text-left field-sorting <?php if(isset($order_by[0]) &&  $column->field_name == $order_by[0]){?><?php echo $order_by[1]?><?php }?>" 
12
+					<div class="text-left field-sorting <?php if (isset($order_by[0]) && $column->field_name == $order_by[0]) {?><?php echo $order_by[1]?><?php }?>" 
13 13
 						rel='<?php echo $column->field_name?>'>
14 14
 						<?php echo $column->display_as?>
15 15
 					</div>
16 16
 				</th>
17 17
 				<?php }?>
18
-				<?php if(!$unset_delete || !$unset_edit || !$unset_read || !empty($actions)){?>
18
+				<?php if (!$unset_delete || !$unset_edit || !$unset_read || !empty($actions)) {?>
19 19
 				<th align="left" abbr="tools" axis="col1" class="" width='20%'>
20 20
 					<div class="text-right">
21 21
 						<?php echo $this->l('list_actions'); ?>
@@ -25,34 +25,34 @@  discard block
 block discarded – undo
25 25
 			</tr>
26 26
 		</thead>		
27 27
 		<tbody>
28
-<?php foreach($list as $num_row => $row){ ?>        
29
-		<tr  <?php if($num_row % 2 == 1){?>class="erow"<?php }?>>
30
-			<?php foreach($columns as $column){?>
31
-			<td width='<?php echo $column_width?>%' class='<?php if(isset($order_by[0]) &&  $column->field_name == $order_by[0]){?>sorted<?php }?>'>
32
-				<div class='text-left'><?php echo $row->{$column->field_name} != '' ? $row->{$column->field_name} : '&nbsp;' ; ?></div>
28
+<?php foreach ($list as $num_row => $row) { ?>        
29
+		<tr  <?php if ($num_row % 2 == 1) {?>class="erow"<?php }?>>
30
+			<?php foreach ($columns as $column) {?>
31
+			<td width='<?php echo $column_width?>%' class='<?php if (isset($order_by[0]) && $column->field_name == $order_by[0]) {?>sorted<?php }?>'>
32
+				<div class='text-left'><?php echo $row->{$column->field_name} != '' ? $row->{$column->field_name} : '&nbsp;'; ?></div>
33 33
 			</td>
34 34
 			<?php }?>
35
-			<?php if(!$unset_delete || !$unset_edit || !$unset_read || !empty($actions)){?>
35
+			<?php if (!$unset_delete || !$unset_edit || !$unset_read || !empty($actions)) {?>
36 36
 			<td align="left" width='20%'>
37 37
 				<div class='tools'>				
38
-					<?php if(!$unset_delete){?>
38
+					<?php if (!$unset_delete) {?>
39 39
                     	<a href='<?php echo $row->delete_url?>' title='<?php echo $this->l('list_delete')?> <?php echo $subject?>' class="delete-row" >
40 40
                     			<span class='delete-icon'></span>
41 41
                     	</a>
42 42
                     <?php }?>
43
-                    <?php if(!$unset_edit){?>
43
+                    <?php if (!$unset_edit) {?>
44 44
 						<a href='<?php echo $row->edit_url?>' title='<?php echo $this->l('list_edit')?> <?php echo $subject?>' class="edit_button"><span class='edit-icon'></span></a>
45 45
 					<?php }?>
46
-					<?php if(!$unset_read){?>
46
+					<?php if (!$unset_read) {?>
47 47
 						<a href='<?php echo $row->read_url?>' title='<?php echo $this->l('list_view')?> <?php echo $subject?>' class="edit_button"><span class='read-icon'></span></a>
48 48
 					<?php }?>
49 49
 					<?php 
50
-					if(!empty($row->action_urls)){
51
-						foreach($row->action_urls as $action_unique_id => $action_url){ 
50
+					if (!empty($row->action_urls)) {
51
+						foreach ($row->action_urls as $action_unique_id => $action_url) { 
52 52
 							$action = $actions[$action_unique_id];
53 53
 					?>
54 54
 							<a href="<?php echo $action_url; ?>" class="<?php echo $action->css_class; ?> crud-action" title="<?php echo $action->label?>"><?php 
55
-								if(!empty($action->image_url))
55
+								if (!empty($action->image_url))
56 56
 								{
57 57
 									?><img src="<?php echo $action->image_url; ?>" alt="<?php echo $action->label?>" /><?php 	
58 58
 								}
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 		</tbody>
70 70
 		</table>
71 71
 	</div>
72
-<?php }else{?>
72
+<?php } else {?>
73 73
 	<br/>
74 74
 	&nbsp;&nbsp;&nbsp;&nbsp; <?php echo $this->l('list_no_items'); ?>
75 75
 	<br/>
Please login to merge, or discard this patch.
dashboard/assets/grocery_crud/themes/dashboard/views/list_template.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 
29 29
 ?>
30 30
 <script type='text/javascript'>
31
-	var base_url = '<?php echo base_url();?>';
31
+	var base_url = '<?php echo base_url(); ?>';
32 32
 
33 33
 	var subject = '<?php echo addslashes($subject); ?>';
34 34
 	var ajax_list_info_url = '<?php echo $ajax_list_info_url; ?>';
@@ -38,20 +38,20 @@  discard block
 block discarded – undo
38 38
 
39 39
 </script>
40 40
 <div id='list-report-error' class='report-div error'></div>
41
-<div  <?php if($success_message !== null){?>class="alert alert-success" role="alert" style="display:block;"<?php }?>><?php
42
-if($success_message !== null){?>
41
+<div  <?php if ($success_message !== null) {?>class="alert alert-success" role="alert" style="display:block;"<?php }?>><?php
42
+if ($success_message !== null) {?>
43 43
     <p style=" margin-top: -0px;"><?php echo $success_message; ?></p>
44 44
 <?php }
45 45
 ?></div>
46 46
 <div class="flexigrid" style='width: 100%;' data-unique-hash="<?php echo $unique_hash; ?>">
47 47
     
48
-	<?php echo form_open( $ajax_list_url, 'method="post" id="filtering_form" class="filtering_form" autocomplete = "off" data-ajax-list-info-url="'.$ajax_list_info_url.'"'); ?>
48
+	<?php echo form_open($ajax_list_url, 'method="post" id="filtering_form" class="filtering_form" autocomplete = "off" data-ajax-list-info-url="'.$ajax_list_info_url.'"'); ?>
49 49
 	
50 50
 	<div id='main-table-box' class="main-table-box">
51 51
 
52
-	<?php if(!$unset_add || !$unset_export || !$unset_print){?>
52
+	<?php if (!$unset_add || !$unset_export || !$unset_print) {?>
53 53
 	<div class="tDiv">
54
-		<?php if(!$unset_add){?>
54
+		<?php if (!$unset_add) {?>
55 55
 		<div class="tDiv2">
56 56
                     <div class="displayadd">
57 57
                         <a href='<?php echo $add_url?>' title='<?php echo $this->l('list_add'); ?> <?php echo $subject?>' class='add-anchor add_button'>
@@ -64,11 +64,11 @@  discard block
 block discarded – undo
64 64
                 </div>
65 65
 		<?php }?>
66 66
 		<div class="tDiv3">
67
-			<?php if(!$unset_export) { ?>
67
+			<?php if (!$unset_export) { ?>
68 68
         	<a class="export-anchor" href="<?php echo $export_url; ?>" target="_blank">
69 69
 				<div class="fbutton">
70 70
 					<div>
71
-						<span class="export"><?php echo $this->l('list_export');?></span>
71
+						<span class="export"><?php echo $this->l('list_export'); ?></span>
72 72
 					</div>
73 73
 				</div>
74 74
             </a>
@@ -84,18 +84,18 @@  discard block
 block discarded – undo
84 84
 					<?php list($show_lang_string, $entries_lang_string) = explode('{paging}', $this->l('list_show_entries')); ?>
85 85
 					<?php echo $show_lang_string; ?>
86 86
 					<select name="per_page" id='per_page' class="per_page">
87
-						<?php foreach($paging_options as $option){?>
88
-							<option value="<?php echo $option; ?>" <?php if($option == $default_per_page){?>selected="selected"<?php }?>><?php echo $option; ?>&nbsp;&nbsp;</option>
87
+						<?php foreach ($paging_options as $option) {?>
88
+							<option value="<?php echo $option; ?>" <?php if ($option == $default_per_page) {?>selected="selected"<?php }?>><?php echo $option; ?>&nbsp;&nbsp;</option>
89 89
 						<?php }?>
90 90
 					</select>
91 91
 					<?php echo $entries_lang_string; ?>
92
-					<input type='hidden' name='order_by[0]' id='hidden-sorting' class='hidden-sorting' value='<?php if(!empty($order_by[0])){?><?php echo $order_by[0]?><?php }?>' />
93
-					<input type='hidden' name='order_by[1]' id='hidden-ordering' class='hidden-ordering'  value='<?php if(!empty($order_by[1])){?><?php echo $order_by[1]?><?php }?>'/>
92
+					<input type='hidden' name='order_by[0]' id='hidden-sorting' class='hidden-sorting' value='<?php if (!empty($order_by[0])) {?><?php echo $order_by[0]?><?php }?>' />
93
+					<input type='hidden' name='order_by[1]' id='hidden-ordering' class='hidden-ordering'  value='<?php if (!empty($order_by[1])) {?><?php echo $order_by[1]?><?php }?>'/>
94 94
 				</span>
95 95
 			</div>
96 96
             <div class="displaysearch">
97
-			<?php echo $this->l('list_search');?>: <input type="text" class="qsbsearch_fieldox search_text" name="search_text" size="30" id='search_text'>
98
-                    <input type="button" value="<?php echo $this->l('list_search');?>" class="btn btn-default">
97
+			<?php echo $this->l('list_search'); ?>: <input type="text" class="qsbsearch_fieldox search_text" name="search_text" size="30" id='search_text'>
98
+                    <input type="button" value="<?php echo $this->l('list_search'); ?>" class="btn btn-default">
99 99
 		</div>
100 100
 
101 101
 	<div id='ajax_list' class="ajax_list">
@@ -105,9 +105,9 @@  discard block
 block discarded – undo
105 105
                         <div class="displayshowing" style="margin-top: 10px;">
106 106
 				<span class="pPageStat">
107 107
 					<?php $paging_starts_from = "<span id='page-starts-from' class='page-starts-from'>1</span>"; ?>
108
-					<?php $paging_ends_to = "<span id='page-ends-to' class='page-ends-to'>". ($total_results < $default_per_page ? $total_results : $default_per_page) ."</span>"; ?>
108
+					<?php $paging_ends_to = "<span id='page-ends-to' class='page-ends-to'>".($total_results < $default_per_page ? $total_results : $default_per_page)."</span>"; ?>
109 109
 					<?php $paging_total_results = "<span id='total_items' class='total_items'>$total_results</span>"?>
110
-					<?php echo str_replace( array('{start}','{end}','{results}'),
110
+					<?php echo str_replace(array('{start}', '{end}', '{results}'),
111 111
 											array($paging_starts_from, $paging_ends_to, $paging_total_results),
112 112
 											$this->l('list_displaying')
113 113
 										   ); ?>
Please login to merge, or discard this patch.