From d6728fb11937b4d63fc738bf9ecf069c37119d2c Mon Sep 17 00:00:00 2001
From: j502647092 <jtb1@163.com>
Date: Fri, 19 Jun 2015 18:56:48 +0800
Subject: [PATCH] change stylr...

---
 CitySunlight/Account/Login.aspx       | 38 ++++++++++++++++++++++-----
 CitySunlight/Account/Login.aspx.cs    |  5 +++-
 CitySunlight/Admin.aspx               |  2 +-
 CitySunlight/Admin.aspx.cs            |  8 +++---
 CitySunlight/Basic.Master             |  9 +++----
 CitySunlight/Basic.Master.cs          |  2 +-
 CitySunlight/CitySunlight.csproj.user |  2 +-
 CitySunlight/Main.aspx                |  4 +--
 CitySunlight/Main.aspx.cs             | 17 +++++++++---
 CitySunlight/Product/ProductEdit.aspx |  6 ++---
 10 files changed, 66 insertions(+), 27 deletions(-)

diff --git a/CitySunlight/Account/Login.aspx b/CitySunlight/Account/Login.aspx
index b6004b1..241ba8a 100644
--- a/CitySunlight/Account/Login.aspx
+++ b/CitySunlight/Account/Login.aspx
@@ -2,7 +2,36 @@
 
 <asp:Content ID="body" ContentPlaceHolderID="body" runat="server">
     <form id="loginform" runat="server">
-        <table id="tb" class="table table-bordered">
+
+        <div class="panel panel-info">
+            <div class="panel-heading">
+                <h3 class="panel-title">都市阳光销售平台</h3>
+            </div>
+            <div class="panel-body">
+                <div class="form-group">
+                    <%= getAlert(msg) %>
+                </div>
+                <div class="form-group">
+                    <button type="button" class="btn btn-primary btn-lg" style="text-shadow: black 5px 3px 3px;">
+                        <span class="glyphicon glyphicon-user"></span>用户名
+                    </button>
+                    <input type="text" id="UserNameTx" name="UserNameTx" class="form-control" placeholder="请输入账号" />
+                </div>
+                <div class="form-group">
+                    <button type="button" class="btn btn-primary btn-lg" style="text-shadow: black 5px 3px 3px;"><span class="glyphicon glyphicon-th"></span>密  码</button>
+                    <input type="password" id="PassWordTx" name="PassWordTx" class="form-control" placeholder="请输入密码" />
+                </div>
+                <div class="form-group">
+                    <asp:Button runat="server" ID="register" Text="注册" Height="45" Width="70" OnClick="register_Click" UseSubmitBehavior="False" class="btn btn-lg btn-primary" />
+                    <asp:Button runat="server" ID="login" Text="登录" Width="140" OnClick="login_Click" class="btn btn-lg btn-success" />
+                </div>
+            </div>
+        </div>
+
+
+
+
+        <%-- <table id="tb" class="table table-condensed">
             <tr>
                 <td colspan="2" id="head">
                     <h1>都市阳光销售平台</h1>
@@ -26,11 +55,8 @@
                 </td>
             </tr>
             <tr>
-                <td>
-                    <asp:Button runat="server" ID="register" Text="注册" Width="70" OnClick="register_Click" UseSubmitBehavior="False" />
-                    <asp:Button runat="server" ID="login" Text="登录" OnClick="login_Click" />
-                </td>
+                <td></td>
             </tr>
-        </table>
+        </table>--%>
     </form>
 </asp:Content>
diff --git a/CitySunlight/Account/Login.aspx.cs b/CitySunlight/Account/Login.aspx.cs
index 0d2643c..912f95f 100644
--- a/CitySunlight/Account/Login.aspx.cs
+++ b/CitySunlight/Account/Login.aspx.cs
@@ -58,7 +58,10 @@ namespace CitySunlight
 
         public String getAlert(String msg)
         {
-            return (msg == null || msg == "") ? ("<span class=\"alert alert-success\">请输入账号密码登录后台</span>") : ("<span class=\"alert alert-danger\">" + msg + "</span>");
+            String html = "<div class=\"alert alert-{0} alert-dismissable\">";
+            html += "<button type=\"button\" class=\"close\" data-dismiss=\"alert\" aria-hidden=\"true\">&times;</button>";
+            html += "{1}</div>";
+            return (msg == null || msg == "") ? "" : String.Format(html, "danger", msg);
         }
 
         protected void register_Click(object sender, EventArgs e)
diff --git a/CitySunlight/Admin.aspx b/CitySunlight/Admin.aspx
index ee71ddc..d922356 100644
--- a/CitySunlight/Admin.aspx
+++ b/CitySunlight/Admin.aspx
@@ -2,7 +2,7 @@
 
 <asp:Content ID="body" ContentPlaceHolderID="body" runat="server">
     <form id="formmain" runat="server">
-        <table class="table table-bordered">
+        <table class="table table-condensed">
             <%= GetProductInfo() %>
         </table>
     </form>
diff --git a/CitySunlight/Admin.aspx.cs b/CitySunlight/Admin.aspx.cs
index e9b943f..1da9479 100644
--- a/CitySunlight/Admin.aspx.cs
+++ b/CitySunlight/Admin.aspx.cs
@@ -63,13 +63,15 @@ namespace CitySunlight
             }
             decimal total = ProductManager.SearchProduct(user, "", "", "", "").Rows.Count / peritems;
             int totalpages = (int)(Math.Ceiling(total));
-            String allpage = "";
+            String allpage = "<ul class=\"pagination\">";
             for (int i = 1; i <= totalpages; i++)
             {
-                String page = String.Format(" <a href=\"/Admin.aspx?pages={0}\">{1}</a> ", i, i);
+                String page = String.Format("<li><a href=\"/Admin.aspx?pages={0}\">{1}</a><li>", i, i);
                 allpage += page;
             }
-            html += String.Format("<tr><td colspan=\"6\" align=\"right\"></td><td colspan=\"2\">{0} 共{1}页</td></tr>", allpage, totalpages);
+            allpage += String.Format("<li><a href=\"#\">共{0}页</a><li>", totalpages);
+            allpage += "</ul>";
+            html += String.Format("<tr><td colspan=\"6\" align=\"right\"></td><td colspan=\"2\">{0}</td></tr>", allpage);
             return html;
         }
     }
diff --git a/CitySunlight/Basic.Master b/CitySunlight/Basic.Master
index 0d97f0e..0b299fa 100644
--- a/CitySunlight/Basic.Master
+++ b/CitySunlight/Basic.Master
@@ -11,10 +11,8 @@
     <asp:ContentPlaceHolder ID="head" runat="server">
     </asp:ContentPlaceHolder>
 
-    <link href="http://cdn.bootcss.com/bootstrap/3.3.5/css/bootstrap.css" rel="stylesheet">
     <link href="http://cdn.bootcss.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">
 
-    <link href="http://cdn.bootcss.com/bootstrap/3.3.5/css/bootstrap-theme.css" rel="stylesheet">
     <link href="http://cdn.bootcss.com/bootstrap/3.3.5/css/bootstrap-theme.min.css" rel="stylesheet">
 
     <link rel="stylesheet" href="/CssStyle/CityStyle.css" />
@@ -22,7 +20,7 @@
 </head>
 <body>
     <!-- Fixed navbar -->
-    <nav class="navbar navbar-inverse navbar-fixed-top">
+    <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
         <div class="container">
             <div class="navbar-header">
                 <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
@@ -41,9 +39,8 @@
                     <%= GetLoginInfo() %>
                 </ul>
             </div>
-            <!--/.nav-collapse -->
-
         </div>
+        <!--/.nav-collapse -->
     </nav>
 
     <div class="container theme-showcase" role="main">
@@ -58,6 +55,6 @@
     </div>
     <!-- /container -->
     <script src="http://cdn.bootcss.com/jquery/1.11.2/jquery.min.js"></script>
-    <script src="http://cdn.bootcss.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
+    <script src="http://cdn.bootcss.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
 </body>
 </html>
diff --git a/CitySunlight/Basic.Master.cs b/CitySunlight/Basic.Master.cs
index f753b8b..c2239eb 100644
--- a/CitySunlight/Basic.Master.cs
+++ b/CitySunlight/Basic.Master.cs
@@ -21,7 +21,7 @@ namespace CitySunlight
             else
             {
                 html = String.Format("<li>欢迎您 {0} </li>", Session["username"].ToString());
-                html += "<li><a href=\"/Account/LogOut.aspx\" > 注销</a></li>";
+                html += "<li><a href=\"/Account/LogOut.aspx\" >注销</a></li>";
                 html += "<li><a href=\"/Product/ProductEdit.aspx?type=create\" >发布</a></li>";
                 html += "<li><a href=\"/Admin.aspx\" >管理</a></li>";
             }
diff --git a/CitySunlight/CitySunlight.csproj.user b/CitySunlight/CitySunlight.csproj.user
index a8c69d9..5db78e0 100644
--- a/CitySunlight/CitySunlight.csproj.user
+++ b/CitySunlight/CitySunlight.csproj.user
@@ -7,7 +7,7 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <StartPageUrl>Main.aspx</StartPageUrl>
+          <StartPageUrl>Account/Login.aspx</StartPageUrl>
           <StartAction>SpecificPage</StartAction>
           <AspNetDebugging>True</AspNetDebugging>
           <SilverlightDebugging>False</SilverlightDebugging>
diff --git a/CitySunlight/Main.aspx b/CitySunlight/Main.aspx
index 355fd05..acc1ae2 100644
--- a/CitySunlight/Main.aspx
+++ b/CitySunlight/Main.aspx
@@ -2,10 +2,10 @@
 <%@ Import Namespace="CitySunlight" %>
 <asp:Content ID="body" ContentPlaceHolderID="body" runat="server">
     <form id="formmain" runat="server">
-        <table class="table table-bordered">
+        <table class="table table-striped table-bordered">
             <tr>
                 <td></td>
-                <td><span class="label label-info">商品名称: </span></td>
+                <td><span>商品名称: </span></td>
                 <td colspan="2">
                     <input name="search" type="text" value="<%= search %>" /></td>
                 <td>产品分类: </td>
diff --git a/CitySunlight/Main.aspx.cs b/CitySunlight/Main.aspx.cs
index 9e0cce2..57e0da8 100644
--- a/CitySunlight/Main.aspx.cs
+++ b/CitySunlight/Main.aspx.cs
@@ -60,13 +60,24 @@ namespace CitySunlight
             }
             decimal total = ProductManager.SearchProduct("", search, classid, "", "").Rows.Count / peritems;
             int totalpages = (int)(Math.Ceiling(total));
-            String allpage = "";
+            String allpage = "<ul class=\"pagination\">";
+            //            <ul class="pagination">
+            //  <li><a href="#">&laquo;</a></li>
+            //  <li><a href="#">1</a></li>
+            //  <li><a href="#">2</a></li>
+            //  <li><a href="#">3</a></li>
+            //  <li><a href="#">4</a></li>
+            //  <li><a href="#">5</a></li>
+            //  <li><a href="#">&raquo;</a></li>
+            //</ul>
             for (int i = 1; i <= totalpages; i++)
             {
-                String page = String.Format(" <a href=\"/Main.aspx?search={0}&classid={1}&pages={2}\">{3}</a> ", search, classid, i, i);
+                String page = String.Format("<li><a href=\"/Main.aspx?search={0}&classid={1}&pages={2}\">{3}</a></li>", search, classid, i, i);
                 allpage += page;
             }
-            html += String.Format("<tr><td colspan=\"6\" align=\"right\"></td><td colspan=\"2\">{0} 共{1}页</td></tr>", allpage, totalpages);
+            allpage += String.Format("<li><a href=\"#\">共{0}页</a><li>", totalpages);
+            allpage += "</ul>";
+            html += String.Format("<tr><td colspan=\"8\" align=\"right\">{0}</td></tr>", allpage);
             return html;
         }
 
diff --git a/CitySunlight/Product/ProductEdit.aspx b/CitySunlight/Product/ProductEdit.aspx
index 36a7c0d..6aa4854 100644
--- a/CitySunlight/Product/ProductEdit.aspx
+++ b/CitySunlight/Product/ProductEdit.aspx
@@ -2,17 +2,17 @@
 
 <asp:Content runat="server" ID="body" ContentPlaceHolderID="body">
     <form id="productedit" runat="server" enctype="multipart/form-data">
-        <table class="table table-bordered">
+        <table class="table table-condensed">
             <tr>
                 <td>
                     <span style="color: red"><%= msg %></span>
             </tr>
         </table>
         <%= CreateEditForm() %>
-        <table>
+        <table class="table table-condensed">
             <tr>
                 <td>
-                    <asp:Button ID="submit" runat="server" Text="提交" OnClick="submit_Click" /></td>
+                    <asp:Button ID="submit" runat="server" Text="提交" OnClick="submit_Click"/></td>
             </tr>
         </table>
     </form>