Footer positioning improvements.
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/ce445088 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ce445088 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ce445088 Branch: refs/heads/master Commit: ce445088b949e594368b3155cc139dc9d1663256 Parents: 1f6c86d Author: Nipurn Doshi <[email protected]> Authored: Tue Oct 27 14:34:49 2015 -0400 Committer: Nipurn Doshi <[email protected]> Committed: Tue Oct 27 14:34:49 2015 -0400 ---------------------------------------------------------------------- app/views/admin/manage-experiments.blade.php | 12 ++++++++++-- app/views/layout/basic.blade.php | 6 +++--- 2 files changed, 13 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ce445088/app/views/admin/manage-experiments.blade.php ---------------------------------------------------------------------- diff --git a/app/views/admin/manage-experiments.blade.php b/app/views/admin/manage-experiments.blade.php index 482d4c9..f935a68 100644 --- a/app/views/admin/manage-experiments.blade.php +++ b/app/views/admin/manage-experiments.blade.php @@ -386,12 +386,20 @@ to be uncommented when actually in use. $(".oneDayExp").click( function(){ var todayDate = getCurrentDate(); var ydayDate = getCurrentDate(1); + $("#datetimepicker9").find("input").val( ydayDate); + $("#datetimepicker10").find("input").val( todayDate); + todayDate = moment(todayDate).utc().format('MM/DD/YYYY hh:mm a'); + ydayDate = moment(ydayDate).utc().format('MM/DD/YYYY hh:mm a'); getExperiments( ydayDate, todayDate); }); $(".oneWeekExp").click( function(){ var todayDate = getCurrentDate(); var ydayDate = getCurrentDate(7); + $("#datetimepicker9").find("input").val( ydayDate); + $("#datetimepicker10").find("input").val( todayDate); + todayDate = moment(todayDate).utc().format('MM/DD/YYYY hh:mm a'); + ydayDate = moment(ydayDate).utc().format('MM/DD/YYYY hh:mm a'); getExperiments( ydayDate, todayDate); }) @@ -425,10 +433,10 @@ to be uncommented when actually in use. var cd = new Date(); var hours = cd.getUTCHours(); month = cd.getMonth() + 1; //getmonth()starts from 0 for some reason - var timeOfDay = "am"; + var timeOfDay = "AM"; if(hours >= 12) { - timeOfDay = "pm" + timeOfDay = "PM" if(hours != 12) hours = hours - 12; } http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ce445088/app/views/layout/basic.blade.php ---------------------------------------------------------------------- diff --git a/app/views/layout/basic.blade.php b/app/views/layout/basic.blade.php index 7c0dec1..d207504 100755 --- a/app/views/layout/basic.blade.php +++ b/app/views/layout/basic.blade.php @@ -59,7 +59,7 @@ var fullName = "{{Session::get("user-profile")["firstname"] . " " . Session::get } </style> @if( isset( $theme)) -<footer class="theme-footer pull-left"> +<footer class="theme-footer"> {{ $theme->partial("footer") }} </footer> @endif @@ -74,8 +74,8 @@ var fullName = "{{Session::get("user-profile")["firstname"] . " " . Session::get <script type="text/javascript"> /* keeping a check that footer stays atleast at the bottom of the window.*/ var bh = $("html").height(); - if( bh < $(window).height()/2){ - $(".theme-footer").css("position", "relative").css("top", $(window).height()/4); + if( bh < $(window).height()){ + $(".theme-footer").css("position", "relative").css("top", $(window).height()*1/3); } var bw = $("body").width(); if( bw > 767){
