airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [16/50] [abbrv] airavata-php-gateway git commit: experiments up-to-dat
Date Wed, 27 Jul 2016 17:05:24 GMT
experiments up-to-dat


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/83e15a58
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/83e15a58
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/83e15a58

Branch: refs/heads/develop
Commit: 83e15a58cc0148d88c782f47d0fdcbd1f2e815fd
Parents: df8f8bc
Author: Jeff Kinnison <jeffdkinnison@gmail.com>
Authored: Tue Jul 12 16:20:00 2016 -0400
Committer: Jeff Kinnison <jeffdkinnison@gmail.com>
Committed: Tue Jul 12 16:20:00 2016 -0400

----------------------------------------------------------------------
 app/controllers/ExperimentController.php       | 17 ++------------
 app/views/experiment/create-complete.blade.php | 15 +++++++++++-
 app/views/experiment/create.blade.php          | 26 ---------------------
 app/views/experiment/edit.blade.php            | 14 ++++++++++-
 app/views/experiment/summary.blade.php         |  5 +++-
 app/views/project/edit.blade.php               |  2 ++
 app/views/project/summary.blade.php            |  2 ++
 7 files changed, 37 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/83e15a58/app/controllers/ExperimentController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ExperimentController.php b/app/controllers/ExperimentController.php
index ede47af..06026a0 100755
--- a/app/controllers/ExperimentController.php
+++ b/app/controllers/ExperimentController.php
@@ -25,8 +25,7 @@ class ExperimentController extends BaseController
     public function createView()
     {
         Session::forget('exp_create_continue');
-        $users = SharingUtilities::getAllUserProfiles();
-        return View::make('experiment/create', array("users" => json_encode($users)));
+        return View::make('experiment/create');
     }
 
     public function createSubmit()
@@ -72,19 +71,7 @@ class ExperimentController extends BaseController
                 "allowedFileSize" => $allowedFileSize
             );
 
-            $s_users = json_decode($_POST['share-settings']);
-
-            $uids = GrouperUtilities::getAllGatewayUsers();
-            $users = array();
-            foreach ($uids as $uid) {
-                if (WSIS::usernameExists($uid) && $uid !== Session::get('username'))
{
-                    $users[$uid] = WSIS::getUserProfile($uid);
-                }
-            }
-
-            foreach ($s_users as $uid => $perms) {
-                $users[$uid]['access'] = $perms;
-            }
+            $users = SharingUtilities::getAllUserProfiles();
 
             return View::make("experiment/create-complete", array("expInputs" => $experimentInputs,
"users" => json_encode($users)));
         } else if (isset($_POST['save']) || isset($_POST['launch'])) {

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/83e15a58/app/views/experiment/create-complete.blade.php
----------------------------------------------------------------------
diff --git a/app/views/experiment/create-complete.blade.php b/app/views/experiment/create-complete.blade.php
index 0771a71..0308ee3 100644
--- a/app/views/experiment/create-complete.blade.php
+++ b/app/views/experiment/create-complete.blade.php
@@ -2,6 +2,7 @@
 
 @section('page-header')
 @parent
+{{ HTML::style('css/sharing.css') }}
 @stop
 
 @section('content')
@@ -19,6 +20,10 @@
         @include('partials/experiment-inputs', array("expInputs" => $expInputs, "queueDefaults"
=>
         $expInputs['queueDefaults']) )
 
+        <div class="form-control">
+            @include('partials/sharing-display-body', array("form" => true))
+        </div>
+
         <div class="form-group btn-toolbar">
             <div class="btn-group">
                 <button onclick="disableWarn()" name="save" type="submit" class="btn btn-primary"
value="Save">Save</button>
@@ -35,12 +40,20 @@
 <input type="hidden" id="allowedFileSize" value="{{ $expInputs['allowedFileSize'] }}"/>
 </div>
 
+{{ HTML::image("assets/Profile_avatar_placeholder_large.png", 'placeholder image', array('class'
=> 'baseimage')) }}
+
+@include('partials/sharing-form-modal')
 
 @stop
 
 @section('scripts')
 @parent
 <script>
+    var users = {{ $users }};
+</script>
+{{ HTML::script('js/sharing/sharing_utils.js') }}
+{{ HTML::script('js/sharing/share.js') }}
+<script>
     var warn = true;
 
     function disableWarn(){
@@ -164,4 +177,4 @@
         output.innerHTML += '</ul>';
     }
 </script>
-@stop
\ No newline at end of file
+@stop

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/83e15a58/app/views/experiment/create.blade.php
----------------------------------------------------------------------
diff --git a/app/views/experiment/create.blade.php b/app/views/experiment/create.blade.php
index 36de03d..fceeb75 100755
--- a/app/views/experiment/create.blade.php
+++ b/app/views/experiment/create.blade.php
@@ -48,27 +48,6 @@
 
         </div>
 
-        <div class="form-group">
-            <label for="project-share">Sharing Settings</label><br />
-            <button class="btn btn-default" name="project-share" id="project-share">Share
With Other Users</button> <br />
-            <label>Show</label>
-            <!-- <div id="show-results-group" class="btn-group" role="group" aria-label="Show
Groups or Users">
-                <button type="button" class="show-groups show-results-btn btn btn-primary">Groups</button>
-                <button type="button" class="show-users show-results-btn btn btn-default">Users</button>
-            </div> -->
-            <label>Order By</label>
-            <select class="order-results-selector">
-                <option value="username">Username</option>
-                <option value="firstlast">First, Last Name</option>
-                <option value="lastfirst">Last, First Name</option>
-                <option value="email">Email</option>
-            </select>
-            <div id="shared-users" class="text-align-center">
-                <p>This project has not been shared</p>
-            </div>
-            <input id="share-settings" name="share-settings" type="hidden" value="" />
-        </div>
-
         <div class="btn-toolbar">
             <input name="continue" type="submit" class="btn btn-primary" value="Continue">
             <input name="clear" type="reset" class="btn btn-default" value="Reset values">
@@ -83,9 +62,4 @@
 
 @section('scripts')
 @parent
-<script>
-var users = {{ $users }};
-</script>
-{{ HTML::script('js/sharing/sharing_utils.js') }}
-{{ HTML::script('js/sharing/share.js') }}
 @stop

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/83e15a58/app/views/experiment/edit.blade.php
----------------------------------------------------------------------
diff --git a/app/views/experiment/edit.blade.php b/app/views/experiment/edit.blade.php
index 983c4cb..0708e41 100755
--- a/app/views/experiment/edit.blade.php
+++ b/app/views/experiment/edit.blade.php
@@ -2,6 +2,7 @@
 
 @section('page-header')
 @parent
+{{ HTML::style('css/sharing.css') }}
 @stop
 
 @section('content')
@@ -25,6 +26,9 @@
             @include('partials/experiment-inputs', array( "expInputs", $expInputs))
 
             @if( count( $expInputs['computeResources']) > 0)
+            <div class="form-control">
+            @include('partials/sharing-display-body', array("form" => true))
+            </div>
             <div class="btn-toolbar">
                 <div class="btn-group">
                     <input name="save" type="submit" class="btn btn-primary"
@@ -43,12 +47,20 @@
 
 </div>
 
+{{ HTML::image("assets/Profile_avatar_placeholder_large.png", 'placeholder image', array('class'
=> 'baseimage')) }}
+
+@include('partials/sharing-form-modal')
 @stop
 
 
 @section('scripts')
 @parent
 <script>
+    var users = {{ $users }};
+</script>
+{{ HTML::script('js/sharing/sharing_utils.js') }}
+{{ HTML::script('js/sharing/share.js') }}
+<script>
     $('.file-input').bind('change', function () {
 
         var inputFileSize = Math.round(this.files[0].size / (1024 * 1024));
@@ -90,4 +102,4 @@
         });
     });
 </script>
-@stop
\ No newline at end of file
+@stop

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/83e15a58/app/views/experiment/summary.blade.php
----------------------------------------------------------------------
diff --git a/app/views/experiment/summary.blade.php b/app/views/experiment/summary.blade.php
index 185abde..b41fdb5 100755
--- a/app/views/experiment/summary.blade.php
+++ b/app/views/experiment/summary.blade.php
@@ -6,6 +6,9 @@
 
 @section('content')
 @include('partials/experiment-info')
+<div class="row">
+@include('partials/sharing-display-body')
+</div>
 @stop
 
 
@@ -54,4 +57,4 @@
         window.location.replace("{{URL::to('/') }}/experiment/summary?" + "expId=" + "{{
Input::get('expId') }}"+"&"+ "isAutoRefresh=" + autoRefresh);
     });
 </script>
-@stop
\ No newline at end of file
+@stop

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/83e15a58/app/views/project/edit.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/edit.blade.php b/app/views/project/edit.blade.php
index 37f6c70..62a976a 100755
--- a/app/views/project/edit.blade.php
+++ b/app/views/project/edit.blade.php
@@ -52,6 +52,8 @@
 
 </div>
 
+{{ HTML::image("assets/Profile_avatar_placeholder_large.png", 'placeholder image', array('class'
=> 'baseimage')) }}
+
 @include('partials/sharing-form-modal')
 
 @stop

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/83e15a58/app/views/project/summary.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/summary.blade.php b/app/views/project/summary.blade.php
index d52c284..e411891 100755
--- a/app/views/project/summary.blade.php
+++ b/app/views/project/summary.blade.php
@@ -102,6 +102,8 @@
     </div>
 </div>
 
+{{ HTML::image("assets/Profile_avatar_placeholder_large.png", 'placeholder image', array('class'
=> 'baseimage')) }}
+
 @stop
 @section('scripts')
 @parent


Mime
View raw message