4 files changed, 73 insertions, 25 deletions
diff --git a/web/jcs/index.css b/web/jcs/index.css
index 16da330..62de39e 100644
--- a/web/jcs/index.css
+++ b/web/jcs/index.css
@@ -140,17 +140,43 @@ ul.index_panel > ul.square_box{
     overflow:hidden;
     display:none;
 }
-ul.index_panel > ul.square_box > li.button{
+ul.index_panel > ul.square_box ul{
+    width:100%;
+    margin:0px 0px;
+    padding:0px 0px;
+    list-style:none;
+    overflow:hidden;
+}
+ul.index_panel > ul.square_box li.title{
+    width:auto;
+    height:32px;
+    margin:6px 0px 0px 0px;
+    padding:0px 0px 0px 32px;
+    line-height:32px;
+    border-bottom:#BDC0BA 1px solid;
+}
+ul.index_panel > ul.square_box li.button{
     width:auto;
     height:32px;
     padding:0px 0px 0px 32px;
     font-size:16px;
     line-height:32px;
 }
-ul.index_panel > ul.square_box > li:hover.button{
+ul.index_panel > ul.square_box li:hover.button{
     color:#FFFFFF;
     background-color:rgba(255,255,255,0.2);
 }
+ul.index_panel span.title{
+    width:100%;
+    height:100%;
+    color:#BDC0BA;
+    font-size:16px;
+    font-weight:bold;
+    position:relative;
+    top:0px;
+    left:50%;
+    display:block;
+}
 ul.index_panel a.button{
     width:100%;
     height:100%;
diff --git a/web/jcs/index.js b/web/jcs/index.js
index 1d90756..262b5fa 100644
--- a/web/jcs/index.js
+++ b/web/jcs/index.js
@@ -23,6 +23,7 @@ var index = new function(){
 
 		    j_panel.addClass('panel_m');
 		    $('#index_panel_box').stop().css('opacity','1').animate({width:240},'slow','easeOutExpo');
+		    $('#index_panel span.title').stop().animate({left:0},'slow','easeOutQuart');
 		    $('#index_panel a.button').stop().animate({left:0},'slow','easeOutQuart');
 		}
 	    }else{
@@ -31,6 +32,7 @@ var index = new function(){
 		    $('#index_panel_box').stop().animate({opacity:0},'fast','easeOutQuad',
 			function(){
 			    $('#index_panel_box').css('width','0px');
+			    $('#index_panel span.title').css('left','50%');
 			    $('#index_panel a.button').css('left','50%');
 
 			    that.page_scroll_unlock();
diff --git a/web/jcs/pro.js b/web/jcs/pro.js
index b2ea9ba..b922be0 100644
--- a/web/jcs/pro.js
+++ b/web/jcs/pro.js
@@ -1,12 +1,12 @@
 var pro = new function(){
     var that = this;
-    var j_pbox = null;
-    var pro_pbox = null;
+    var j_page = null;
+    var pro_page = null;
     var pro_proid = null;
     var pro_pmodname = null;
 
     that.init = function(){
-	j_pbox = $('#index_page > div.pro_pbox');
+	j_page = $('#index_page > div.pro_page');
 
 	that.sub_mbox = new class_pro_sub_mbox();
 
@@ -15,14 +15,15 @@ var pro = new function(){
 	    var proid;
 
 	    var _clean = function(){
-		if(pro_pbox != null){
-		    that.node.child_del(pro_pbox.node);
+		if(pro_page != null){
+		    that.node.child_del(pro_page.node);
 		}
-		j_pbox.empty();
-		j_pbox.removeClass(pro_pmodname);
+		j_page.empty();
+		j_page.removeClass(pro_pmodname);
+		index.tab_empty();
 		index.content_empty();
 
-		pro_pbox = null;
+		pro_page = null;
 		pro_proid = null;
 		pro_pmodname = null;
 	    };
@@ -55,14 +56,14 @@ var pro = new function(){
 			css = $('<link rel="stylesheet" type="text/css" href="/toj/pmod/' + pro_pmodname + '/' + pro_pmodname + '.css">');
 			$('head').append(css);
 			css.ready(function(){
-			    j_pbox.addClass(pro_pmodname);
+			    j_page.addClass(pro_pmodname);
 
 			    $.get('/toj/pmod/' + pro_pmodname + '/' + pro_pmodname + '.html',{},function(res){
-				j_pbox.html(res);
+				j_page.html(res);
 				$.getScript('/toj/pmod/' + pro_pmodname + '/' + pro_pmodname + '.js',function(script,stat,res){
-				    pro_pbox = new class_pro_pbox(pro_proid,reto.proname);
-				    eval('new ' + pro_pmodname + '(pro_pbox,j_pbox)');
-				    that.node.child_set(pro_pbox.node);
+				    pro_page = new class_pro_page(pro_proid,reto.proname);
+				    eval('new ' + pro_pmodname + '(pro_page,j_page)');
+				    that.node.child_set(pro_page.node);
 				});
 			    });
 			});
@@ -80,9 +81,9 @@ var pro = new function(){
     };
 };
 
-var class_pro_pbox = function(proid,proname){
+var class_pro_page = function(proid,proname){
     var that  = this; 
-    var j_pbox = $('#index_page > div.pro_pbox');
+    var j_page = $('#index_page > div.pro_page');
 
     that.proid = proid;
     that.proname = proname;
@@ -97,7 +98,7 @@ var class_pro_pbox = function(proid,proname){
 	pro.sub_mbox.init(proid);
 	com.url_push('/toj/m/pro_sub/');
     };
-}; __extend(class_pro_pbox,class_com_pbox);
+}; __extend(class_pro_page,class_com_pbox);
 
 var class_pro_sub_mbox = function(){
     var that = this;
diff --git a/web/jcs/user.js b/web/jcs/user.js
index 4aa7252..81e30ca 100644
--- a/web/jcs/user.js
+++ b/web/jcs/user.js
@@ -126,6 +126,9 @@ var user = new function(){
 		index.panel_show('logout');
 		index.panel_set('user','/toj/user/' + that.uid + '/main/','個人');
 		index.panel_show('user');
+		index.panel_show('square');
+
+		$('#index_panel > ul.square_box > li.mgsq > a.button').attr('href','/toj/user/' + that.uid + '/mgsq/');
 	    }else{
 		j_notice.hide();
 		j_nickname.attr('href','');
@@ -136,20 +139,26 @@ var user = new function(){
 		index.panel_hide('logout');
 		index.panel_set('user',null,'個人');
 		index.panel_hide('user');
+		index.panel_hide('square');
+
+		$('#index_panel > ul.square_box > li.mgsq > a.button').attr('href',null);
 	    }
 	});
 	that.data_chg.add(function(){
 	    var i;
-	    var j_ul;
-	    var j_li;
+	    var j_ul_run;
+	    var j_ul_past;
 	    var sqo;
+	    var idx_run;
+	    var idx_past;
+
 	    var panelsq_listadd = function(j_ul,idx,sqid,sqname){
 		var j_li;
 		var j_a;
 
-		j_li = $(j_ul.find('li.button')[idx]);
+		j_li = $(j_ul.find('li.square')[idx]);
 		if(j_li.length == 0){
-		    j_li = $('<li class="button"><a class="button"></a></li>');
+		    j_li = $('<li class="button square"><a class="button"></a></li>');
 		    j_li.hide();
 		    j_ul.append(j_li);
 		}
@@ -163,12 +172,22 @@ var user = new function(){
 
 	    $('#index_head_nickname > a.nickname').text(that.nickname);
 
-	    j_ul = $('#index_panel > ul.square_box');
-	    j_ul.find('li.button').hide();
+	    j_ul_run = $('#index_panel > ul.square_box > ul.run');
+	    j_ul_run.find('li.square').hide();
+	    idx_run = 0;
+	    j_ul_past = $('#index_panel > ul.square_box > ul.past');
+	    j_ul_past.find('li.square').hide();
+	    idx_past = 0;
 	    for(i = 0;i < user.sq_inlist.length;i++){
 		sqo = user.sq_inlist[i];
 		if(sqo.relationship != 1){
-		    panelsq_listadd(j_ul,i,sqo.sqid,sqo.sqname);
+		    if(sqo.state == 1){
+			panelsq_listadd(j_ul_run,idx_run,sqo.sqid,sqo.sqname);
+			idx_run++;
+		    }else if(sqo.state == 2){
+			panelsq_listadd(j_ul_past,idx_past,sqo.sqid,sqo.sqname);
+			idx_past++;
+		    }
 		}
 	    }
 	});