Bladeren bron

Minor updates to styling.

Adam Day 9 jaren geleden
bovenliggende
commit
30d5a42e0e

+ 2 - 2
application/models/timesheetModel.php

@@ -449,9 +449,9 @@
 				{
 					//Log Audit
 					$audit = new auditModel();
-					$audit->setAction('validate');
+					$audit->setAction('Timesheet Validation');
 					$audit->setUserId($userId);
-					$audit->setItem($oldKey);
+					$audit->setItem('Batch: '.$oldKey);
 					$audit->save();
 
 					return true;

+ 1 - 1
application/models/unlockModel.php

@@ -203,7 +203,7 @@ class unlockModel extends Staple_Model
                 {
                     $audit = new auditModel();
                     $audit->setUserId($userId);
-                    $audit->setAction('Single unlock');
+                    $audit->setAction('Single Entry Unlock');
                     $audit->setItem($this->username." unlocked time entry ". $id);
                     $audit->save();
 

+ 4 - 4
application/views/audit/index.phtml

@@ -1,12 +1,12 @@
 <div class="section">
     <div class="row">
-        <div class="small-12 columns text-center">
+        <div class="small-12 columns">
             <h1><i class="fa fa-list-alt"></i> Audit Log</h1>
         </div>
     </div>
     <div class="row">
         <div class="small-3 columns">
-            <h3><i class="fa fa-filter"></i> Filter Accounts</h3>
+            <h3><i class="fa fa-users"></i> Account</h3>
             <ul class="side-nav">
                 <?php
 
@@ -28,11 +28,11 @@
                 {
                     if($user['id'] == $this->currentUser)
                     {
-                        echo "<li class='active'><a class='' href='".$this->link(array("audit",$user['id']))."'>".$user['lastName'].", ".$user['firstName']."</a></li>";
+                        echo "<li class='active'><a class='' href='".$this->link(array("audit",$user['id']))."'><i class=\"fa fa-user\"></i> ".$user['lastName'].", ".$user['firstName']."</a></li>";
                     }
                     else
                     {
-                        echo "<li><a class='' href='".$this->link(array("audit",$user['id']))."'>".$user['lastName'].", ".$user['firstName']."</a></li>";
+                        echo "<li><a class='' href='".$this->link(array("audit",$user['id']))."'><i class=\"fa fa-user\"></i> ".$user['lastName'].", ".$user['firstName']."</a></li>";
                     }
                 }
 

+ 1 - 1
application/views/timesheet/index.phtml

@@ -95,7 +95,7 @@
                {
                    if($this->timesheet->getBatch() == $entry->batchId)
                    {
-                       echo "<a class=\"button radius tiny\" style=\"margin:0px; width:100%; left:-15px;\" href=\"".$this->link(array('timesheet','edit',$entry->id))."\"><i class=\"fa fa-edit\"></i> Edit</a> \n";
+                       echo "<a class=\"\" style=\"margin:0px; width:100%; left:-15px;\" href=\"".$this->link(array('timesheet','edit',$entry->id))."\"><i class=\"fa fa-edit\"></i> Edit Entry</a> \n";
                    }
                    else
                    {