Update bootstrap. Fix part UI bugHEADmaster

6 files changed, 37 insertions, 31 deletions

diff --git a/src/css/mail.less b/src/css/mail.less
index 940ff28..3fdacb9 100644
--- a/src/css/mail.less
+++ b/src/css/mail.less
@@ -10,7 +10,7 @@
     }
     div.readmail{
         div.content{
-            width:100%;
+            height:256px;
         }
     }
     div.oper{
diff --git a/src/html/mail.html b/src/html/mail.html
index 6471d93..7c389a6 100644
--- a/src/html/mail.html
+++ b/src/html/mail.html
@@ -6,7 +6,7 @@
                 <h3>寫新郵件</h3>
             </div>
             <div class="modal-body row">
-                <div class="span13"> 
+                <div class="col-lg-13"> 
                     <div class="input-group">
                         <span class="input-group-addon">收件人</span>
                         <input class="form-control to_username" type="text" placeholder="使用者名稱">
@@ -34,7 +34,7 @@
                 <h3 class="title"></h3>
             </div>
             <div class="modal-body row">
-                <div class="span13"> 
+                <div class="col-lg-13"> 
                     <div class="input-group">
                         <span class="input-group-addon username_label"></span>
                         <input class="form-control username" type="text" disabled></input>
@@ -59,9 +59,9 @@
             <thead>
                 <tr>
                     <th class="check"><span class="check check_bold checkall" data-all="mailcheck"></span></th>
-                    <th class="span2 username"></th>
-                    <th class="span4">標題</th>
-                    <th class="span2 time">時間</th>
+                    <th class="col-lg-2 username"></th>
+                    <th class="col-lg-7 title">標題</th>
+                    <th class="col-lg-4 time">時間</th>
                 </tr>
             </thead>
             <tbody></tbody>
diff --git a/src/html/user_edit.html b/src/html/user_edit.html
index 504837a..95b02a2 100644
--- a/src/html/user_edit.html
+++ b/src/html/user_edit.html
@@ -1,29 +1,29 @@
 <div class="row">
-    <div class="offset3 span3">
+    <div class="col-lg-3 col-lg-offset-3">
         <h3>個人資料</h3>
         <label>暱稱</label>
-        <input name="nickname" type="text">
+        <input class="form-control" name="nickname" type="text">
         <label>信箱</label>
-        <input name="email" type="text">
+        <input class="form-control" name="email" type="text">
         <label>個人頭像網址</label>
-        <input name="avatar" type="text"><br>
-        <img class="img-polaroid avatar"></img><br><br>
+        <input class="form-control" name="avatar" type="text"><br>
+        <img class="img-thumbnail avatar"></img><br><br>
         <label>個人封面網址</label>
-        <input name="cover" type="text"><br>
-        <img class="img-polaroid cover"></img><br><br>
+        <input class="form-control" name="cover" type="text"><br>
+        <img class="img-thumbnail cover"></img><br><br>
         <label>關於我</label>
-        <input name="aboutme" type="text"><br>
+        <input class="form-control" name="aboutme" type="text"><br>
         <button class="btn btn-primary submit">確定</button>
-        <button class="btn cancel">取消</button>
+        <button class="btn btn-default cancel">取消</button>
 
         <h3>更改密碼</h3>
         <label>舊密碼</label>
-        <input name="oldpassword" type="password">
+        <input class="form-control" name="oldpassword" type="password">
         <label>新密碼</label>
-        <input name="password" type="password">
+        <input class="form-control" name="password" type="password">
         <label>重複密碼</label>
-        <input name="repeat" type="password"><br>
+        <input class="form-control" name="repeat" type="password"><br>
         <button class="btn btn-primary submit">確定</button>
-        <button class="btn cancel">取消</button>
+        <button class="btn btn-default cancel">取消</button>
     </div>
 </div>
diff --git a/src/html/user_main.html b/src/html/user_main.html
index 7abec49..da735d0 100644
--- a/src/html/user_main.html
+++ b/src/html/user_main.html
@@ -1,9 +1,7 @@
 <div class="cover"></div>
 <div class="row" style="height:768px; margin-top:640px; position:relative; z-index:0;">
-    <div class="offset4 span2">
-        <img class="img-polaroid avatar"></img>
-    </div>
-    <div class="span3 profile">
+    <img class="col-lg-2 col-lg-offset-4 img-thumbnail avatar"></img>
+    <div class="col-lg-3 profile">
         <h3 class="name"></h3>
         <h3>關於我</h3>
         <p class="aboutme"></p>
diff --git a/src/js/com.js b/src/js/com.js
index d19c8fd..204d51f 100644
--- a/src/js/com.js
+++ b/src/js/com.js
@@ -1166,15 +1166,24 @@ var com = new function(){
         });
     }
 
-    that.call_backend = function(path,func_name,callback){
+    that.call_backend = function(path,func_name,timeout,callback){
         var i;
         var params = new Array()
 
-        params = [that.backend_link + path,func_name,1000,callback]
-        for(i = 3;i < arguments.length;i++){
-            params.push(arguments[i]); 
+        if(typeof(timeout) == 'function'){
+            callback = timeout
+            params = [that.backend_link + path,func_name,1000,callback]
+            for(i = 3;i < arguments.length;i++){
+                params.push(arguments[i]); 
+            }
+        }else{
+            params = [that.backend_link + path,func_name,timeout,callback]
+            for(i = 4;i < arguments.length;i++){
+                params.push(arguments[i]); 
+            }
         }
 
+
         imc.Proxy.instance.call.apply(undefined,params);
     };
     that.sendfile_backend = function(blob,filekey_callback,result_callback){
diff --git a/src/js/index.js b/src/js/index.js
index c18543a..e5c8f5f 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -114,7 +114,6 @@ var index = new function(){
 
         user.datachg_callback.add(function(type){
             var j_a;
-            var j_li;
 
             j_a = j_header.find('li.nickname > a');
             j_a.text(user.nickname);
@@ -127,9 +126,9 @@ var index = new function(){
                 j_header.find('li.nickname').show();
                 j_header.find('li.logout').show();
                 
-                j_li = j_menu.find('div.menu li.profile');
-                j_li.find('a').attr('href','/toj/user:' + user.uid + '/main/'); 
-                j_li.show();
+                j_a = j_menu.find('div.menu a.profile');
+                j_a.attr('href','/toj/user:' + user.uid + '/main/'); 
+                j_a.show();
                 j_menu.find('div.menu a.mail').show();
                 j_menu.find('div.menu a.manage').show();
             }