From 19b94655fb9f26dc323669cc60c4e5194f597021 Mon Sep 17 00:00:00 2001
From: guanghongwei <hongwei.guang@yolu-inc.com>
Date: Tue, 4 Nov 2014 18:46:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B2=A1=E7=94=A8=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webroot/AutoSa/templates/addOpenvpn.html | 41 -----------
 webroot/AutoSa/templates/addPptp.html    | 41 -----------
 webroot/AutoSa/templates/addServer.html  | 56 ---------------
 webroot/AutoSa/templates/chgOpenvpn.html | 41 -----------
 webroot/AutoSa/templates/chgPptp.html    | 41 -----------
 webroot/AutoSa/templates/logHistory.html | 18 -----
 webroot/AutoSa/templates/test.html       | 90 ------------------------
 7 files changed, 328 deletions(-)
 delete mode 100644 webroot/AutoSa/templates/addOpenvpn.html
 delete mode 100644 webroot/AutoSa/templates/addPptp.html
 delete mode 100644 webroot/AutoSa/templates/addServer.html
 delete mode 100644 webroot/AutoSa/templates/chgOpenvpn.html
 delete mode 100644 webroot/AutoSa/templates/chgPptp.html
 delete mode 100644 webroot/AutoSa/templates/logHistory.html
 delete mode 100644 webroot/AutoSa/templates/test.html

diff --git a/webroot/AutoSa/templates/addOpenvpn.html b/webroot/AutoSa/templates/addOpenvpn.html
deleted file mode 100644
index 871b88079..000000000
--- a/webroot/AutoSa/templates/addOpenvpn.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{% extends 'base.html' %}
-{% block content %}
-    <form class="form-horizontal" role="form" method="post" action="" >
-        <fieldset >
-            <legend>添加OpenVPN用户</legend>
-            {% if error %}
-                <div class="alert alert-danger">
-                    {{ error }}
-                </div>
-            {% endif %}
-            {% if msg %}
-                <div class="alert alert-success">
-                    {{ msg }}
-                </div>
-            {% endif %}
-            <div class="form-group">
-                <label for="username" class="col-sm-2 control-label">用户名<span style="color: red"> *</span></label>
-                <div class="col-sm-4">
-                    <input type="text" class="form-control" id="username" name="username" placeholder="用户名">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="password" class="col-sm-2 control-label">密码<span style="color: red"> *</span></label>
-                <div class="col-sm-4">
-                    <input type="password" class="form-control" id="password" name="password" placeholder="密码">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="password_confirm" class="col-sm-2 control-label">确认密码<span style="color: red"> *</span></label>
-                <div class="col-sm-4">
-                    <input type="password" class="form-control" id="password_confirm" name="password_confirm" placeholder="确认密码">
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-sm-offset-2 col-sm-4">
-                    <button class="btn btn-primary">确认添加</button>
-                </div>
-            </div>
-        </fieldset>
-    </form>
-{% endblock %}
\ No newline at end of file
diff --git a/webroot/AutoSa/templates/addPptp.html b/webroot/AutoSa/templates/addPptp.html
deleted file mode 100644
index 11a666c93..000000000
--- a/webroot/AutoSa/templates/addPptp.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{% extends 'base.html' %}
-{% block content %}
-    <form class="form-horizontal" role="form" method="post" action="" >
-        <fieldset >
-            <legend>添加PPTP用户</legend>
-            {% if error %}
-                <div class="alert alert-danger">
-                    {{ error }}
-                </div>
-            {% endif %}
-            {% if msg %}
-                <div class="alert alert-success">
-                    {{ msg }}
-                </div>
-            {% endif %}
-            <div class="form-group">
-                <label for="username" class="col-sm-2 control-label">用户名<span style="color: red"> *</span></label>
-                <div class="col-sm-4">
-                    <input type="text" class="form-control" id="username" name="username" placeholder="用户名">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="password" class="col-sm-2 control-label">密码<span style="color: red"> *</span></label>
-                <div class="col-sm-4">
-                    <input type="password" class="form-control" id="password" name="password" placeholder="密码">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="password_confirm" class="col-sm-2 control-label">确认密码<span style="color: red"> *</span></label>
-                <div class="col-sm-4">
-                    <input type="password" class="form-control" id="password_confirm" name="password_confirm" placeholder="确认密码">
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-sm-offset-2 col-sm-4">
-                    <button class="btn btn-primary">确认添加</button>
-                </div>
-            </div>
-        </fieldset>
-    </form>
-{% endblock %}
\ No newline at end of file
diff --git a/webroot/AutoSa/templates/addServer.html b/webroot/AutoSa/templates/addServer.html
deleted file mode 100644
index e6c0b4369..000000000
--- a/webroot/AutoSa/templates/addServer.html
+++ /dev/null
@@ -1,56 +0,0 @@
-{% extends 'base.html' %}
-{% block content %}
-
-    <form class="form-horizontal" role="form" method="post" action="" >
-        <fieldset >
-            <legend>添加执行命令主机</legend>
-            {% if error %}
-                <div class="alert alert-danger">
-                    {{ error }}
-                </div>
-            {% endif %}
-            {% if msg %}
-                <div class="alert alert-success">
-                    {{ msg }}
-                </div>
-            {% endif %}
-            <div class="form-group">
-                <label for="pub_ip" class="col-sm-2 control-label">IP<span style="color: red"> *</span></label>
-                <div class="col-sm-4">
-                    <input type="text" class="form-control" id="pub_ip" name="pub_ip" placeholder="IP">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="username" class="col-sm-2 control-label">账号<span style="color: red"> *</span></label>
-                <div class="col-sm-4">
-                    <input type="text" class="form-control" id="username" name="username" placeholder="账号">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="password" class="col-sm-2 control-label">密码<span style="color: red"> *</span></label>
-                <div class="col-sm-4">
-                    <input type="password" class="form-control" id="password" name="password" placeholder="密码">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="port" class="col-sm-2 control-label">端口号<span style="color: red"> *</span></label>
-                <div class="col-sm-4">
-                    <input type="text" class="form-control" id="port" name="port" placeholder="端口号">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="sudo" class="col-sm-2 control-label">sudo<span style="color: red"> *</span></label>
-                <div class="col-sm-4">
-                    <input type="checkbox" style="margin-top: 12px;" id="sudo" name="sudo">
-                </div>
-            </div>
-
-            <div class="form-group">
-                <div class="col-sm-offset-2 col-sm-4">
-                    <button class="btn btn-sm btn-primary">添加</button>
-                </div>
-            </div>
-        </fieldset>
-    </form>
-
-{% endblock %}
\ No newline at end of file
diff --git a/webroot/AutoSa/templates/chgOpenvpn.html b/webroot/AutoSa/templates/chgOpenvpn.html
deleted file mode 100644
index 90a0760c8..000000000
--- a/webroot/AutoSa/templates/chgOpenvpn.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{% extends 'base.html' %}
-{% block content %}
-    <form class="form-horizontal" role="form" method="post" action="" >
-        <fieldset >
-            <legend>修改OpenVPN登陆密码</legend>
-            {% if error %}
-                <div class="alert alert-danger">
-                    {{ error }}
-                </div>
-            {% endif %}
-            {% if msg %}
-                <div class="alert alert-success">
-                    {{ msg }}
-                </div>
-            {% endif %}
-            <div class="form-group">
-                <label for="oldpass" class="col-sm-2 control-label">原来密码<span style="color: red"> *</span></label>
-                <div class="col-sm-4">
-                    <input type="password" class="form-control" id="oldpass" name="oldpass" placeholder="用户名">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="password" class="col-sm-2 control-label">新密码<span style="color: red"> *</span></label>
-                <div class="col-sm-4">
-                    <input type="password" class="form-control" id="password" name="password" placeholder="密码">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="password_confirm" class="col-sm-2 control-label">确认密码<span style="color: red"> *</span></label>
-                <div class="col-sm-4">
-                    <input type="password" class="form-control" id="password_confirm" name="password_confirm" placeholder="确认密码">
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-sm-offset-2 col-sm-4">
-                    <button class="btn btn-primary">确认修改</button>
-                </div>
-            </div>
-        </fieldset>
-    </form>
-{% endblock %}
\ No newline at end of file
diff --git a/webroot/AutoSa/templates/chgPptp.html b/webroot/AutoSa/templates/chgPptp.html
deleted file mode 100644
index 531dd9ac6..000000000
--- a/webroot/AutoSa/templates/chgPptp.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{% extends 'base.html' %}
-{% block content %}
-    <form class="form-horizontal" role="form" method="post" action="" >
-        <fieldset >
-            <legend>修改PPTP VPN密码</legend>
-            {% if error %}
-                <div class="alert alert-danger">
-                    {{ error }}
-                </div>
-            {% endif %}
-            {% if msg %}
-                <div class="alert alert-success">
-                    {{ msg }}
-                </div>
-            {% endif %}
-            <div class="form-group">
-                <label for="oldpass" class="col-sm-2 control-label">原来密码<span style="color: red"> *</span></label>
-                <div class="col-sm-4">
-                    <input type="password" class="form-control" id="oldpass" name="oldpass" placeholder="用户名">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="password" class="col-sm-2 control-label">新密码<span style="color: red"> *</span></label>
-                <div class="col-sm-4">
-                    <input type="password" class="form-control" id="password" name="password" placeholder="密码">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="password_confirm" class="col-sm-2 control-label">确认密码<span style="color: red"> *</span></label>
-                <div class="col-sm-4">
-                    <input type="password" class="form-control" id="password_confirm" name="password_confirm" placeholder="确认密码">
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-sm-offset-2 col-sm-4">
-                    <button class="btn btn-primary">确认</button>
-                </div>
-            </div>
-        </fieldset>
-    </form>
-{% endblock %}
\ No newline at end of file
diff --git a/webroot/AutoSa/templates/logHistory.html b/webroot/AutoSa/templates/logHistory.html
deleted file mode 100644
index 8050f593d..000000000
--- a/webroot/AutoSa/templates/logHistory.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends 'base.html' %}
-{% block content %}
-
-        <div id="myModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                <h3 id="myModalLabel">日志汇总</h3>
-            </div>
-            <div class="modal-body">
-                <p>弹出层…</p>
-            </div>
-            <div class="modal-footer">
-                <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
-                <button class="btn btn-primary">Save changes</button>
-            </div>
-        </div>
-
-{% end block %}
\ No newline at end of file
diff --git a/webroot/AutoSa/templates/test.html b/webroot/AutoSa/templates/test.html
deleted file mode 100644
index 9af232d69..000000000
--- a/webroot/AutoSa/templates/test.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!doctype html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>运维管理系统</title>
-<link rel="shortcut icon" type="image/x-icon" href="http://img.youlu.com/web/favicon.gif" />
-<meta name="viewport" content="width=device-width,initial-scale=1.0">
-<!--[if lt IE 9]>
-	<script src="http://html5shim.googlecode.com/svn/trunk/html5js"></script>
-<![endif]-->
-<link href="/static/css/bootstrap.css" rel="stylesheet">
-<link href="/static/css/main.css" rel="stylesheet">
-
-<script src="/static/js/main.js"></script>
-<script src="/static/js/jquery.min.js"></script>
-
-<!-- 最新的 Bootstrap 核心 JavaScript 文件 -->
-<script src="/static/js/bootstrap.min.js"></script>
-</head>
-
-<body>
-<nav class="navbar navbar-inverse navbar-static-top" role="navigation">
-  <div class="navbar-header"> <a class="navbar-brand" href="#">运维管理系统</a> </div>
-  <div class="collapse navbar-collapse">
-    <ul class="nav navbar-nav">
-      <li class="active"><a href="/">主页</a></li>
-      <li><a href="#">用户管理</a></li>
-      <li><a href="#">命令执行</a></li>
-      <li><a href="#">主机管理</a></li>
-    </ul>
-    <div class="btn-group navbar-right">
-       <button type="button" class="btn btn-primary dropdown-toggle " data-toggle="dropdown">
-         {{ name }}<span class="caret"></span>
-       </button>
-       <ul class="dropdown-menu dropdown-logout">
-         <li class="dropdown-logout"><a href="/logout/">退出</a></li>
-       </ul>
-    </div>
-  </div>
-</nav>
-<div class="container">
-<div class="row row-offcanvas row-offcanvas-right">
-  <div class="col-xs-12 col-sm-3 sidebar-offcanvas" id="sidebar" role="navigation">
-    <div class="row">
-      <div class="col-md-12">
-        <div class="row>
-		<!--Sidebar content-->
-		<div class="sidebar-menu">
-          <div class="menu-first" ><a href="#userMenu" data-toggle="collapse"><i class="glyphicon glyphicon-th"></i> 用户管理</a></div>
-          <ul id="userMenu" class="nav nav-list navbar-collapse.in menu-second">
-            <li><a href="/showUser/"><i class="glyphicon glyphicon-send"></i> 查看用户</a></li>
-            <li><a href="/addUser/"><i class="glyphicon glyphicon-send"></i> 添加用户</a></li>
-          </ul>
-          <div class="menu-first" ><a href="#monitorMenu" data-toggle="collapse"><i class="glyphicon glyphicon-th"></i> 执行命令</a></div>
-          <ul id="monitorMenu" class="nav nav-list navbar-collapse.in menu-second">
-            <li><a href="/runCommand/"><i class="glyphicon glyphicon-send"></i> 执行命令</a></li>
-            <li><a href="/addServer/"><i class="glyphicon glyphicon-send"></i> 添加主机</a></li>
-            <li><a href="#"><i class="glyphicon glyphicon-send"></i> 环境</a></li>
-          </ul>
-          <div class="menu-first" ><a href="#articleMenu" data-toggle="collapse"><i class="glyphicon glyphicon-th"></i> 主机管理</a></div>
-          <ul id="articleMenu" class="nav nav-list navbar-collapse menu-second">
-            <li><a href="/showAssets/"><i class="glyphicon glyphicon-send"></i> 主机列表</a></li>
-            <li><a href="/addAssets/"><i class="glyphicon glyphicon-send"></i> 添加主机</a></li>
-          </ul>
-        </div>
-      </div>
-    </div>
-  </div>
-
-   <div class="row">
-  <div class="col-lg-6">
-    <div class="input-group">
-      <span class="input-group-btn">
-        <button class="btn btn-default" type="button">Go!</button>
-      </span>
-      <input type="text" class="form-control">
-    </div><!-- /input-group -->
-  </div><!-- /.col-lg-6 -->
-  <div class="col-lg-6">
-    <div class="input-group">
-      <input type="text" class="form-control">
-      <span class="input-group-btn">
-        <button class="btn btn-default" type="button">Go!</button>
-      </span>
-    </div><!-- /input-group -->
-  </div><!-- /.col-lg-6 -->
-</div><!-- /.row -->
-</div>
-</body>
-</html>