Getting User Local time available everywhere for Notifications
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/6b3c8f2c Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/6b3c8f2c Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/6b3c8f2c Branch: refs/heads/master Commit: 6b3c8f2c0eb1efd31d2c2fc29767cbd1813dcdd4 Parents: 6fa6416 Author: Nipurn Doshi <[email protected]> Authored: Wed May 11 14:34:31 2016 -0400 Committer: Nipurn Doshi <[email protected]> Committed: Wed May 11 14:34:31 2016 -0400 ---------------------------------------------------------------------- app/libraries/CommonUtilities.php | 1 + app/views/admin/manage-notices.blade.php | 1 - app/views/experiment/browse.blade.php | 1 - app/views/layout/basic.blade.php | 1 + app/views/partials/compute-resource-preferences.blade.php | 1 + 5 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6b3c8f2c/app/libraries/CommonUtilities.php ---------------------------------------------------------------------- diff --git a/app/libraries/CommonUtilities.php b/app/libraries/CommonUtilities.php index 365e277..d5cc2a0 100644 --- a/app/libraries/CommonUtilities.php +++ b/app/libraries/CommonUtilities.php @@ -252,6 +252,7 @@ class CommonUtilities elseif( $notice->priority == NotificationPriority::HIGH) $textColor = "text-danger"; + $noticesUI .= ' <div class="notification"> <div class="notification-title ' . $textColor . '">' . $notice->title . '</div> http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6b3c8f2c/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 5594b50..830b888 100644 --- a/app/views/admin/manage-notices.blade.php +++ b/app/views/admin/manage-notices.blade.php @@ -213,7 +213,6 @@ {{ HTML::script('js/moment.js')}} {{ HTML::script('js/datetimepicker.js')}} -{{ HTML::script('js/time-conversion.js')}} <script> $(".create-notice-button").click( function(){ http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6b3c8f2c/app/views/experiment/browse.blade.php ---------------------------------------------------------------------- diff --git a/app/views/experiment/browse.blade.php b/app/views/experiment/browse.blade.php index 3025ee8..5b76914 100755 --- a/app/views/experiment/browse.blade.php +++ b/app/views/experiment/browse.blade.php @@ -120,7 +120,6 @@ @section('scripts') @parent -{{ HTML::script('js/time-conversion.js')}} {{ HTML::script('js/moment.js')}} {{ HTML::script('js/datetimepicker.js')}} http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6b3c8f2c/app/views/layout/basic.blade.php ---------------------------------------------------------------------- diff --git a/app/views/layout/basic.blade.php b/app/views/layout/basic.blade.php index 0895883..43ddeff 100755 --- a/app/views/layout/basic.blade.php +++ b/app/views/layout/basic.blade.php @@ -79,6 +79,7 @@ var fullName = "{{Session::get("user-profile")["firstname"] . " " . Session::get @section('scripts') @include('layout/fixed-scripts') +{{ HTML::script('js/time-conversion.js')}} <script type="text/javascript"> /* keeping a check that footer stays atleast at the bottom of the window.*/ var bh = $("html").height(); http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6b3c8f2c/app/views/partials/compute-resource-preferences.blade.php ---------------------------------------------------------------------- diff --git a/app/views/partials/compute-resource-preferences.blade.php b/app/views/partials/compute-resource-preferences.blade.php index a487465..4806c60 100644 --- a/app/views/partials/compute-resource-preferences.blade.php +++ b/app/views/partials/compute-resource-preferences.blade.php @@ -56,6 +56,7 @@ <div class="col-md-9"> <select name="preferredBatchQueue" class="form-control"> + <option value="">Select a Queue from list</option> @foreach( (array)$computeResource->batchQueues as $index => $queue) <option value="{{ $queue->queueName}}" @if( isset( $preferences) ) @if( $preferences->preferredBatchQueue == $queue->queueName) selected @endif
