修改登录界面

This commit is contained in:
yubaolee 2015-04-28 18:17:04 +08:00
parent 8e4472b86a
commit 91384a5447
7 changed files with 43 additions and 77 deletions

View File

@ -0,0 +1,18 @@
using System;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using OpenAuth.Domain.Model;
namespace OpenAuth.UnitTest
{
[TestClass]
public class IndexTest
{
[TestMethod]
public void MenuTest()
{
string userid = "";
IndexApp app = new IndexApp();
MenuResponse response = app.LoadMenu(userid);
}
}
}

View File

@ -63,6 +63,7 @@
<ItemGroup> <ItemGroup>
<Compile Include="DbContextTest.cs" /> <Compile Include="DbContextTest.cs" />
<Compile Include="DepartmentTest.cs" /> <Compile Include="DepartmentTest.cs" />
<Compile Include="IndexTest.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="LoginTest.cs" /> <Compile Include="LoginTest.cs" />
</ItemGroup> </ItemGroup>

File diff suppressed because one or more lines are too long

View File

@ -122,7 +122,6 @@
<Compile Include="App_Start\FilterConfig.cs" /> <Compile Include="App_Start\FilterConfig.cs" />
<Compile Include="App_Start\RouteConfig.cs" /> <Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" /> <Compile Include="App_Start\WebApiConfig.cs" />
<Content Include="Content\1.9.1\jquery.min.js" />
<Content Include="Content\avatars\avatar.png" /> <Content Include="Content\avatars\avatar.png" />
<Content Include="Content\avatars\avatar1.png" /> <Content Include="Content\avatars\avatar1.png" />
<Content Include="Content\avatars\avatar2.png" /> <Content Include="Content\avatars\avatar2.png" />

View File

@ -118,7 +118,7 @@
<div class="itemdiv memberdiv"> <div class="itemdiv memberdiv">
<div class="user"> <div class="user">
<img alt="Joe's Avatar" src="avatars/avatar2.png" /> <img alt="Joe's Avatar" src="@Url.Content("~/Content/avatars/avatar.png")" />
</div> </div>
<div class="body"> <div class="body">
@ -446,27 +446,6 @@
</div><!--/row--> </div><!--/row-->
</div><!--/#page-content--> </div><!--/#page-content-->
<div id="ace-settings-container">
<div class="btn btn-app btn-mini btn-warning" id="ace-settings-btn">
<i class="icon-cog"></i>
</div>
<div id="ace-settings-box">
<div>
<div class="pull-left">
<select id="skin-colorpicker" class="hidden">
<option data-class="default" value="#438EB9">#438EB9</option>
<option data-class="skin-1" value="#222A2D">#222A2D</option>
<option data-class="skin-2" value="#C6487E">#C6487E</option>
<option data-class="skin-3" value="#D0D0D0">#D0D0D0</option>
</select>
</div>
<span>&nbsp; Choose Skin</span>
</div>
<div><input type="checkbox" class="ace-checkbox-2" id="ace-settings-header" /><label class="lbl" for="ace-settings-header"> Fixed Header</label></div>
<div><input type="checkbox" class="ace-checkbox-2" id="ace-settings-sidebar" /><label class="lbl" for="ace-settings-sidebar"> Fixed Sidebar</label></div>
</div>
</div><!--/#ace-settings-container-->
</div><!-- #main-content --> </div><!-- #main-content -->
</div><!--/.fluid-container#main-container--> </div><!--/.fluid-container#main-container-->
<a href="#" id="btn-scroll-up" class="btn btn-small btn-inverse"> <a href="#" id="btn-scroll-up" class="btn btn-small btn-inverse">

View File

@ -2,23 +2,16 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Login Page - Ace Admin</title> <title>登录-DDD权限管理系统</title>
<script type="text/javascript" src="@Url.Content("~/Content/1.9.1/jquery.min.js")"></script> <script src="@Url.Content("~/Content/js/jquery-1.9.1.min.js")"></script>
<!-- basic styles --> <script src="@Url.Content("~/Content/js/bootstrap.min.js")"></script>
<link href="@Url.Content("~/Content/css/bootstrap.min.css")" rel="stylesheet" /> <link href="@Url.Content("~/Content/css/bootstrap.min.css")" rel="stylesheet" />
<link href="@Url.Content("~/Content/css/bootstrap-responsive.min.css")" rel="stylesheet" /> <link href="@Url.Content("~/Content/css/bootstrap-responsive.min.css")" rel="stylesheet" />
<link rel="stylesheet" href="@Url.Content("~/Content/css/font-awesome.min.css")" /> <link rel="stylesheet" href="@Url.Content("~/Content/css/font-awesome.min.css")" />
<!--[if IE 7]>
<link rel="stylesheet" href="css/font-awesome-ie7.min.css" />
<![endif]-->
<!-- page specific plugin styles -->
<!-- ace styles -->
<link rel="stylesheet" href="@Url.Content("~/Content/css/ace.min.css")" /> <link rel="stylesheet" href="@Url.Content("~/Content/css/ace.min.css")" />
<link rel="stylesheet" href="@Url.Content("~/Content/css/ace-responsive.min.css")" /> <link rel="stylesheet" href="@Url.Content("~/Content/css/ace-responsive.min.css")" />
<!--[if lt IE 9]>
<link rel="stylesheet" href="css/ace-ie.min.css" />
<![endif]-->
</head> </head>
<body class="login-layout"> <body class="login-layout">
<div class="container-fluid" id="main-container"> <div class="container-fluid" id="main-container">
@ -62,9 +55,9 @@
<label class="span8"> <label class="span8">
<input type="checkbox"><span class="lbl"> Remember Me</span> <input type="checkbox"><span class="lbl"> Remember Me</span>
</label> </label>
@*TODO:尼妹,这个第一次点击不正常?<button onclick="Login();" class="span4 btn btn-small btn-primary"><i class="icon-key"></i> Login</button>*@ <button id="btnLogin" type="button" data-loading-text="loading" onclick="Login();" class="span4 btn btn-small btn-primary"><i class="icon-key"></i> Login</button>
<input type="button" value="登录" onclick="Login();" /> </div>
</div>
</fieldset> </fieldset>
</form> </form>
@ -74,6 +67,8 @@
</div><!--/position-relative--> </div><!--/position-relative-->
</div> </div>
</div> </div>
</div><!--/span--> </div><!--/span-->
</div><!--/row--> </div><!--/row-->
@ -100,8 +95,16 @@
success: function(rel) { success: function(rel) {
if (rel.Success) if (rel.Success)
window.location = "/Home/Index"; window.location = "/Home/Index";
else else {
alert("登陆失败:" + rel.Message); $("#btnLogin").parent().after(
'<div class="alert alert-success alert-dismissable">' +
'<button type="button" class="close" ' +
'data-dismiss="alert" aria-hidden="true">' +
'&times;' +
'</button>' +
rel.Message +
'</div>');
}
} }
}); });

View File

@ -2,51 +2,22 @@
<html> <html>
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Dashboard - Ace Admin</title> <title>DDD权限管理系统</title>
<meta name="description" content="overview & stats" /> <meta name="description" content="overview & stats" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<!-- basic styles --> <!-- basic styles -->
<link href="@Url.Content("~/Content/css/bootstrap.min.css")" rel="stylesheet" /> <link href="@Url.Content("~/Content/css/bootstrap.min.css")" rel="stylesheet" />
<link href="@Url.Content("~/Content/css/bootstrap-responsive.min.css")" rel="stylesheet" /> <link href="@Url.Content("~/Content/css/bootstrap-responsive.min.css")" rel="stylesheet" />
<link rel="stylesheet" href="@Url.Content("~/Content/css/font-awesome.min.css")" /> <link rel="stylesheet" href="@Url.Content("~/Content/css/font-awesome.min.css")" />
<!--[if IE 7]>
<link rel="stylesheet" href="css/font-awesome-ie7.min.css" />
<![endif]-->
<!-- page specific plugin styles -->
<!-- ace styles -->
<link rel="stylesheet" href="@Url.Content("~/Content/css/ace.min.css")" /> <link rel="stylesheet" href="@Url.Content("~/Content/css/ace.min.css")" />
<link rel="stylesheet" href="@Url.Content("~/Content/css/ace-responsive.min.css")" /> <link rel="stylesheet" href="@Url.Content("~/Content/css/ace-responsive.min.css")" />
<link rel="stylesheet" href="@Url.Content("~/Content/css/ace-skins.min.css")" /> <link rel="stylesheet" href="@Url.Content("~/Content/css/ace-skins.min.css")" />
<!--[if lt IE 9]>
<link rel="stylesheet" href="css/ace-ie.min.css" />
<![endif]-->
</head> </head>
<body> <body>
<script src="@Url.Content("~/Content/js/jquery-1.9.1.min.js")"></script>
<!-- basic scripts -->
<script type="text/javascript" src="@Url.Content("~/Content/1.9.1/jquery.min.js")"></script>
<script type="text/javascript">
window.jQuery || document.write("<script src='~/Content/js/jquery-1.9.1.min.js'>\x3C/script>");
</script>
<script src="@Url.Content("~/Content/js/bootstrap.min.js")"></script> <script src="@Url.Content("~/Content/js/bootstrap.min.js")"></script>
<!-- page specific plugin scripts -->
<!--[if lt IE 9]>
<script type="text/javascript" src="js/excanvas.min.js"></script>
<![endif]-->
<script type="text/javascript" src="@Url.Content("~/Content/js/jquery-ui-1.10.2.custom.min.js")"></script>
<script type="text/javascript" src="@Url.Content("~/Content/js/jquery.ui.touch-punch.min.js")"></script>
<script type="text/javascript" src="@Url.Content("~/Content/js/jquery.slimscroll.min.js")"></script>
<script type="text/javascript" src="@Url.Content("~/Content/js/jquery.easy-pie-chart.min.js")"></script>
<script type="text/javascript" src="@Url.Content("~/Content/js/jquery.sparkline.min.js")"></script>
<script type="text/javascript" src="@Url.Content("~/Content/js/jquery.flot.min.js")"></script>
<script type="text/javascript" src="@Url.Content("~/Content/js/jquery.flot.pie.min.js")"></script>
<script type="text/javascript" src="@Url.Content("~/Content/js/jquery.flot.resize.min.js")"></script>
<!-- ace scripts -->
<script src="@Url.Content("~/Content/js/ace-elements.min.js")"></script> <script src="@Url.Content("~/Content/js/ace-elements.min.js")"></script>
<script src="@Url.Content("~/Content/js/ace.min.js")"></script> <script src="@Url.Content("~/Content/js/ace.min.js")"></script>
@RenderBody() @RenderBody()
</body> </body>