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 2015/07/14 20:36:57 UTC

[1/2] airavata-php-gateway git commit: Changing dashboard name to Admin Dashboard

Repository: airavata-php-gateway
Updated Branches:
  refs/heads/master d85fecd0b -> 77c835d7e


Changing dashboard name to Admin Dashboard


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

Branch: refs/heads/master
Commit: 26842bf7c1dd02aa3b9153c1b811bef5d0c3764a
Parents: d85fecd
Author: Supun Nakandala <sc...@apache.org>
Authored: Tue Jul 14 23:18:16 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Tue Jul 14 23:18:16 2015 +0530

----------------------------------------------------------------------
 app/libraries/CommonUtilities.php     | 2 +-
 app/libraries/ExperimentUtilities.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/26842bf7/app/libraries/CommonUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CommonUtilities.php b/app/libraries/CommonUtilities.php
index a8eb40e..edc9ae1 100644
--- a/app/libraries/CommonUtilities.php
+++ b/app/libraries/CommonUtilities.php
@@ -191,7 +191,7 @@ class CommonUtilities
                     $active = " active ";
             }
             if (Session::has("admin"))
-                echo '<li><a href="' . URL::to("/") . '/admin/dashboard"><span class="glyphicon glyphicon-user"></span> Dashboard</a></li>';
+                echo '<li><a href="' . URL::to("/") . '/admin/dashboard"><span class="glyphicon glyphicon-user"></span>Admin Dashboard</a></li>';
             else
                 echo '<li><a href="' . URL::to("/") . '/user/profile"><span class="glyphicon glyphicon-user"></span> Profile</a></li>';
 

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/26842bf7/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index b0ec5ca..ea3def9 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -583,7 +583,7 @@ class ExperimentUtilities
                     //echo '<p>' . $output->key .  ': <a href="' . $output->value . '">' . $output->value . '</a></p>';
                     $outputPath = str_replace(Config::get('pga_config.airavata')['experiment-data-absolute-path'],
                         Config::get('pga_config.airavata')['experiment-data-dir'], $output->value);
-                    $outputPath = str_replace('//', '/', $outputPath);
+
                     if(file_exists(str_replace('//','/',$output->value))){
                         $outputPathArray = explode("/", $outputPath);
 


[2/2] airavata-php-gateway git commit: hiding Settings tab in Admin Dashboard

Posted by sc...@apache.org.
hiding Settings tab in Admin Dashboard


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

Branch: refs/heads/master
Commit: 77c835d7e31070892becdbdca90527128826a122
Parents: 26842bf
Author: Supun Nakandala <sc...@apache.org>
Authored: Tue Jul 14 23:35:08 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Tue Jul 14 23:35:08 2015 +0530

----------------------------------------------------------------------
 app/views/partials/dashboard-block.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/77c835d7/app/views/partials/dashboard-block.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/dashboard-block.blade.php b/app/views/partials/dashboard-block.blade.php
index 70692c3..8ae0895 100644
--- a/app/views/partials/dashboard-block.blade.php
+++ b/app/views/partials/dashboard-block.blade.php
@@ -22,9 +22,9 @@
             <a href="{{ URL::to('/')}}/admin/dashboard/experiments"><i
                     class="fa fa-fw fa-experiments"></i>Experiments</a>
         </li>
-        <li>
-            <a href="forms.html"><i class="fa fa-fw fa-edit"></i> Settings</a>
-        </li>
+<!--        <li>-->
+<!--            <a href="forms.html"><i class="fa fa-fw fa-edit"></i> Settings</a>-->
+<!--        </li>-->
         <!--
         <li>
             <a href="bootstrap-elements.html"><i class="fa fa-fw fa-desktop"></i> Bootstrap Elements</a>