You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2016/11/23 15:49:40 UTC
[04/11] airavata-php-gateway git commit: AIRAVATA-2228 Sharing modal
title reflects entity type
AIRAVATA-2228 Sharing modal title reflects entity type
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/e6db22e1
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e6db22e1
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e6db22e1
Branch: refs/heads/develop
Commit: e6db22e1fddc9057d39b1fb721bc94775e6a9b7f
Parents: 2003260
Author: Marcus Christie <ma...@iu.edu>
Authored: Mon Nov 21 12:28:42 2016 -0500
Committer: Marcus Christie <ma...@iu.edu>
Committed: Mon Nov 21 12:28:42 2016 -0500
----------------------------------------------------------------------
app/views/experiment/create-complete.blade.php | 4 ++--
app/views/experiment/edit.blade.php | 4 ++--
app/views/experiment/no-sharing-edit.blade.php | 2 +-
app/views/partials/experiment-info.blade.php | 2 +-
app/views/partials/sharing-display-body.blade.php | 5 ++---
app/views/partials/sharing-form-modal.blade.php | 2 +-
app/views/project/create.blade.php | 3 ++-
app/views/project/edit.blade.php | 4 ++--
public/css/sharing.css | 2 +-
public/js/sharing/share.js | 2 +-
10 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e6db22e1/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 7ae755a..d780f47 100755
--- a/app/views/experiment/create-complete.blade.php
+++ b/app/views/experiment/create-complete.blade.php
@@ -38,7 +38,7 @@
{{ HTML::image("assets/Profile_avatar_placeholder_large.png", 'placeholder image', array('class' => 'baseimage')) }}
-@include('partials/sharing-form-modal')
+@include('partials/sharing-form-modal', array("entityType" => "experiment"))
@stop
@@ -47,7 +47,7 @@
<script>
var users = {{ $users }};
var owner = {{ $owner }};
- $('#project-share').data({url: "{{URL::to('/')}}/project/unshared-users", resourceId: "{{$expInputs['project']}}"})
+ $('#entity-share').data({url: "{{URL::to('/')}}/project/unshared-users", resourceId: "{{$expInputs['project']}}"})
</script>
{{ HTML::script('js/sharing/sharing_utils.js') }}
{{ HTML::script('js/sharing/share.js') }}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e6db22e1/app/views/experiment/edit.blade.php
----------------------------------------------------------------------
diff --git a/app/views/experiment/edit.blade.php b/app/views/experiment/edit.blade.php
index a4abe0e..d6eb0e8 100755
--- a/app/views/experiment/edit.blade.php
+++ b/app/views/experiment/edit.blade.php
@@ -46,7 +46,7 @@
{{ HTML::image("assets/Profile_avatar_placeholder_large.png", 'placeholder image', array('class' => 'baseimage')) }}
-@include('partials/sharing-form-modal')
+@include('partials/sharing-form-modal', array("entityType" => "experiment"))
@stop
@@ -55,7 +55,7 @@
<script>
var users = {{ $users }};
var owner = {{ $owner }};
- $('#project-share').data({url: "{{URL::to('/')}}/experiment/unshared-users", resourceId: "{{Input::get('expId')}}"})
+ $('#entity-share').data({url: "{{URL::to('/')}}/experiment/unshared-users", resourceId: "{{Input::get('expId')}}"})
</script>
{{ HTML::script('js/sharing/sharing_utils.js') }}
{{ HTML::script('js/sharing/share.js') }}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e6db22e1/app/views/experiment/no-sharing-edit.blade.php
----------------------------------------------------------------------
diff --git a/app/views/experiment/no-sharing-edit.blade.php b/app/views/experiment/no-sharing-edit.blade.php
index f9042b5..d96cb2c 100755
--- a/app/views/experiment/no-sharing-edit.blade.php
+++ b/app/views/experiment/no-sharing-edit.blade.php
@@ -45,7 +45,7 @@
{{ HTML::image("assets/Profile_avatar_placeholder_large.png", 'placeholder image', array('class' => 'baseimage')) }}
-@include('partials/sharing-form-modal')
+@include('partials/sharing-form-modal', array("entityType" => "experiment"))
@stop
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e6db22e1/app/views/partials/experiment-info.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-info.blade.php b/app/views/partials/experiment-info.blade.php
index cad9b33..659e912 100644
--- a/app/views/partials/experiment-info.blade.php
+++ b/app/views/partials/experiment-info.blade.php
@@ -393,7 +393,7 @@
@endif
@if(Config::get('pga_config.airavata')["data-sharing-enabled"] and isset($canEditSharing) && $canEditSharing)
- @include('partials/sharing-form-modal')
+ @include('partials/sharing-form-modal', array("entityType" => "experiment"))
@endif
@section('scripts')
@parent
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e6db22e1/app/views/partials/sharing-display-body.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/sharing-display-body.blade.php b/app/views/partials/sharing-display-body.blade.php
index a67c393..d01fd40 100644
--- a/app/views/partials/sharing-display-body.blade.php
+++ b/app/views/partials/sharing-display-body.blade.php
@@ -1,7 +1,6 @@
-<!-- TODO: this is used for other than projects. Need to update name -->
@if($form)
-<label for="project-share">Sharing Settings</label><br />
-<button type="button" class="btn btn-default" name="project-share" id="project-share">Share With Other Users</button><br />
+<label for="entity-share">Sharing Settings</label><br />
+<button type="button" class="btn btn-default" name="entity-share" id="entity-share">Share With Other Users</button><br />
@else
<h3>Sharing Details</h3>
@endif
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e6db22e1/app/views/partials/sharing-form-modal.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/sharing-form-modal.blade.php b/app/views/partials/sharing-form-modal.blade.php
index 5622f16..a59b59c 100644
--- a/app/views/partials/sharing-form-modal.blade.php
+++ b/app/views/partials/sharing-form-modal.blade.php
@@ -4,7 +4,7 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" id="share-box-x" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
- <h3 class="modal-title">Share this project</h3>
+ <h3 class="modal-title">Share this {{ $entityType }}</h3>
</div>
<div class="modal-body">
@include('partials/sharing-form-body')
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e6db22e1/app/views/project/create.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/create.blade.php b/app/views/project/create.blade.php
index 230d53a..1006fb2 100755
--- a/app/views/project/create.blade.php
+++ b/app/views/project/create.blade.php
@@ -36,7 +36,7 @@
</div>
-@include('partials/sharing-form-modal')
+@include('partials/sharing-form-modal', array("entityType" => "project"))
{{ HTML::image("assets/Profile_avatar_placeholder_large.png", 'placeholder image', array('class' => 'baseimage')) }}
@@ -49,6 +49,7 @@
$(this).val($.trim($(this).val()));
});
var users = {{ $users }};
+ var owner = {{ $owner }};
</script>
{{ HTML::script('js/sharing/sharing_utils.js') }}
{{ HTML::script('js/sharing/share.js') }}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e6db22e1/app/views/project/edit.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/edit.blade.php b/app/views/project/edit.blade.php
index 1e38dd7..df0e416 100755
--- a/app/views/project/edit.blade.php
+++ b/app/views/project/edit.blade.php
@@ -55,7 +55,7 @@
{{ HTML::image("assets/Profile_avatar_placeholder_large.png", 'placeholder image', array('class' => 'baseimage')) }}
-@include('partials/sharing-form-modal')
+@include('partials/sharing-form-modal', array("entityType" => "project"))
@stop
@@ -64,7 +64,7 @@
<script>
var users = {{ $users }};
var owner = {{ $owner }};
- $('#project-share').data({url: "{{ URL::to('/') }}/project/unshared-users", resourceId: "{{ Input::get('projId') }}"})
+ $('#entity-share').data({url: "{{ URL::to('/') }}/project/unshared-users", resourceId: "{{ Input::get('projId') }}"})
</script>
{{ HTML::script('js/sharing/sharing_utils.js') }}
{{ HTML::script('js/sharing/share.js') }}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e6db22e1/public/css/sharing.css
----------------------------------------------------------------------
diff --git a/public/css/sharing.css b/public/css/sharing.css
index 2feac9d..276c0a2 100755
--- a/public/css/sharing.css
+++ b/public/css/sharing.css
@@ -81,7 +81,7 @@
margin-right: 5px;
}
-#project-share, #experiment-share {
+#entity-share {
margin-bottom: 15px;
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e6db22e1/public/js/sharing/share.js
----------------------------------------------------------------------
diff --git a/public/js/sharing/share.js b/public/js/sharing/share.js
index 3b20f39..63262f2 100755
--- a/public/js/sharing/share.js
+++ b/public/js/sharing/share.js
@@ -83,7 +83,7 @@ $(function() {
/* Share box event handlers */
// Create, populate, and show the share box
- $('body').on('click', 'button#project-share, button#update-sharing', function(e) {
+ $('body').on('click', 'button#entity-share, button#update-sharing', function(e) {
var $share_list, ajax_data;
e.stopPropagation();
e.preventDefault();