airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndo...@apache.org
Subject [1/2] airavata-php-gateway git commit: Small UI Fixes.
Date Mon, 26 Oct 2015 05:47:01 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/master f6af261ec -> 69b235af7


Small UI Fixes.


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

Branch: refs/heads/master
Commit: b444e0f9fb66f040175594f99b274ebd93957590
Parents: bcb43a6
Author: Nipurn Doshi <nipunhere@gmail.com>
Authored: Mon Oct 26 01:44:01 2015 -0400
Committer: Nipurn Doshi <nipunhere@gmail.com>
Committed: Mon Oct 26 01:44:01 2015 -0400

----------------------------------------------------------------------
 app/routes.php                           | 11 +++++--
 app/views/admin/manage-gateway.blade.php |  1 -
 app/views/layout/basic.blade.php         | 41 +++++++++++++++++++++------
 public/css/admin.css                     |  4 +--
 4 files changed, 43 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b444e0f9/app/routes.php
----------------------------------------------------------------------
diff --git a/app/routes.php b/app/routes.php
index ead6821..21d757c 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -215,10 +215,15 @@ Route::get("admin/add-gateway", "AdminController@addGateway");
 * Theme Pages Routes
 */
 Route::get( "pages/{theme_view}", function( $theme_view){
+
+	//In some cases, theme doesn't get loaded in session, so doing that here
+	//as well incase it does not.
+	if(! Session::has("theme")){
+		Session::put("theme", Config::get('pga_config.theme')['name']);
+	}
     return View::make("pages", array("page" => $theme_view) );
 });
 
-
 //Airavata Server Check
 Route::get("airavata/down", function () {
     return View::make("server-down");
@@ -226,11 +231,11 @@ Route::get("airavata/down", function () {
 /*
  * Test Routes.
 */
-
+/*
 Route::get("testjob", function () {
     //print_r( Session::all());
 });
-
+*/
 /*handling errors on production */
 App::missing(function($exception)
 {

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b444e0f9/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php
index dac0c58..d4ded59 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -229,7 +229,6 @@
 @parent
 {{ HTML::script('js/gateway.js') }}
 <script>
-
     //make first tab of accordion open by default.
     //temporary fix
     $("#accordion2").children(".panel").children(".collapse").addClass("in");

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b444e0f9/app/views/layout/basic.blade.php
----------------------------------------------------------------------
diff --git a/app/views/layout/basic.blade.php b/app/views/layout/basic.blade.php
index 3d0e3cc..7c0dec1 100755
--- a/app/views/layout/basic.blade.php
+++ b/app/views/layout/basic.blade.php
@@ -3,18 +3,23 @@ $theme = Theme::uses(Session::get("theme"));
 ?>
 
 @section ('page-header')
-
 @include("layout/fixed-header", array(
                             "title" => "PHP Reference Gateway"
                         ))
-
 @show
-
+<style>
+/*z index of sidebar is 100.*/
+.theme-header{
+    position: relative;
+    z-index:101;
+}
+</style>
+<div class="theme-header">
 <!-- Header from theme -->
 @if( isset($theme) )
 {{ $theme->partial("header") }}
 @endif
-
+</div>
 
 <body>
 
@@ -26,8 +31,9 @@ var fullName = "{{Session::get("user-profile")["firstname"] . " " . Session::get
 </script>
 @endif
 
+<div class="pga-header">
 {{ CommonUtilities::create_nav_bar() }}
-
+</div>
 
 <!-- Handling error on pages --> 
 <!--  Alerts if guests users try to go to the link without signing in. -->
@@ -49,11 +55,11 @@ var fullName = "{{Session::get("user-profile")["firstname"] . " " . Session::get
 
 <style>
 .theme-footer{
-	margin-top: 5%;
+	margin-top: 20px;
 }
 </style>
 @if( isset( $theme))
-<footer class="theme-footer">
+<footer class="theme-footer pull-left">
 {{ $theme->partial("footer") }}
 </footer>
 @endif
@@ -67,7 +73,7 @@ var fullName = "{{Session::get("user-profile")["firstname"] . " " . Session::get
 @include('layout/fixed-scripts')
 <script type="text/javascript">
 	/* keeping a check that footer stays atleast at the bottom of the window.*/
-	var bh = $("body").height();
+	var bh = $("html").height();
 	if( bh < $(window).height()/2){
 		$(".theme-footer").css("position", "relative").css("top", $(window).height()/4);
     }
@@ -75,6 +81,25 @@ var fullName = "{{Session::get("user-profile")["firstname"] . " " . Session::get
     if( bw > 767){
         $(".hero-unit").height( bw*0.36);
     }
+
+    //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);
+
+        var selectedDashboardHeight = $(window).height() - headerHeight;
+        if( selectedDashboardHeight < $(".side-nav").height())
+        {
+            $(".side-nav").height( selectedDashboardHeight).css("overflow-y", "scroll").css("overflow-x",
"none");
+        }
+    }
+
+    $(".floating").click( function(){
+        $('html,body').animate({
+            scrollTop: $(".seagrid-info").offset().top},
+        'slow');
+        $(".seagrid-info").scrollTop( $(window).scrollTop() + 150);
+    })
 </script>
 @show
 

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b444e0f9/public/css/admin.css
----------------------------------------------------------------------
diff --git a/public/css/admin.css b/public/css/admin.css
index 8550e8f..9ab3253 100644
--- a/public/css/admin.css
+++ b/public/css/admin.css
@@ -115,13 +115,13 @@ ul.alert-dropdown {
 @media(min-width:768px) {
     .side-nav {
         position: fixed;
-        top: 51px;
+        top:0;
+        z-index: 100;
         left: 225px;
         width: 225px;
         margin-left: -225px;
         border: none;
         border-radius: 0;
-        overflow-y: auto;
         background-color: #222;
     }
 


Mime
View raw message