[2.0.3]クレジットオフ時、ログイン画面が崩れないように修正 #2806

baserproject · Jul 25, 2012 · 8ee116b · 8ee116b
1 parent 2f86599
commit 8ee116b
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 34 deletions.
diff --git a/baser/vendors/js/admin/adjust_scroll.js b/baser/vendors/js/admin/adjust_scroll.js
@@ -1,7 +1,10 @@
 //高さを調整する
 $(function(){
-  $("html,body").height( $(this).height() - $("#ToolBar").outerHeight()*1);
-  $(window).resize(function(){
-    $("html,body").height( $(this).height() - $("#ToolBar").outerHeight()*1);
-  });
-});
+  resizeAdminPage();
+  $(window).resize(resizeAdminPage);
+  function resizeAdminPage(){
+    var adminH = $(this).height() - $("#ToolBar").outerHeight()*1;
+    if (adminH < 600) adminH = 600;
+    $("html,body").height(adminH);
+  }
+});
diff --git a/baser/views/elements/admin/credit.php b/baser/views/elements/admin/credit.php
@@ -21,7 +21,7 @@
 <script type="text/javascript">
 var openedFavorite;
 $(function(){
-	
+
 	var pageHeight,hideTarget;
 	$("#Credit").click(function(){
 		$("#Credit").fadeOut(1000);
@@ -57,7 +57,7 @@
  * クレジットを表示する
  */
 function credit(){
-	
+
 	var hideTarget
 	if($("#SideBar").css('display') == 'none') {
 		openedFavorite = false;
@@ -87,12 +87,12 @@ function credit(){
     });
     $("#CreditScroller").fadeIn(1000);
   }
-  
+
   //リサイズイベント
   $(window).resize(function(){
     resizeScroll();
   });
-	
+
   var scrollSpeed = 1;
 	var height = $("#CreditScroller").height();
 	var posX = $(window).height();
@@ -118,15 +118,15 @@ function setViewSize() {
 function resizeScroll() {
 	$("html,body").height( $(this).height() - $("#ToolBar").outerHeight()*1);
 	$("#Credit").width( $("#Page").width());
-	$("#Credit").height( $("#Page").height() + $("#ToolBar").outerHeight()*1);  
+	$("#Credit").height( $("#Page").height() + $("#ToolBar").outerHeight()*1);
 }
 </script>
 
 <div id="Credit">
 	<div id="CreditInner">
 		<div id="CreditScroller">
 			<div id="CreditScrollerInner">
-				
+
 				<h1>Special Thanks Credit</h1>
 
 				<div class="section">
@@ -136,7 +136,7 @@ function resizeScroll() {
 						<li><a href="http://blog.clipdesign.jp/" target="_blank">Misuzu Nakamura</a> (<a href="http://twitter.com/mutsuking" target="_blank">clipdesign</a>)</li>
 					</ul>
 				</div>
-				
+
 				<div class="section">
 					<h2>Publishers</h2>
 					<ul>
@@ -203,21 +203,13 @@ function resizeScroll() {
 						<li>Daichi Shimoyama (<a href="http://twitter.com/daichi_shim" target="_blank">daichi_shim</a>)</li>
 						<li><a href="http://www.ls-e.com" target="_blank">Tetuya Takahashi</a></li>
 					</ul>
-					<ul>
-						<li><a href="http://exittunes.com/index2.html" target="_blank">Programmersan</a> (<a href="http://twitter.com/programmersan" target="_blank">programmersan</a>)</li>
-						<li><a href="http://www.panic-net.org/" target="_blank">Min</a> (<a href="http://twitter.com/min_meou" target="_blank">min_meou</a>)</li>
-						<li><a href="http://blog.grooweb.jp/" target="_blank">Youhei Nishi</a> (<a href="http://twitter.com/nippei" target="_blank">nippei</a>)</li>
-						<li><a href="http://ryuring.blogspot.jp/" target="_blank">Ryuji Egashira</a> (<a href="http://twitter.com/ryuring" target="_blank">ryuring</a>)</li>
-						<li>Daichi Shimoyama (<a href="http://twitter.com/daichi_shim" target="_blank">daichi_shim</a>)</li>
-						<li><a href="http://www.ls-e.com" target="_blank">Tetuya Takahashi</a></li>
-					</ul>
 					<ul>
 						<li>Masanori Matsumoto (<a href="http://twitter.com/mattun0313" target="_blank">mattun0313</a>)</li>
 					</ul>
 				</div>
 
 				<h1 style="margin-top:400px;">baserCMS Users Community</h1>
-				
+
 			</div>
 		</div>
 	</div>

diff --git a/baser/views/users/admin/login.php b/baser/views/users/admin/login.php
@@ -40,15 +40,15 @@
 );
 ?>
 
-
+<?php $bcBaser->js('admin/adjust_scroll',false) ?>
 <script type="text/javascript">
 $(function(){
-	
+
 	$("body").prepend($("#Login"));
 	$('#UserName').focus();
 	changeNavi('#UserName');
 	changeNavi('#UserPassword');
-		
+
 	$('#UserName,#UserPassword').bind('keyup', function(){
 		if($(this).val()) {
 			$(this).prev().hide();
@@ -60,17 +60,17 @@
 	$("#Login").click(function(){
 		changeView(false);
 	});
-	
+
 	$("#LoginInner").click(function(e){
 		if (e && e.stopPropagation) {
 			e.stopPropagation();
 		} else {
 			window.event.cancelBubble = true;
 		}
 	});
-	
+
 	$("#BtnLogin").click(function(e){
-		
+
 		$("#UserAjaxLoginForm").ajaxSubmit({
 			beforeSend: function() {
 				$("#Waiting").show();
@@ -99,15 +99,15 @@
 				$("#Waiting").hide();
 			}
 		});
-		
+
 		return false;
-		
+
 	});
 
 	if($("#LoginCredit").html() == 1) {
 		changeView($("#LoginCredit").html());
 	}
-	
+
 });
 function changeNavi(target){
 	if($(target).val()) {
@@ -127,7 +127,7 @@ function changeView(creditOn) {
 	} else {
 		openCredit();
 	}
-	
+
 }
 function openCredit(completeHandler) {
 	$("#LoginInner").css('color', '#333');
@@ -145,9 +145,9 @@ function openCredit(completeHandler) {
 
 <div id="LoginCredit"><?php echo $bcBaser->siteConfig['login_credit'] ?></div>
 <div id="Login">
-	
+
 	<div id="LoginInner">
-				
+
 		<h1><?php $bcBaser->contentsTitle() ?></h1>
 		<div id="AlertMessage" class="message" style="display:none"></div>
 <?php if($currentPrefix == 'front'): ?>

diff --git a/baser/views/users/admin/reset_password.php b/baser/views/users/admin/reset_password.php
@@ -19,7 +19,7 @@
  */
 ?>
 
-
+<?php $bcBaser->js('admin/adjust_scroll',false) ?>
 <div class="section">
 <p>パスワードを忘れた方は、登録されているメールアドレスを送信してください。<br />
 新しいパスワードをメールでお知らせします。</p>