Commit eb3c92690b3a333b7595a5e2ae32f22fc6d2cd78
Merge branch 'luming' of http://120.78.57.84/Elvis/SunvoteEducation into luming
Showing
3 changed files
with
5 additions
and
5 deletions
WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
| @@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
| 14 | <meta charset="utf-8"> | 14 | <meta charset="utf-8"> |
| 15 | <meta http-equiv="X-UA-Compatible" content="IE=edge"> | 15 | <meta http-equiv="X-UA-Compatible" content="IE=edge"> |
| 16 | <meta name="viewport" content="width=device-width, initial-scale=1"> | 16 | <meta name="viewport" content="width=device-width, initial-scale=1"> |
| 17 | -<title>中天电子-教育管理系统</title> | 17 | +<title>鹿鸣周测管理系统</title> |
| 18 | 18 | ||
| 19 | <!-- Bootstrap --> | 19 | <!-- Bootstrap --> |
| 20 | <!-- <link | 20 | <!-- <link |
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
| @@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
| 14 | <meta charset="utf-8"> | 14 | <meta charset="utf-8"> |
| 15 | <meta http-equiv="X-UA-Compatible" content="IE=edge"> | 15 | <meta http-equiv="X-UA-Compatible" content="IE=edge"> |
| 16 | <meta name="viewport" content="width=device-width, initial-scale=1"> | 16 | <meta name="viewport" content="width=device-width, initial-scale=1"> |
| 17 | -<title>教育管理系统</title> | 17 | +<title>鹿鸣周测管理系统</title> |
| 18 | 18 | ||
| 19 | <!-- Bootstrap --> | 19 | <!-- Bootstrap --> |
| 20 | <link href="../static/css/bootstrap.min.css" rel="stylesheet"> | 20 | <link href="../static/css/bootstrap.min.css" rel="stylesheet"> |
WebRoot/WEB-INF/jsp/system/index/login.jsp
| @@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
| 14 | <meta charset="utf-8"> | 14 | <meta charset="utf-8"> |
| 15 | <meta http-equiv="X-UA-Compatible" content="IE=edge"> | 15 | <meta http-equiv="X-UA-Compatible" content="IE=edge"> |
| 16 | <meta name="viewport" content="width=device-width, initial-scale=1"> | 16 | <meta name="viewport" content="width=device-width, initial-scale=1"> |
| 17 | -<title>中天电子-教育管理系统</title> | 17 | +<title>鹿鸣周测管理系统</title> |
| 18 | 18 | ||
| 19 | <!-- Bootstrap --> | 19 | <!-- Bootstrap --> |
| 20 | <link href="static/css/bootstrap.min.css" rel="stylesheet"> | 20 | <link href="static/css/bootstrap.min.css" rel="stylesheet"> |
| @@ -85,12 +85,12 @@ body{ | @@ -85,12 +85,12 @@ body{ | ||
| 85 | <input type="checkbox" id="rem_flag"/> | 85 | <input type="checkbox" id="rem_flag"/> |
| 86 | <span>记住密码</span> | 86 | <span>记住密码</span> |
| 87 | </div> | 87 | </div> |
| 88 | - <div class="language" style="display:inline-block;width:50%;margin-top:10px;text-align:right;"> | 88 | + <!-- <div class="language" style="display:none;width:50%;margin-top:10px;text-align:right;"> |
| 89 | <select name="language" id="language" style="line-height:34px;height:34px;width:120px;"> | 89 | <select name="language" id="language" style="line-height:34px;height:34px;width:120px;"> |
| 90 | <option value="zh">中文</option> | 90 | <option value="zh">中文</option> |
| 91 | <option value="en">English</option> | 91 | <option value="en">English</option> |
| 92 | </select> | 92 | </select> |
| 93 | - </div> | 93 | + </div> --> |
| 94 | </div> | 94 | </div> |
| 95 | <a href="#" onclick="severCheck();" class="login_btn">登录</a> | 95 | <a href="#" onclick="severCheck();" class="login_btn">登录</a> |
| 96 | 96 |