You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by nd...@apache.org on 2017/02/13 00:28:53 UTC
[1/2] airavata-php-gateway git commit: Making sidebar sticky.
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 9765c1e25 -> f199d9b8b
Making sidebar sticky.
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/db5eba49
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/db5eba49
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/db5eba49
Branch: refs/heads/develop
Commit: db5eba49bec763e2aa49d19748f9169b98a72ada
Parents: dc971cb
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Sun Feb 12 16:27:52 2017 -0800
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Sun Feb 12 16:27:52 2017 -0800
----------------------------------------------------------------------
app/views/layout/basic.blade.php | 10 +++++++---
app/views/partials/dashboard-block.blade.php | 6 ++----
public/css/admin.css | 10 ++++++++--
3 files changed, 17 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/db5eba49/app/views/layout/basic.blade.php
----------------------------------------------------------------------
diff --git a/app/views/layout/basic.blade.php b/app/views/layout/basic.blade.php
index b621ecd..3e5e396 100755
--- a/app/views/layout/basic.blade.php
+++ b/app/views/layout/basic.blade.php
@@ -14,6 +14,9 @@ $title = Session::get("portal-title");
position: relative;
z-index:101;
}
+.content-area{
+ margin: 20px 0;
+}
</style>
<div class="theme-header">
<!-- Header from theme -->
@@ -92,12 +95,13 @@ var fullName = "{{Session::get("user-profile")["firstname"] . " " . Session::get
//put sidebar below all headers in admin dashboards
if( $(".side-nav").length > 0){
var headerHeight = $(".pga-header").height() + $(".theme-header").height();
- $(".side-nav").css("padding-top", headerHeight);
-
+ $(".side-nav").css("top", headerHeight);
+ $(".side-nav").affix();
var selectedDashboardHeight = $(window).height() - headerHeight;
+
if( selectedDashboardHeight < $(".side-nav").height())
{
- $(".side-nav").height( selectedDashboardHeight).css("overflow-y", "scroll").css("overflow-x", "none");
+ $(".side-nav").height( selectedDashboardHeight);
}
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/db5eba49/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 d2b5220..8a07d78 100644
--- a/app/views/partials/dashboard-block.blade.php
+++ b/app/views/partials/dashboard-block.blade.php
@@ -1,7 +1,5 @@
-<div class="collapse navbar-collapse navbar-ex1-collapse">
- <ul class="nav navbar-nav side-nav">
-
-
+<div class="collapse navbar-collapse navbar-ex1-collapse" >
+ <ul class="nav navbar-nav side-nav" data-spy="affix" >
<li
@if( Session::has("admin-nav") && Session::get("admin-nav") == "exp-statistics") class="active" @endif>
<a class="dashboard-link" href="{{ URL::to('/')}}/admin/dashboard/experiments">
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/db5eba49/public/css/admin.css
----------------------------------------------------------------------
diff --git a/public/css/admin.css b/public/css/admin.css
index 9d49c68..a1b18b4 100644
--- a/public/css/admin.css
+++ b/public/css/admin.css
@@ -116,12 +116,15 @@ ul.alert-dropdown {
width: 200px;
}
+.affix{
+ top:0;
+}
+
/* Side Navigation */
@media(min-width:768px) {
.side-nav {
- position: fixed;
- top:0;
+ position:fixed;
z-index: 100;
left: 225px;
width: 225px;
@@ -129,6 +132,9 @@ ul.alert-dropdown {
border: none;
border-radius: 0;
background-color: #222;
+
+ overflow-y: auto;
+ overflow-x: none;
}
.side-nav>li>a {
[2/2] airavata-php-gateway git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Posted by nd...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
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/f199d9b8
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f199d9b8
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f199d9b8
Branch: refs/heads/develop
Commit: f199d9b8b8c87117e6c8f457836167e20ab6b046
Parents: db5eba4 9765c1e
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Sun Feb 12 16:28:14 2017 -0800
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Sun Feb 12 16:28:14 2017 -0800
----------------------------------------------------------------------
app/config/pga_config.php.template | 8 +++
app/controllers/AccountController.php | 24 +++++--
app/controllers/AdminController.php | 65 ++++++++++--------
app/controllers/ExperimentController.php | 6 +-
app/libraries/CommonUtilities.php | 4 ++
app/views/account/dashboard.blade.php | 5 ++
app/views/admin/manage-gateway.blade.php | 70 +++++++++-----------
.../compute-resource-preferences.blade.php | 2 +-
app/views/storage-resource/edit.blade.php | 1 +
9 files changed, 113 insertions(+), 72 deletions(-)
----------------------------------------------------------------------