Repository: airavata-php-gateway Updated Branches: refs/heads/develop a176f62cb -> 80ed6e97c
fixing typos Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/80ed6e97 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/80ed6e97 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/80ed6e97 Branch: refs/heads/develop Commit: 80ed6e97c28823ddfb77858a91d66a9c440e41b1 Parents: a176f62 Author: scnakandala <[email protected]> Authored: Mon May 2 14:54:28 2016 -0400 Committer: scnakandala <[email protected]> Committed: Mon May 2 14:54:28 2016 -0400 ---------------------------------------------------------------------- app/libraries/AdminUtilities.php | 2 +- app/libraries/CommonUtilities.php | 2 +- app/views/admin/manage-notices.blade.php | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/80ed6e97/app/libraries/AdminUtilities.php ---------------------------------------------------------------------- diff --git a/app/libraries/AdminUtilities.php b/app/libraries/AdminUtilities.php index b355c84..99dec2f 100644 --- a/app/libraries/AdminUtilities.php +++ b/app/libraries/AdminUtilities.php @@ -116,7 +116,7 @@ class AdminUtilities $notification->gatewayId = Session::get("gateway_id"); $notification->title = $notifData["title"]; $notification->notificationMessage = $notifData["notificationMessage"]; - $notification->publishedtime = strtotime( $notifData["publishedtime"])* 1000; + $notification->publishedTime = strtotime( $notifData["publishedTime"])* 1000; $notification->expirationTime = strtotime( $notifData["expirationTime"]) * 1000; if( $update){ http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/80ed6e97/app/libraries/CommonUtilities.php ---------------------------------------------------------------------- diff --git a/app/libraries/CommonUtilities.php b/app/libraries/CommonUtilities.php index 63bf5a5..6744079 100644 --- a/app/libraries/CommonUtilities.php +++ b/app/libraries/CommonUtilities.php @@ -252,7 +252,7 @@ class CommonUtilities <div class="notification"> <div class="notification-title text-primary">' . $notice->title . '</div> <div class="notification-description"><strong></strong>' . $notice->notificationMessage . '</div> - <div class="notification-ago">' . date("m/d/Y h:i:s A T", $notice->publishedtime) . '</div> + <div class="notification-ago">' . date("m/d/Y h:i:s A T", $notice->publishedTime) . '</div> <div class="notification-icon"></div> </div> <!-- / .notification --> '; http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/80ed6e97/app/views/admin/manage-notices.blade.php ---------------------------------------------------------------------- diff --git a/app/views/admin/manage-notices.blade.php b/app/views/admin/manage-notices.blade.php index 4d24688..009d84c 100644 --- a/app/views/admin/manage-notices.blade.php +++ b/app/views/admin/manage-notices.blade.php @@ -58,8 +58,8 @@ <td> {{ $notice->notificationMessage}} </td> - <td class="time" unix-time="{{ $notice->publishedtime/1000 }}"> - {{ $notice->publishedtime }} + <td class="time" unix-time="{{ $notice->publishedTime/1000 }}"> + {{ $notice->publishedTime }} </td> <td class="time" unix-time="{{ $notice->expirationTime/1000 }}"> {{ $notice->expirationTime }} @@ -175,7 +175,7 @@ <label class="col-md-3 control-label">Publish Date</label> <div class="col-md-6"> <div class='input-group date datetimepicker9'> - <input type='text' class="form-control notice-publishedtime" id="publishedtime" required placeholder="From Date"/> + <input type='text' class="form-control notice-publishedTime" id="publishedTime" required placeholder="From Date"/> <span class="input-group-addon"> <span class="glyphicon glyphicon-calendar"></span> </span> @@ -230,7 +230,7 @@ var formInput = $("#update-notice .notice-" + key); formInput.val( noticeData[key]); } - $("#update-notice .notice-publishedtime").val( moment( parseInt( $("#update-notice .notice-publishedtime").val()) ).format('MM/DD/YYYY hh:mm a') ); + $("#update-notice .notice-publishedTime").val( moment( parseInt( $("#update-notice .notice-publishedTime").val()) ).format('MM/DD/YYYY hh:mm a') ); $("#update-notice .notice-expirationTime").val( moment( parseInt( $("#update-notice .notice-expirationTime").val()) ).format('MM/DD/YYYY hh:mm a') ); setDateProperties("#update-notice"); @@ -242,7 +242,7 @@ ev.preventDefault(); $(this).html("<img src='{{URL::to('/')}}/assets/ajax-loader.gif'/>"); var formData = $("#create-notice .notice-form-values").serialize(); - formData += "&publishedtime="+ moment( $("#publishedtime").val() ).utc().format('MM/DD/YYYY hh:mm a'); + formData += "&publishedTime="+ moment( $("#publishedTime").val() ).utc().format('MM/DD/YYYY hh:mm a'); formData += "&expirationTime="+ moment( $("#expirationTime").val() ).utc().format('MM/DD/YYYY hh:mm a'); $.ajax({ url: '{{URL::to('/')}}/add-notice', @@ -268,7 +268,7 @@ ev.preventDefault(); $(this).html("<img src='{{URL::to('/')}}/assets/ajax-loader.gif'/>"); var formData = $("#update-notice .notice-form-values").serialize(); - formData += "&publishedtime="+ moment( $("#publishedtime").val() ).utc().format('MM/DD/YYYY hh:mm a'); + formData += "&publishedTime="+ moment( $("#publishedTime").val() ).utc().format('MM/DD/YYYY hh:mm a'); formData += "&expirationTime="+ moment( $("#expirationTime").val() ).utc().format('MM/DD/YYYY hh:mm a'); $.ajax({ url: '{{URL::to('/')}}/update-notice', @@ -350,7 +350,7 @@ function updateRow( noticeObject){ var row = "<td>" + noticeObject.title + "</td>" + "<td>" + noticeObject.notificationMessage + "</td>" + - "<td class='date'>" + convertTimestamp( noticeObject.publishedtime) + "</td>" + + "<td class='date'>" + convertTimestamp( noticeObject.publishedTime) + "</td>" + "<td class='date' unix-time='" + convertTimestamp( noticeObject.expirationTime ) + "'</td>" + "<td></td>"+ "<td class='update-notice-icon'><span class='glyphicon glyphicon-pencil'></span></td>"+
