Merge branch 'jlog' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ

# Conflicts:
#	jumpserver/views.py
#	juser/models.py
#	juser/views.py
#	templates/jperm/perm_apply.html

.gitignore

@@ -42,3 +42,5 @@ logs
 keys
 jumpserver.conf
 nohup.out
+tmp/*
+db.sqlite3

connect.py

@@ -8,19 +8,33 @@ sys.setdefaultencoding('utf8')
 import os
 import re
 import time
+import datetime
 import textwrap
 import getpass
 import readline
 import django
 from multiprocessing import Pool
+import paramiko
+import struct, fcntl, signal, socket, select, fnmatch
 
 os.environ['DJANGO_SETTINGS_MODULE'] = 'jumpserver.settings'
 if django.get_version() != '1.6':
     django.setup()
-from jumpserver.api import ServerError, User, Asset, Jtty, get_object
-from jumpserver.api import logger
-from jumpserver.api import BisGroup as AssetGroup
+from jumpserver.api import ServerError, User, Asset, AssetGroup, get_object
+from jumpserver.api import logger, is_dir, Log, TtyLog
+from jumpserver.settings import log_dir
 
+try:
+    import termios
+    import tty
+except ImportError:
+    print '\033[1;31m仅支持类Unix系统 Only unix like supported.\033[0m'
+    time.sleep(3)
+    sys.exit()
+
+VIM_FLAG = False
+VIM_COMMAND = ''
+SSH_TTY = ''
 login_user = get_object(User, username=getpass.getuser())
 
 
@@ -82,6 +96,358 @@ def verify_connect(user, option):
         jtty.connect()
 
 
+def check_vim_status(command, ssh):
+    global SSH_TTY
+    print command
+    if command == '':
+        return True
+    else:
+        command_str= 'ps -ef |grep "%s" | grep "%s"|grep -v grep |wc -l' % (command,SSH_TTY)
+        print command_str
+        stdin, stdout, stderr = ssh.exec_command(command_str)
+        ps_num = stdout.read()
+        print ps_num
+        if int(ps_num) == 0:
+            return True
+        else:
+            return False
+
+
+def deal_command(str_r, ssh):
+
+    """
+            处理命令中特殊字符
+    """
+    str_r = re.sub('\x07','',str_r)   #删除响铃
+    patch_char = re.compile('\x08\x1b\[C')      #删除方向左右一起的按键
+    while patch_char.search(str_r):
+        str_r = patch_char.sub('', str_r.rstrip())
+
+    result_command = ''      #最后的结果
+    pattern_str = ''        #模式中间中的字符串
+    backspace_num = 0              #光标移动的个数
+    reach_backspace_flag = False    #没有检测到光标键则为true
+    end_flag = False
+    while str_r:
+        tmp = re.match(r'\w', str_r)
+        if tmp:
+            if reach_backspace_flag:
+                pattern_str += str(tmp.group(0))
+                str_r = str_r[1:]
+                continue
+            else:
+                result_command += str(tmp.group(0))
+                str_r = str_r[1:]
+                continue
+
+        tmp = re.match(r'\x1b\[K[\x08]*', str_r)
+        if tmp:
+            if backspace_num > 0:
+                if backspace_num > len(result_command) :
+                    result_command += pattern_str
+                    result_command = result_command[0:-backspace_num]
+                else:
+                    result_command = result_command[0:-backspace_num]
+                    result_command += pattern_str
+            del_len = len(str(tmp.group(0)))-3
+            if del_len > 0:
+                result_command = result_command[0:-del_len]
+            reach_backspace_flag = False
+            backspace_num =0
+            pattern_str=''
+            str_r = str_r[len(str(tmp.group(0))):]
+            continue
+        if re.match(r'\x08', str_r):
+            backspace_num += 1
+            reach_backspace_flag = True
+            str_r = str_r[1:]
+            if len(str_r) == 0:
+                end_flag = True
+            continue
+        if reach_backspace_flag :
+            pattern_str += str_r[0]
+        else :
+            result_command += str_r[0]
+        str_r = str_r[1:]
+
+    if backspace_num > 0 and not end_flag:
+        result_command = result_command[:-backspace_num]
+        result_command += pattern_str
+
+
+
+    control_char = re.compile(r"""
+            \x1b[ #%()*+\-.\/]. |
+            \r |                                               #匹配 回车符(CR)
+            (?:\x1b\[|\x9b) [ -?]* [@-~] |                     #匹配 控制顺序描述符(CSI)... Cmd
+            (?:\x1b\]|\x9d) .*? (?:\x1b\\|[\a\x9c]) | \x07 |   #匹配 操作系统指令(OSC)...终止符或振铃符(ST|BEL)
+            (?:\x1b[P^_]|[\x90\x9e\x9f]) .*? (?:\x1b\\|\x9c) | #匹配 设备控制串或私讯或应用程序命令(DCS|PM|APC)...终止符(ST)
+            \x1b.                                              #匹配 转义过后的字符
+            [\x80-\x9f]                                        #匹配 所有控制字符
+            """, re.X)
+    result_command = control_char.sub('', result_command.strip())
+    global VIM_FLAG
+    global VIM_COMMAND
+    if not VIM_FLAG:
+        if result_command.startswith('vim') or result_command.startswith('vi') :
+            VIM_FLAG = True
+            VIM_COMMAND = result_command
+        return result_command.decode('utf8',"ignore")
+    else:
+        if check_vim_status(VIM_COMMAND, ssh):
+            VIM_FLAG = False
+            VIM_COMMAND=''
+            return result_command.decode('utf8',"ignore")
+        else:
+            return ''
+
+def remove_control_char(str_r):
+    """
+    处理日志特殊字符
+    """
+    control_char = re.compile(r"""
+            \x1b[ #%()*+\-.\/]. |
+            \r |                                               #匹配 回车符(CR)
+            (?:\x1b\[|\x9b) [ -?]* [@-~] |                     #匹配 控制顺序描述符(CSI)... Cmd
+            (?:\x1b\]|\x9d) .*? (?:\x1b\\|[\a\x9c]) | \x07 |   #匹配 操作系统指令(OSC)...终止符或振铃符(ST|BEL)
+            (?:\x1b[P^_]|[\x90\x9e\x9f]) .*? (?:\x1b\\|\x9c) | #匹配 设备控制串或私讯或应用程序命令(DCS|PM|APC)...终止符(ST)
+            \x1b.                                              #匹配 转义过后的字符
+            [\x80-\x9f]                                        #匹配 所有控制字符
+            """, re.X)
+    backspace = re.compile(r"[^\b][\b]")
+    line_filtered = control_char.sub('', str_r.rstrip())
+    while backspace.search(line_filtered):
+        line_filtered = backspace.sub('', line_filtered)
+
+    return line_filtered
+
+
+def newline_code_in(strings):
+    for i in ['\r', '\r\n', '\n']:
+        if i in strings:
+            #print "new line"
+            return True
+    return False
+
+
+class Jtty(object):
+    """
+    A virtual tty class
+    一个虚拟终端类，实现连接ssh和记录日志
+    """
+    def __init__(self, username, ip):
+        self.chan = None
+        self.username = username
+        self.ip = ip
+        # self.user = user
+        # self.asset = asset
+
+    @staticmethod
+    def get_win_size():
+        """
+        This function use to get the size of the windows!
+        获得terminal窗口大小
+        """
+        if 'TIOCGWINSZ' in dir(termios):
+            TIOCGWINSZ = termios.TIOCGWINSZ
+        else:
+            TIOCGWINSZ = 1074295912L
+        s = struct.pack('HHHH', 0, 0, 0, 0)
+        x = fcntl.ioctl(sys.stdout.fileno(), TIOCGWINSZ, s)
+        return struct.unpack('HHHH', x)[0:2]
+
+    def set_win_size(self, sig, data):
+        """
+        This function use to set the window size of the terminal!
+        设置terminal窗口大小
+        """
+        try:
+            win_size = self.get_win_size()
+            self.chan.resize_pty(height=win_size[0], width=win_size[1])
+        except Exception:
+            pass
+
+    def log_record(self):
+        """
+        Logging user command and output.
+        记录用户的日志
+        """
+        tty_log_dir = os.path.join(log_dir, 'tty')
+        timestamp_start = int(time.time())
+        date_start = time.strftime('%Y%m%d', time.localtime(timestamp_start))
+        time_start = time.strftime('%H%M%S', time.localtime(timestamp_start))
+        today_connect_log_dir = os.path.join(tty_log_dir, date_start)
+        log_file_path = os.path.join(today_connect_log_dir, '%s_%s_%s' % (self.username, self.ip, time_start))
+        pid = os.getpid()
+        pts = os.popen("ps axu | grep %s | grep -v grep | awk '{ print $7 }'" % pid).read().strip()
+        ip_list = os.popen("who | grep %s | awk '{ print $5 }'" % pts).read().strip('()\n')
+
+        try:
+            is_dir(today_connect_log_dir)
+        except OSError:
+            raise ServerError('Create %s failed, Please modify %s permission.' % (today_connect_log_dir, tty_log_dir))
+
+        try:
+            # log_file_f = open('/opt/jumpserver/logs/tty/20151102/a_b_191034.log', 'a')
+            log_file_f = open(log_file_path + '.log', 'a')
+            log_time_f = open(log_file_path + '.time', 'a')
+        except IOError:
+            raise ServerError('Create logfile failed, Please modify %s permission.' % today_connect_log_dir)
+
+        log = Log(user=self.username, host=self.ip, remote_ip=ip_list,
+                  log_path=log_file_path, start_time=datetime.datetime.now(), pid=pid)
+        log_file_f.write('Start time is %s\n' % datetime.datetime.now())
+        log.save()
+        return log_file_f, log_time_f, ip_list, log
+
+    def posix_shell(self,ssh):
+        """
+        Use paramiko channel connect server interactive.
+        使用paramiko模块的channel，连接后端，进入交互式
+        """
+        log_file_f, log_time_f, ip_list, log = self.log_record()
+        old_tty = termios.tcgetattr(sys.stdin)
+        pre_timestamp = time.time()
+        input_r = ''
+        input_mode = False
+
+        try:
+            tty.setraw(sys.stdin.fileno())
+            tty.setcbreak(sys.stdin.fileno())
+            self.chan.settimeout(0.0)
+
+            while True:
+                try:
+                    r, w, e = select.select([self.chan, sys.stdin], [], [])
+                except Exception:
+                    pass
+
+                if self.chan in r:
+                    try:
+                        x = self.chan.recv(1024)
+                        if len(x) == 0:
+                            break
+                        sys.stdout.write(x)
+                        sys.stdout.flush()
+                        log_file_f.write(x)
+                        now_timestamp = time.time()
+                        log_time_f.write('%s %s\n' % (round(now_timestamp-pre_timestamp, 4), len(x)))
+                        pre_timestamp = now_timestamp
+                        log_file_f.flush()
+                        log_time_f.flush()
+
+                        if input_mode and not newline_code_in(x):
+                            input_r += x
+
+                    except socket.timeout:
+                        pass
+
+                if sys.stdin in r:
+                    x = os.read(sys.stdin.fileno(), 1)
+                    if not input_mode:
+                        input_mode = True
+
+                    if str(x) in ['\r', '\n', '\r\n']:
+                        input_r = deal_command(input_r,ssh)
+                        TtyLog(log=log, datetime=datetime.datetime.now(), cmd=input_r).save()
+                        input_r = ''
+                        input_mode = False
+
+                    if len(x) == 0:
+                        break
+                    self.chan.send(x)
+
+        finally:
+            termios.tcsetattr(sys.stdin, termios.TCSADRAIN, old_tty)
+            log_file_f.write('End time is %s' % datetime.datetime.now())
+            log_file_f.close()
+            log.is_finished = True
+            log.end_time = datetime.datetime.now()
+            log.save()
+
+    def get_connect_item(self):
+        """
+        get args for connect: ip, port, username, passwd
+        获取连接需要的参数，也就是服务ip, 端口, 用户账号和密码
+        """
+        # if not self.asset.is_active:
+        #     raise ServerError('该主机被禁用 Host %s is not active.' % self.ip)
+        #
+        # if not self.user.is_active:
+        #     raise ServerError('该用户被禁用 User %s is not active.' % self.username)
+
+        # password = CRYPTOR.decrypt(self.])
+        # return self.username, password, self.ip, int(self.asset.port)
+        return 'root', 'redhat', '127.0.0.1', 22
+
+    def get_connection(self):
+        """
+        Get the ssh connection for reuse
+        获取连接套接字
+        """
+        username, password, ip, port = self.get_connect_item()
+        logger.debug("username: %s, password: %s, ip: %s, port: %s" % (username, password, ip, port))
+
+        # 发起ssh连接请求 Make a ssh connection
+        ssh = paramiko.SSHClient()
+        ssh.load_system_host_keys()
+        ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+        try:
+            ssh.connect(ip, port=port, username=username, password=password)
+        except paramiko.ssh_exception.AuthenticationException, paramiko.ssh_exception.SSHException:
+            raise ServerError('认证错误 Authentication Error.')
+        except socket.error:
+            raise ServerError('端口可能不对 Connect SSH Socket Port Error, Please Correct it.')
+        else:
+            return ssh
+
+    def connect(self):
+        """
+        Connect server.
+        连接服务器
+        """
+        ps1 = "PS1='[\u@%s \W]\$ '\n" % self.ip
+        login_msg = "clear;echo -e '\\033[32mLogin %s done. Enjoy it.\\033[0m'\n" % self.ip
+
+        # 发起ssh连接请求 Make a ssh connection
+        ssh = self.get_connection()
+
+        # 获取连接的隧道并设置窗口大小 Make a channel and set windows size
+        global channel
+        win_size = self.get_win_size()
+        self.chan = channel = ssh.invoke_shell(height=win_size[0], width=win_size[1])
+        try:
+            signal.signal(signal.SIGWINCH, self.set_win_size)
+        except:
+            pass
+
+        # 设置PS1并提示 Set PS1 and msg it
+        #channel.send(ps1)
+        #channel.send(login_msg)
+        channel.send('echo ${SSH_TTY}\n')
+        global SSH_TTY
+        while not channel.recv_ready():
+            time.sleep(1)
+        tmp = channel.recv(1024)
+        #print 'ok'+tmp+'ok'
+        # SSH_TTY  = re.search(r'(?<=/dev/).*', tmp).group().strip()
+        SSH_TTY = ''
+        channel.send('clear\n')
+        # Make ssh interactive tunnel
+        self.posix_shell(ssh)
+
+        # Shutdown channel socket
+        channel.close()
+        ssh.close()
+
+    def execute(self, cmd):
+        """
+        execute cmd on the asset
+        执行命令
+        """
+        pass
+
+
 def print_prompt():
     """
     Print prompt
@@ -98,76 +464,6 @@ def print_prompt():
     print textwrap.dedent(msg)
 
 
-# def remote_exec_cmd(ip, port, username, password, cmd):
-#     try:
-#         time.sleep(5)
-#         ssh = paramiko.SSHClient()
-#         ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-#         ssh.connect(ip, port, username, password, timeout=5)
-#         stdin, stdout, stderr = ssh.exec_command("bash -l -c '%s'" % cmd)
-#         out = stdout.readlines()
-#         err = stderr.readlines()
-#         color_print('%s:' % ip, 'blue')
-#         for i in out:
-#             color_print(" " * 4 + i.strip(), 'green')
-#         for j in err:
-#             color_print(" " * 4 + j.strip(), 'red')
-#         ssh.close()
-#     except Exception as e:
-#         color_print(ip + ':', 'blue')
-#         color_print(str(e), 'red')
-
-
-# def multi_remote_exec_cmd(hosts, username, cmd):
-#     pool = Pool(processes=5)
-#     for host in hosts:
-#         username, password, ip, port = get_connect_item(username, host)
-#         pool.apply_async(remote_exec_cmd, (ip, port, username, password, cmd))
-#     pool.close()
-#     pool.join()
-
-
-# def exec_cmd_servers(username):
-#     color_print("You can choose in the following IP(s), Use glob or ips split by comma. q/Q to PreLayer.", 'green')
-#     user.get_asset_info(printable=True)
-#     while True:
-#         hosts = []
-#         inputs = raw_input('\033[1;32mip(s)>: \033[0m')
-#         if inputs in ['q', 'Q']:
-#             break
-#         get_hosts = login_user.get_asset_info().keys()
-#
-#         if ',' in inputs:
-#             ips_input = inputs.split(',')
-#             for host in ips_input:
-#                 if host in get_hosts:
-#                     hosts.append(host)
-#         else:
-#             for host in get_hosts:
-#                 if fnmatch.fnmatch(host, inputs):
-#                     hosts.append(host.strip())
-#
-#         if len(hosts) == 0:
-#             color_print("Check again, Not matched any ip!", 'red')
-#             continue
-#         else:
-#             print "You matched ip: %s" % hosts
-#         color_print("Input the Command , The command will be Execute on servers, q/Q to quit.", 'green')
-#         while True:
-#             cmd = raw_input('\033[1;32mCmd(s): \033[0m')
-#             if cmd in ['q', 'Q']:
-#                 break
-#             exec_log_dir = os.path.join(log_dir, 'exec_cmds')
-#             if not os.path.isdir(exec_log_dir):
-#                 os.mkdir(exec_log_dir)
-#                 os.chmod(exec_log_dir, 0777)
-#             filename = "%s/%s.log" % (exec_log_dir, time.strftime('%Y%m%d'))
-#             f = open(filename, 'a')
-#             f.write("DateTime: %s User: %s Host: %s Cmds: %s\n" %
-#                     (time.strftime('%Y/%m/%d %H:%M:%S'), username, hosts, cmd))
-#             multi_remote_exec_cmd(hosts, username, cmd)
-
-
 def main():
     """
     he he

jasset/models.py

@@ -1,6 +1,6 @@
 import datetime
 from django.db import models
-from juser.models import User, UserGroup
+# from juser.models import User, UserGroup
 
 
 class AssetGroup(models.Model):
@@ -14,48 +14,48 @@ class AssetGroup(models.Model):
     def __unicode__(self):
         return self.name
 
-    def get_asset(self):
-        return self.asset_set.all()
-
-    def get_asset_info(self, printable=False):
-        assets = self.get_asset()
-        ip_comment = {}
-        for asset in assets:
-            ip_comment[asset.ip] = asset.comment
-
-        for ip in sorted(ip_comment):
-            if ip_comment[ip]:
-                print '%-15s -- %s' % (ip, ip_comment[ip])
-            else:
-                print '%-15s' % ip
-        print ''
-
-    def get_asset_num(self):
-        return len(self.get_asset())
-
-    def get_user_group(self):
-        perm_list = self.perm_set.all()
-        user_group_list = []
-        for perm in perm_list:
-            user_group_list.append(perm.user_group)
-        return user_group_list
-
-    def get_user(self):
-        user_list = []
-        user_group_list = self.get_user_group()
-        for user_group in user_group_list:
-            user_list.extend(user_group.user_set.all())
-        return user_list
-
-    def is_permed(self, user=None, user_group=None):
-        if user:
-            if user in self.get_user():
-                return True
-
-        if user_group:
-            if user_group in self.get_user_group():
-                return True
-        return False
+    # def get_asset(self):
+    #     return self.asset_set.all()
+    #
+    # def get_asset_info(self, printable=False):
+    #     assets = self.get_asset()
+    #     ip_comment = {}
+    #     for asset in assets:
+    #         ip_comment[asset.ip] = asset.comment
+    #
+    #     for ip in sorted(ip_comment):
+    #         if ip_comment[ip]:
+    #             print '%-15s -- %s' % (ip, ip_comment[ip])
+    #         else:
+    #             print '%-15s' % ip
+    #     print ''
+    #
+    # def get_asset_num(self):
+    #     return len(self.get_asset())
+    #
+    # def get_user_group(self):
+    #     perm_list = self.perm_set.all()
+    #     user_group_list = []
+    #     for perm in perm_list:
+    #         user_group_list.append(perm.user_group)
+    #     return user_group_list
+    #
+    # def get_user(self):
+    #     user_list = []
+    #     user_group_list = self.get_user_group()
+    #     for user_group in user_group_list:
+    #         user_list.extend(user_group.user_set.all())
+    #     return user_list
+    #
+    # def is_permed(self, user=None, user_group=None):
+    #     if user:
+    #         if user in self.get_user():
+    #             return True
+    #
+    #     if user_group:
+    #         if user_group in self.get_user_group():
+    #             return True
+    #     return False
 
 
 class Asset(models.Model):
@@ -72,27 +72,28 @@ class Asset(models.Model):
     def __unicode__(self):
         return self.ip
 
-    def get_user(self):
-        perm_list = []
-        asset_group_all = self.bis_group.all()
-        for asset_group in asset_group_all:
-            perm_list.extend(asset_group.perm_set.all())
-
-        user_group_list = []
-        for perm in perm_list:
-            user_group_list.append(perm.user_group)
-
-        user_permed_list = []
-        for user_group in user_group_list:
-            user_permed_list.extend(user_group.user_set.all())
-        user_permed_list = list(set(user_permed_list))
-        return user_permed_list
+    # def get_user(self):
+    #     perm_list = []
+    #     asset_group_all = self.bis_group.all()
+    #     for asset_group in asset_group_all:
+    #         perm_list.extend(asset_group.perm_set.all())
+    #
+    #     user_group_list = []
+    #     for perm in perm_list:
+    #         user_group_list.append(perm.user_group)
+    #
+    #     user_permed_list = []
+    #     for user_group in user_group_list:
+    #         user_permed_list.extend(user_group.user_set.all())
+    #     user_permed_list = list(set(user_permed_list))
+    #     return user_permed_list
 
 
 class AssetAlias(models.Model):
-    user = models.ForeignKey(User)
-    asset = models.ForeignKey(Asset)
-    alias = models.CharField(max_length=100, blank=True, null=True)
-
-    def __unicode__(self):
-        return self.alias
+    pass
+#     user = models.ForeignKey(User)
+#     asset = models.ForeignKey(Asset)
+#     alias = models.CharField(max_length=100, blank=True, null=True)
+#
+#     def __unicode__(self):
+#         return self.alias

jasset/views.py

@@ -87,18 +87,19 @@ def asset_add(request):
     asset_group_all = AssetGroup.objects.all()
     if request.method == 'POST':
         ip = request.POST.get('ip')
-        port = request.POST.get('port')
         groups = request.POST.getlist('groups')
-        use_default_auth = True if request.POST.getlist('use_default_auth', []) else False
+        use_default = True if request.POST.getlist('use_default', []) else False
         is_active = True if request.POST.get('is_active') else False
         comment = request.POST.get('comment')
 
-        if not use_default_auth:
+        if not use_default:
             username = request.POST.get('username')
             password = request.POST.get('password')
+            port = request.POST.get('port')
             password_encode = CRYPTOR.encrypt(password)
         else:
             username = None
+            port = None
             password_encode = None
 
         try:
@@ -110,126 +111,13 @@ def asset_add(request):
             pass
         else:
             db_asset_add(
-                ip=ip, port=port, use_default_auth=use_default_auth, is_active=is_active, comment=comment,
+                ip=ip, port=port, use_default=use_default, is_active=is_active, comment=comment,
                 groups=groups, username=username, password=password_encode
             )
 
             msg = u'主机 %s 添加成功' % ip
 
     return my_render('jasset/asset_add.html', locals(), request)
-#
-#
-# @require_admin
-# def host_add_batch(request):
-#     """ 批量添加主机 """
-#     header_title, path1, path2 = u'批量添加主机', u'资产管理', u'批量添加主机'
-#     login_types = {'LDAP': 'L', 'MAP': 'M'}
-#     active_types = {'激活': 1, '禁用': 0}
-#     dept_id = get_user_dept(request)
-#     if request.method == 'POST':
-#         multi_hosts = request.POST.get('j_multi').split('\n')
-#         for host in multi_hosts:
-#             if host == '':
-#                 break
-#             j_ip, j_port, j_type, j_idc, j_groups, j_depts, j_active, j_comment = host.split()
-#             j_active = active_types[str(j_active)]
-#             j_group = ast.literal_eval(j_groups)
-#             j_dept = ast.literal_eval(j_depts)
-#
-#             if j_type not in ['LDAP', 'MAP']:
-#                 return httperror(request, u'没有%s这种登录方式!' %j_type)
-#
-#             j_type = login_types[j_type]
-#             idc = IDC.objects.filter(name=j_idc)
-#             if idc:
-#                 j_idc = idc[0].id
-#             else:
-#                 return httperror(request, '添加失败, 没有%s这个IDC' % j_idc)
-#
-#             group_ids, dept_ids = [], []
-#             for group_name in j_group:
-#                 group = BisGroup.objects.filter(name=group_name)
-#                 if group:
-#                     group_id = group[0].id
-#                 else:
-#                     return httperror(request, '添加失败, 没有%s这个主机组' % group_name)
-#                 group_ids.append(group_id)
-#
-#             for dept_name in j_dept:
-#                 dept = DEPT.objects.filter(name=dept_name)
-#                 if dept:
-#                     dept_id = dept[0].id
-#                 else:
-#                     return httperror(request, '添加失败, 没有%s这个部门' % dept_name)
-#                 dept_ids.append(dept_id)
-#
-#             if is_group_admin(request) and not validate(request, asset_group=group_ids, edept=dept_ids):
-#                 return httperror(request, '添加失败, 没有%s这个主机组' % group_name)
-#
-#             if Asset.objects.filter(ip=str(j_ip)):
-#                 return httperror(request, '添加失败, 改IP%s已存在' % j_ip)
-#
-#             host_info = [j_ip, j_port, j_idc, j_type, group_ids, dept_ids, j_active, j_comment]
-#             db_host_insert(host_info)
-#
-#         smg = u'批量添加添加成功'
-#         return my_render('jasset/host_add_multi.html', locals(), request)
-#
-#     return my_render('jasset/host_add_multi.html', locals(), request)
-#
-#
-# @require_admin
-# def host_edit_batch(request):
-#     """ 批量修改主机 """
-#     if request.method == 'POST':
-#         len_table = request.POST.get('len_table')
-#         for i in range(int(len_table)):
-#             j_id = "editable[" + str(i) + "][j_id]"
-#             j_ip = "editable[" + str(i) + "][j_ip]"
-#             j_port = "editable[" + str(i) + "][j_port]"
-#             j_dept = "editable[" + str(i) + "][j_dept]"
-#             j_idc = "editable[" + str(i) + "][j_idc]"
-#             j_type = "editable[" + str(i) + "][j_type]"
-#             j_group = "editable[" + str(i) + "][j_group]"
-#             j_active = "editable[" + str(i) + "][j_active]"
-#             j_comment = "editable[" + str(i) + "][j_comment]"
-#
-#             j_id = request.POST.get(j_id).strip()
-#             j_ip = request.POST.get(j_ip).strip()
-#             j_port = request.POST.get(j_port).strip()
-#             j_dept = request.POST.getlist(j_dept)
-#             j_idc = request.POST.get(j_idc).strip()
-#             j_type = request.POST.get(j_type).strip()
-#             j_group = request.POST.getlist(j_group)
-#             j_active = request.POST.get(j_active).strip()
-#             j_comment = request.POST.get(j_comment).strip()
-#
-#             host_info = [j_id, j_ip, j_idc, j_port, j_type, j_group, j_dept, j_active, j_comment]
-#             batch_host_edit(host_info)
-#
-#         return HttpResponseRedirect('/jasset/host_list/')
-#
-#
-# @require_role(role='user')
-# def host_edit_common_batch(request):
-#     """ 普通用户批量修改主机别名 """
-#     u = get_session_user_info(request)[2]
-#     if request.method == 'POST':
-#         len_table = request.POST.get('len_table')
-#         for i in range(int(len_table)):
-#             j_id = "editable[" + str(i) + "][j_id]"
-#             j_alias = "editable[" + str(i) + "][j_alias]"
-#             j_id = request.POST.get(j_id, '').strip()
-#             j_alias = request.POST.get(j_alias, '').strip()
-#             a = Asset.objects.get(id=j_id)
-#             asset_alias = AssetAlias.objects.filter(user=u, host=a)
-#             if asset_alias:
-#                 asset_alias = asset_alias[0]
-#                 asset_alias.alias = j_alias
-#                 asset_alias.save()
-#             else:
-#                 AssetAlias.objects.create(user=u, host=a, alias=j_alias)
-#     return my_render('jasset/host_list_common.html', locals(), request)
 
 
 @require_role(role='user')
@@ -277,15 +165,15 @@ def asset_edit(request):
 
     if request.method == 'POST':
         ip = request.POST.get('ip')
-        port = request.POST.get('port')
         groups = request.POST.getlist('groups')
-        use_default_auth = True if request.POST.getlist('use_default_auth', []) else False
+        use_default = True if request.POST.getlist('use_default', []) else False
         is_active = True if request.POST.get('is_active') else False
         comment = request.POST.get('comment')
 
-        if not use_default_auth:
+        if not use_default:
             username = request.POST.get('username')
             password = request.POST.get('password')
+            port = request.POST.get('port')
             if password == asset.password:
                 password_encode = password
             else:
@@ -293,6 +181,7 @@ def asset_edit(request):
         else:
             username = None
             password_encode = None
+            port = 22
 
         try:
             asset_test = get_object(Asset, ip=ip)
@@ -302,7 +191,7 @@ def asset_edit(request):
         except ServerError:
             pass
         else:
-            db_asset_update(id=asset_id, ip=ip, port=port, use_default_auth=use_default_auth,
+            db_asset_update(id=asset_id, ip=ip, port=port, use_default=use_default,
                             username=username, password=password_encode,
                             is_active=is_active, comment=comment)
             msg = u'主机 %s 修改成功' % ip
@@ -311,53 +200,6 @@ def asset_edit(request):
     return my_render('jasset/asset_edit.html', locals(), request)
 
 
-# @require_role(role='admin')
-# def host_edit_adm(request):
-#     """ 部门管理员修改主机 """
-#     header_title, path1, path2 = u'修改主机', u'资产管理', u'修改主机'
-#     actives = {1: u'激活', 0: u'禁用'}
-#     login_types = {'L': 'LDAP', 'M': 'MAP'}
-#     eidc = IDC.objects.all()
-#     dept = get_session_user_info(request)[5]
-#     egroup = BisGroup.objects.exclude(name='ALL').filter(dept=dept)
-#     host_id = request.GET.get('id', '')
-#     post = Asset.objects.filter(id=int(host_id))
-#     if post:
-#         post = post[0]
-#     else:
-#         return httperror(request, '没有此主机!')
-#
-#     e_group = post.bis_group.all()
-#
-#     if request.method == 'POST':
-#         j_ip = request.POST.get('j_ip')
-#         j_idc = request.POST.get('j_idc')
-#         j_port = request.POST.get('j_port')
-#         j_type = request.POST.get('j_type')
-#         j_dept = request.POST.getlist('j_dept')
-#         j_group = request.POST.getlist('j_group')
-#         j_active = request.POST.get('j_active')
-#         j_comment = request.POST.get('j_comment')
-#
-#         host_info = [j_ip, j_port, j_idc, j_type, j_group, j_dept, j_active, j_comment]
-#
-#         if not validate(request, asset_group=j_group, edept=j_dept):
-#             emg = u'修改失败,您无权操作!'
-#             return my_render('jasset/asset_edit.html', locals(), request)
-#
-#         if j_type == 'M':
-#             j_user = request.POST.get('j_user')
-#             j_password = request.POST.get('j_password')
-#             db_host_update(host_info, j_user, j_password, post)
-#         else:
-#             db_host_update(host_info, post)
-#
-#         smg = u'主机 %s 修改成功' % j_ip
-#         return HttpResponseRedirect('/jasset/host_detail/?id=%s' % host_id)
-#
-#     return my_render('jasset/asset_edit.html', locals(), request)
-
-
 @require_role('admin')
 def asset_detail(request):
     """ 主机详情 """
@@ -368,146 +210,3 @@ def asset_detail(request):
     return my_render('jasset/asset_detail.html', locals(), request)
 
 
-
-
-#
-#
-# @require_admin
-# def group_edit(request):
-#     """ 修改主机组 """
-#     header_title, path1, path2 = u'编辑主机组', u'资产管理', u'编辑主机组'
-#     group_id = request.GET.get('id', '')
-#     group = BisGroup.objects.filter(id=group_id)
-#     if group:
-#         group = group[0]
-#     else:
-#         httperror(request, u'没有这个主机组!')
-#
-#     host_all = Asset.objects.all()
-#     dept_id = get_session_user_info(request)[3]
-#     eposts = Asset.objects.filter(bis_group=group)
-#
-#     if is_group_admin(request) and not validate(request, asset_group=[group_id]):
-#         return httperror(request, '编辑失败, 您无权操作!')
-#     dept = DEPT.objects.filter(id=group.dept.id)
-#     if dept:
-#         dept = dept[0]
-#     else:
-#         return httperror(request, u'没有这个部门!')
-#
-#     all_dept = dept.asset_set.all()
-#     posts = [g for g in all_dept if g not in eposts]
-#
-#     if request.method == 'POST':
-#         j_group = request.POST.get('j_group', '')
-#         j_hosts = request.POST.getlist('j_hosts', '')
-#         j_dept = request.POST.get('j_dept', '')
-#         j_comment = request.POST.get('j_comment', '')
-#
-#         j_dept = DEPT.objects.filter(id=int(j_dept))
-#         j_dept = j_dept[0]
-#
-#         group.asset_set.clear()
-#         for host in j_hosts:
-#             g = Asset.objects.get(id=host)
-#             group.asset_set.add(g)
-#         BisGroup.objects.filter(id=group_id).update(name=j_group, dept=j_dept, comment=j_comment)
-#         smg = u'主机组%s修改成功' % j_group
-#         return HttpResponseRedirect('/jasset/group_list')
-#
-#     return my_render('jasset/group_edit.html', locals(), request)
-#
-#
-# @require_admin
-# def group_detail(request):
-#     """ 主机组详情 """
-#     header_title, path1, path2 = u'主机组详情', u'资产管理', u'主机组详情'
-#     login_types = {'L': 'LDAP', 'M': 'MAP'}
-#     dept = get_session_user_info(request)[5]
-#     group_id = request.GET.get('id', '')
-#     group = BisGroup.objects.get(id=group_id)
-#     if is_super_user(request):
-#         posts = Asset.objects.filter(bis_group=group).order_by('ip')
-#
-#     elif is_group_admin(request):
-#         if not validate(request, asset_group=[group_id]):
-#             return httperror(request, u'您无权查看!')
-#         posts = Asset.objects.filter(bis_group=group).filter(dept=dept).order_by('ip')
-#
-#     contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
-#     return my_render('jasset/group_detail.html', locals(), request)
-#
-#
-# @require_admin
-# def group_del_host(request):
-#     """ 主机组中剔除主机, 并不删除真实主机 """
-#     if request.method == 'POST':
-#         group_id = request.POST.get('group_id')
-#         offset = request.GET.get('id', '')
-#         group = BisGroup.objects.get(id=group_id)
-#         if offset == 'group':
-#             len_list = request.POST.get("len_list")
-#             for i in range(int(len_list)):
-#                 key = "id_list[" + str(i) + "]"
-#                 jid = request.POST.get(key)
-#                 g = Asset.objects.get(id=jid)
-#                 group.asset_set.remove(g)
-#
-#     else:
-#         offset = request.GET.get('id', '')
-#         group_id = request.GET.get('gid', '')
-#         group = BisGroup.objects.get(id=group_id)
-#         g = Asset.objects.get(id=offset)
-#         group.asset_set.remove(g)
-#
-#     return HttpResponseRedirect('/jasset/group_detail/?id=%s' % group.id)
-#
-
-# @require_admin
-# def dept_host_ajax(request):
-#     """ 添加主机组时, 部门联动主机异步 """
-#     dept_id = request.GET.get('id', '')
-#     if dept_id not in ['1', '2']:
-#         dept = DEPT.objects.filter(id=dept_id)
-#         if dept:
-#             dept = dept[0]
-#             hosts = dept.asset_set.all()
-#     else:
-#         hosts = Asset.objects.all()
-#
-#     return my_render('jasset/dept_host_ajax.html', locals(), request)
-#
-#
-# def show_all_ajax(request):
-#     """ 批量修改主机时, 部门和组全部显示 """
-#     env = request.GET.get('env', '')
-#     get_id = request.GET.get('id', '')
-#     host = Asset.objects.filter(id=get_id)
-#     if host:
-#         host = host[0]
-#     return my_render('jasset/show_all_ajax.html', locals(), request)
-#
-#
-# @require_login
-# def host_search(request):
-#     """ 搜索主机 """
-#     keyword = request.GET.get('keyword')
-#     login_types = {'L': 'LDAP', 'M': 'MAP'}
-#     dept = get_session_user_info(request)[5]
-#     post_all = Asset.objects.filter(Q(ip__contains=keyword) |
-#                                     Q(idc__name__contains=keyword) |
-#                                     Q(bis_group__name__contains=keyword) |
-#                                     Q(comment__contains=keyword)).distinct().order_by('ip')
-#     if is_super_user(request):
-#         posts = post_all
-#
-#     elif is_group_admin(request):
-#         posts = post_all.filter(dept=dept)
-#
-#     elif is_common_user(request):
-#         user_id, username = get_session_user_info(request)[0:2]
-#         post_perm = user_perm_asset_api(username)
-#         posts = list(set(post_all) & set(post_perm))
-#     contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
-#
-#     return my_render('jasset/host_search.html', locals(), request)

jlog/log_api.py

@@ -0,0 +1,68 @@
+# coding: utf-8
+
+
+from argparse import ArgumentParser, FileType
+from contextlib import closing
+from codecs import open as copen
+from json import dumps
+from math import ceil
+from os.path import basename, dirname, exists, join
+from struct import unpack
+from subprocess import Popen
+from sys import platform, prefix, stderr
+from tempfile import NamedTemporaryFile
+
+from jinja2 import FileSystemLoader, Template
+from jinja2.environment import Environment
+
+from jumpserver.api import BASE_DIR
+
+
+DEFAULT_TEMPLATE = join(BASE_DIR, 'templates', 'jlog', 'static.jinja2')
+
+
+def escapeString(string):
+    string = string.encode('unicode_escape').decode('utf-8')
+    string = string.replace("'", "\\'")
+    string = '\'' + string + '\''
+    return string
+
+
+def getTiming(timef):
+    timing = None
+    with closing(timef):
+        timing = [l.strip().split(' ') for l in timef]
+        timing = [(int(ceil(float(r[0]) * 1000)), int(r[1])) for r in timing]
+    return timing
+
+
+def scriptToJSON(scriptf, timing=None):
+    ret = []
+
+    with closing(scriptf):
+        scriptf.readline()  # ignore first header line from script file
+        offset = 0
+        for t in timing:
+            data = escapeString(scriptf.read(t[1]))
+            offset += t[0]
+            ret.append((data, offset))
+    return dumps(ret)
+
+
+def renderTemplate(script_path, time_file_path, dimensions=(24, 80), templatename=DEFAULT_TEMPLATE):
+    with copen(script_path, encoding='utf-8', errors='replace') as scriptf:
+        with open(time_file_path) as timef:
+            timing = getTiming(timef)
+            json = scriptToJSON(scriptf, timing)
+
+    fsl = FileSystemLoader(dirname(templatename), 'utf-8')
+    e = Environment()
+    e.loader = fsl
+
+    templatename = basename(templatename)
+    rendered = e.get_template(templatename).render(json=json,
+                                                   dimensions=dimensions)
+
+    return rendered
+
+

jlog/models.py

@@ -5,12 +5,10 @@ class Log(models.Model):
     user = models.CharField(max_length=20, null=True)
     host = models.CharField(max_length=20, null=True)
     remote_ip = models.CharField(max_length=100)
-    dept_name = models.CharField(max_length=20)
     log_path = models.CharField(max_length=100)
     start_time = models.DateTimeField(null=True)
     pid = models.IntegerField()
     is_finished = models.BooleanField(default=False)
-    handle_finished = models.BooleanField(default=False)
     end_time = models.DateTimeField(null=True)
 
     def __unicode__(self):
@@ -20,4 +18,11 @@ class Log(models.Model):
 class Alert(models.Model):
     msg = models.CharField(max_length=20)
     time = models.DateTimeField(null=True)
-    is_finished = models.BigIntegerField(default=False)
+    is_finished = models.BigIntegerField(default=False)
+
+
+class TtyLog(models.Model):
+    log = models.ForeignKey(Log)
+    datetime = models.DateTimeField()
+    cmd = models.CharField(max_length=200)
+

jlog/urls.py

@@ -3,9 +3,10 @@ from django.conf.urls import patterns, include, url
 from jlog.views import *
 
 urlpatterns = patterns('',
-    url(r'^$', log_list),
-    url(r'^log_list/(\w+)/$', log_list),
-    url(r'^log_kill/', log_kill),
-    url(r'^history/$', log_history),
-    url(r'^search/$', log_search),
-)
+                       url(r'^$', log_list),
+                       url(r'^log_list/(\w+)/$', log_list),
+                       url(r'^history/$', log_history),
+                       url(r'^log_kill/', log_kill),
+                       url(r'^record/$', log_record),
+                       url(r'^web_terminal/$', web_terminal),
+                      )

jlog/views.py

@@ -4,75 +4,61 @@ from django.template import RequestContext
 from django.shortcuts import render_to_response
 
 from jumpserver.api import *
-from jasset.views import httperror
 from django.http import HttpResponseNotFound
+from jlog.log_api import renderTemplate
+
 from models import Log
 from jumpserver.settings import web_socket_host
 
-def get_user_info(request, offset):
-    """ 获取用户信息及环境 """
-    env_dic = {'online': 0, 'offline': 1}
-    env = env_dic[offset]
-    keyword = request.GET.get('keyword', '')
-    user_info = get_session_user_info(request)
-    user_id, username = user_info[0:2]
-    dept_id, dept_name = user_info[3:5]
-    ret = [request, keyword, env, username, dept_name]
 
-    return ret
-
-
-def get_user_log(ret_list):
-    """ 获取不同类型用户日志记录 """
-    request, keyword, env, username, dept_name = ret_list
-    post_all = Log.objects.filter(is_finished=env).order_by('-start_time')
-    post_keyword_all = Log.objects.filter(Q(user__contains=keyword) |
-                                          Q(host__contains=keyword)) \
-        .filter(is_finished=env).order_by('-start_time')
-
-    if is_super_user(request):
-        if keyword:
-            posts = post_keyword_all
-        else:
-            posts = post_all
-
-    elif is_group_admin(request):
-        if keyword:
-            posts = post_keyword_all.filter(dept_name=dept_name)
-        else:
-            posts = post_all.filter(dept_name=dept_name)
-
-    elif is_common_user(request):
-        if keyword:
-            posts = post_keyword_all.filter(user=username)
-        else:
-            posts = post_all.filter(user=username)
-
-    return posts
-
-
-@require_login
+@require_role('admin')
 def log_list(request, offset):
     """ 显示日志 """
-    header_title, path1, path2 = u'查看日志', u'查看日志', u'在线用户'
-    keyword = request.GET.get('keyword', '')
-    posts = get_user_log(get_user_info(request, offset))
+    header_title, path1 = u'审计', u'操作审计'
+    date_seven_day = request.GET.get('start', '')
+    date_now_str = request.GET.get('end', '')
+    username_list = request.GET.getlist('username', [])
+    host_list = request.GET.getlist('host', [])
+    cmd = request.GET.get('cmd', '')
+    print date_seven_day, date_now_str
+    if offset == 'online':
+        posts = Log.objects.filter(is_finished=False).order_by('-start_time')
+    else:
+        posts = Log.objects.filter(is_finished=True).order_by('-start_time')
+        username_all = set([log.user for log in Log.objects.all()])
+        ip_all = set([log.host for log in Log.objects.all()])
+
+        if date_seven_day and date_now_str:
+            datetime_start = datetime.datetime.strptime(date_seven_day + ' 00:00:01', '%m/%d/%Y %H:%M:%S')
+            datetime_end = datetime.datetime.strptime(date_now_str + ' 23:59:59', '%m/%d/%Y %H:%M:%S')
+            posts = posts.filter(start_time__gte=datetime_start).filter(start_time__lte=datetime_end)
+
+        if username_list:
+            posts = posts.filter(user__in=username_list)
+
+        if host_list:
+            posts = posts.filter(host__in=host_list)
+        if cmd:
+            log_id_list = set([log.log_id for log in TtyLog.objects.filter(cmd__contains=cmd)])
+            posts = posts.filter(id__in=log_id_list)
+        else:
+            date_now = datetime.datetime.now()
+            date_now_str = date_now.strftime('%m/%d/%Y')
+            date_seven_day = (date_now + datetime.timedelta(days=-7)).strftime('%m/%d/%Y')
+
     contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
 
+    web_monitor_uri = '%s/monitor' % web_socket_host
     return render_to_response('jlog/log_%s.html' % offset, locals(), context_instance=RequestContext(request))
 
 
-@require_admin
+@require_role('admin')
 def log_kill(request):
     """ 杀掉connect进程 """
     pid = request.GET.get('id', '')
     log = Log.objects.filter(pid=pid)
     if log:
         log = log[0]
-        dept_name = log.dept_name
-        deptname = get_session_user_info(request)[4]
-        if is_group_admin(request) and dept_name != deptname:
-            return httperror(request, u'Kill失败, 您无权操作!')
         try:
             os.kill(int(pid), 9)
         except OSError:
@@ -83,35 +69,40 @@ def log_kill(request):
         return HttpResponseNotFound(u'没有此进程!')
 
 
-@require_login
+@require_role('admin')
 def log_history(request):
     """ 命令历史记录 """
+    log_id = request.GET.get('id', 0)
+    log = Log.objects.filter(id=log_id)
+    if log:
+        log = log[0]
+        tty_logs = log.ttylog_set.all()
+
+        if tty_logs:
+            content = ''
+            for tty_log in tty_logs:
+                content += '%s: %s\n' % (tty_log.datetime.strftime('%Y-%m-%d %H:%M:%S'), tty_log.cmd)
+            return HttpResponse(content)
+
+    return HttpResponse('无日志记录, 请查看日志处理脚本是否开启!')
+
+
+@require_role('admin')
+def log_record(request):
     log_id = request.GET.get('id', 0)
     log = Log.objects.filter(id=int(log_id))
     if log:
         log = log[0]
-        dept_name = log.dept_name
-        deptname = get_session_user_info(request)[4]
-        if is_group_admin(request) and dept_name != deptname:
-            return httperror(request, '查看失败, 您无权查看!')
-
-        elif is_common_user(request):
-            return httperror(request, '查看失败, 您无权查看!')
-
-        log_his = "%s.his" % log.log_path
-        if os.path.isfile(log_his):
-            f = open(log_his)
-            content = f.read()
+        log_file = log.log_path + '.log'
+        log_time = log.log_path + '.time'
+        if os.path.isfile(log_file) and os.path.isfile(log_time):
+            content = renderTemplate(log_file, log_time)
             return HttpResponse(content)
         else:
-            return httperror(request, '无日志记录, 请查看日志处理脚本是否开启!')
+            return HttpResponse('无日志记录, 请查看日志处理脚本是否开启!')
 
 
-@require_login
-def log_search(request):
-    """ 日志搜索 """
-    offset = request.GET.get('env', '')
-    keyword = request.GET.get('keyword', '')
-    posts = get_user_log(get_user_info(request, offset))
-    contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
-    return render_to_response('jlog/log_search.html', locals(), context_instance=RequestContext(request))
+def web_terminal(request):
+    web_terminal_uri = '%s/terminal' % web_socket_host
+    return render_to_response('jlog/web_terminal.html', locals())
+

jperm/models.py

@@ -5,56 +5,17 @@ from juser.models import User, UserGroup
 from jasset.models import Asset, AssetGroup
 
 
-class UserPerm(models.Model):
-    user = models.ForeignKey(User)
-    asset = models.ForeignKey(Asset, null=True)
-    asset_group = models.ForeignKey(AssetGroup, null=True)
-
-    def __unicode__(self):
-        return self.user.name
+class PermLog(models.Model):
+    datetime = models.DateTimeField(auto_now_add=True)
+    action = models.CharField(max_length=100, null=True, blank=True, default='')
+    results = models.CharField(max_length=1000, null=True, blank=True, default='')
+    is_success = models.BooleanField(default=False)
+    is_finish = models.BooleanField(default=False)
 
 
-class GroupPerm(models.Model):
-    user_group = models.ForeignKey(UserGroup)
-    asset = models.ForeignKey(Asset, null=True)
-    asset_group = models.ForeignKey(AssetGroup, null=True)
-
-    def __unicode__(self):
-        return self.user.name
+class SysUser(models.Model):
+    username = models.CharField(max_length=100)
+    password = models.CharField(max_length=100)
+    comment = models.CharField(max_length=100, null=True, blank=True, default='')
 
 
-# class CmdGroup(models.Model):
-#     name = models.CharField(max_length=50, unique=True)
-#     cmd = models.CharField(max_length=999)
-#     comment = models.CharField(blank=True, null=True, max_length=50)
-#
-#     def __unicode__(self):
-#         return self.name
-#
-#
-# class SudoPerm(models.Model):
-#     user_group = models.ForeignKey(UserGroup)
-#     user_runas = models.CharField(max_length=100)
-#     asset_group = models.ManyToManyField(AssetGroup)
-#     cmd_group = models.ManyToManyField(CmdGroup)
-#     comment = models.CharField(max_length=30, null=True, blank=True)
-#
-#     def __unicode__(self):
-#         return self.user_group.name
-#
-#
-# class Apply(models.Model):
-#     uuid = UUIDField(auto=True)
-#     applyer = models.CharField(max_length=20)
-#     admin = models.CharField(max_length=20)
-#     approver = models.CharField(max_length=20)
-#     bisgroup = models.CharField(max_length=500)
-#     asset = models.CharField(max_length=500)
-#     comment = models.TextField(blank=True, null=True)
-#     status = models.IntegerField(max_length=2)
-#     date_add = models.DateTimeField(null=True)
-#     date_end = models.DateTimeField(null=True)
-#     read = models.IntegerField(max_length=2)
-#
-#     def __unicode__(self):
-#         return self.applyer

jperm/perm_api.py

@@ -0,0 +1,290 @@
+# coding: utf-8
+
+from jasset.models import *
+from jumpserver.api import *
+import uuid
+import re
+from jumpserver.tasks import playbook_run
+
+from jumpserver.models import Setting
+from jperm.models import PermLog
+
+
+def get_object_list(model, id_list):
+    """根据id列表获取对象列表"""
+    object_list = []
+    for object_id in id_list:
+        if object_id:
+            object_list.extend(model.objects.filter(id=int(object_id)))
+
+    return object_list
+
+
+def get_rand_file_path(base_dir=os.path.join(BASE_DIR, 'tmp')):
+    """获取随机文件路径"""
+    filename = uuid.uuid1().hex
+    return os.path.join(base_dir, filename)
+
+
+def get_inventory(host_group):
+    """生成资产表库存清单"""
+    path = get_rand_file_path()
+    f = open(path, 'w')
+    for group, host_list in host_group.items():
+        f.write('[%s]\n' % group)
+        for ip in host_list:
+            asset = get_object(Asset, ip=ip)
+            if asset.use_default:
+                f.write('%s\n' % ip)
+            else:
+                f.write('%s ansible_ssh_port=%s ansible_ssh_user=%s ansible_ssh_pass=%s\n' %
+                        (ip, asset.port, asset.username, CRYPTOR.decrypt(asset.password)))
+    f.close()
+    return path
+
+
+def get_playbook(template, var):
+    """根据playbook模板，生成playbook"""
+    str_playbook = open(template).read()
+    for k, v in var.items():
+        str_playbook = re.sub(r'%s' % k, v, str_playbook)  # 正则来替换传入的字符
+    path = get_rand_file_path()
+    f = open(path, 'w')
+    f.write(str_playbook)
+    return path
+
+
+def perm_user_api(perm_info):
+    """
+    用户授权api，通过调用ansible API完成用户新建等,传入参数必须如下,列表中可以是对象，也可以是用户名和ip
+    perm_info = {'del': {'users': [],
+                         'assets': [],
+                        },
+                 'new': {'users': [],
+                         'assets': []}}
+    """
+    log = PermLog(action=perm_info.get('action', ''))
+    try:
+        new_users = perm_info.get('new', {}).get('users', [])
+        new_assets = perm_info.get('new', {}).get('assets', [])
+        del_users = perm_info.get('del', {}).get('users', [])
+        del_assets = perm_info.get('del', {}).get('assets', [])
+        print new_users, new_assets
+    except IndexError:
+        raise ServerError("Error: function perm_user_api传入参数错误")
+
+    try:
+        new_ip = [asset.ip for asset in new_assets if isinstance(asset, Asset)]
+        del_ip = [asset.ip for asset in del_assets if isinstance(asset, Asset)]
+        new_username = [user.username for user in new_users]
+        del_username = [user.username for user in del_users]
+    except IndexError:
+        raise ServerError("Error: function perm_user_api传入参数类型错误")
+
+    host_group = {'new': new_ip, 'del': del_ip}
+    inventory = get_inventory(host_group)
+
+    the_new_users = ','.join(new_username)
+    the_del_users = ','.join(del_username)
+
+    playbook = get_playbook(os.path.join(BASE_DIR, 'playbook', 'user_perm.yaml'),
+                            {'the_new_group': 'new', 'the_del_group': 'del',
+                             'the_new_users': the_new_users, 'the_del_users': the_del_users,
+                             'KEY_DIR': os.path.join(SSH_KEY_DIR, 'sysuser')})
+
+    print playbook, inventory
+
+    settings = get_object(Setting, name='default')
+    results = playbook_run(inventory, playbook, settings)
+    if not results.get('failures', 1) and not results.get('unreachable', ''):
+        is_success = True
+    else:
+        is_success = False
+
+    log.results = results
+    log.is_finish = True
+    log.is_success = is_success
+    log.save()
+    return results
+
+
+def user_group_permed(user_group):
+    assets = user_group.asset.all()
+    asset_groups = user_group.asset_group.all()
+
+    for asset_group in asset_groups:
+        assets.extend(asset_group.asset.all())
+
+    return {'assets': assets, 'asset_groups': asset_groups}
+
+
+def user_permed(user):
+    asset_groups = []
+    assets = []
+    user_groups = user.group.all()
+    asset_groups.extend(user.asset_group.all())
+    assets.extend(user.asset.all())
+
+    for user_group in user_groups:
+        asset_groups.extend(user_group_permed(user_group).get('assets', []))
+        assets.extend((user_group_permed(user_group).get('asset_groups', [])))
+
+    return {'assets': assets, 'asset_groups': asset_groups}
+
+
+def _public_perm_api(info):
+    """
+    公用的用户，用户组，主机，主机组编辑修改新建调用的api，用来完成授权
+    info like that:
+    {
+      'type': 'new_user',
+      'user': 'a',
+      'group': ['A', 'B']
+    }
+
+    {
+      'type': 'edit_user',
+      'user': 'a',
+      'group': {'new': ['A'], 'del': []}
+    }
+
+    {
+      'type': 'del_user',
+      'user': ['a', 'b']
+    }
+
+    {
+      'type': 'edit_user_group',
+      'group': 'A',
+      'user': {'del': ['a', 'b'], 'new': ['c', 'd']}
+    }
+
+    {
+      'type': 'del_user_group',
+      'group': ['A']
+    }
+
+    {
+      'type': 'new_asset',
+      'asset': 'a',
+      'group': ['A', 'B']
+    }
+
+    {
+      'type': 'edit_asset',
+      'asset': 'a',
+      'group': {
+          'del': ['A', ['B'],
+          'new': ['C', ['D']]
+      }
+    }
+
+    {
+      'type': 'del_asset',
+      'asset': ['a', 'b']
+    }
+
+    {
+      'type': 'edit_asset_group',
+      'group': 'A',
+      'asset': {'new': ['a', 'b'], 'del': ['c', 'd']}
+    }
+
+    {
+      'type': 'del_asset_group',
+      'group': ['A', 'B']
+    }
+    """
+
+    if info.get('type') == 'new_user':
+        new_assets = []
+        user = info.get('user')
+        user_groups = info.get('group')
+        for user_group in user_groups:
+            new_assets.extend(user_group_permed(user_group).get('assets', []))
+
+        perm_info = {
+            'action': 'new user: ' + user.name,
+            'new': {'users': [user], 'assets': new_assets}
+        }
+    elif info.get('type') == 'edit_user':
+        new_assets = []
+        del_assets = []
+        user = info.get('user')
+        new_group = info.get('group').get('new')
+        del_group = info.get('group').get('del')
+
+        for user_group in new_group:
+            new_assets.extend(user_group_permed(user_group).get('assets', []))
+
+        for user_group in del_group:
+            del_assets.extend((user_group_permed(user_group).get('assets', [])))
+
+        perm_info = {
+            'action': 'edit user: ' + user.name,
+            'del': {'users': [user], 'assets': del_assets},
+            'new': {'users': [user], 'assets': new_assets}
+        }
+
+    elif info.get('type') == 'del_user':
+        user = info.get('user')
+        del_assets = user_permed(user).get('assets', [])
+        perm_info = {
+            'action': 'del user: ' + user.name, 'del': {'users': [user], 'assets': del_assets},
+        }
+
+    elif info.get('type') == 'edit_user_group':
+        user_group = info.get('group')
+        new_users = info.get('user').get('new')
+        del_users = info.get('user').get('del')
+        assets = user_group_permed(user_group).get('assets', [])
+
+        perm_info = {
+            'action': 'edit user group: ' + user_group.name,
+            'new': {'users': new_users, 'assets': assets},
+            'del': {'users': del_users, 'assets': assets}
+        }
+
+    elif info.get('type') == 'del_user_group':
+        user_group = info.get('group', [])
+        del_users = user_group.user_set.all()
+        assets = user_group_permed(user_group).get('assets', [])
+
+        perm_info = {
+            'action': "del user group: " + user_group.name, 'del': {'users': del_users, 'assets': assets}
+        }
+    else:
+        return
+
+    try:
+        results = perm_user_api(perm_info)  # 通过API授权或回收
+    except ServerError, e:
+        return e
+    else:
+        return results
+
+
+def push_user(user, asset_groups_id):
+    assets = []
+    if not user:
+        return {'error': '没有该用户'}
+    for group_id in asset_groups_id:
+        asset_group = get_object(AssetGroup, id=group_id)
+        if asset_group:
+            assets.extend(asset_group.asset_set.all())
+    perm_info = {
+        'action': 'Push user:' + user.username,
+        'new': {'users': [user], 'assets': assets}
+    }
+
+    results = perm_user_api(perm_info)
+    return results
+
+
+
+
+
+
+
+
+

jperm/urls.py

@@ -2,30 +2,13 @@ from django.conf.urls import patterns, include, url
 from jperm.views import *
 
 urlpatterns = patterns('jperm.views',
-    # Examples:
-    (r'^user/$', user_perm),
-    # (r'^dept_perm_edit/$', 'dept_perm_edit'),
-    # (r'^perm_list/$', view_splitter, {'su': perm_list, 'adm': perm_list_adm}),
-    # (r'^dept_perm_list/$', 'dept_perm_list'),
-    # (r'^perm_user_detail/$', 'perm_user_detail'),
-    # (r'^perm_detail/$', 'perm_detail'),
-    # (r'^perm_del/$', 'perm_del'),
-    # (r'^perm_asset_detail/$', 'perm_asset_detail'),
-    # (r'^sudo_list/$', view_splitter, {'su': sudo_list, 'adm': sudo_list_adm}),
-    # (r'^sudo_del/$', 'sudo_del'),
-    # (r'^sudo_edit/$', view_splitter, {'su': sudo_edit, 'adm': sudo_edit_adm}),
-    # (r'^sudo_refresh/$', 'sudo_refresh'),
-    # (r'^sudo_detail/$', 'sudo_detail'),
-    # (r'^cmd_add/$', view_splitter, {'su': cmd_add, 'adm': cmd_add_adm}),
-    # (r'^cmd_list/$', 'cmd_list'),
-    # (r'^cmd_del/$', 'cmd_del'),
-    # (r'^cmd_edit/$', 'cmd_edit'),
-    # (r'^cmd_detail/$', 'cmd_detail'),
-    # (r'^apply/$', 'perm_apply'),
-    # (r'^apply_show/(\w+)/$', 'perm_apply_log'),
-    # (r'^apply_exec/$', 'perm_apply_exec'),
-    # (r'^apply_info/$', 'perm_apply_info'),
-    # (r'^apply_del/$', 'perm_apply_del'),
-    # (r'^apply_search/$', 'perm_apply_search'),
-
-)
+                       (r'^user/$', perm_user_list),
+                       (r'^perm_user_edit/$', perm_user_edit),
+                       (r'^group/$', perm_group_list),
+                       (r'^perm_group_edit/$', perm_group_edit),
+                       (r'^log/$', log),
+                       (r'^sys_user_add/$', sys_user_add),
+                       (r'^sys_user_list/$', sys_user_list),
+                       (r'^sys_user_del/$', sys_user_del),
+                       (r'^sys_user_edit/$', sys_user_edit),
+                       )

jumpserver.conf

@@ -23,7 +23,7 @@ root_pw = secret234
 
 
 [websocket]
-web_socket_host = 192.168.40.140:3000
+web_socket_host = ws://192.168.244.129:3000
 
 
 [mail]

jumpserver/api.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-import os, sys, time
+import os, sys, time, re
 from Crypto.Cipher import AES
 import crypt
 from binascii import b2a_hex, a2b_hex
@@ -8,9 +8,7 @@ import hashlib
 import datetime
 import random
 import subprocess
-import paramiko
-import struct, fcntl, signal, socket, select, fnmatch
-from settings import JLOG_FILE, KEY, URL, log_dir, log_level
+from settings import *
 
 from django.core.paginator import Paginator, EmptyPage, InvalidPage
 from django.http import HttpResponse, Http404
@@ -18,7 +16,7 @@ from django.template import RequestContext
 from juser.models import User, UserGroup
 from jasset.models import Asset, AssetGroup
 # from jlog.models import Log
-from jasset.models import AssetAlias
+from jlog.models import Log, TtyLog
 from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
 from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response
@@ -26,13 +24,6 @@ from django.core.mail import send_mail
 import json
 import logging
 
-try:
-    import termios
-    import tty
-except ImportError:
-    print '\033[1;31m仅支持类Unix系统 Only unix like supported.\033[0m'
-    time.sleep(3)
-    sys.exit()
 
 
 def set_log(level):
@@ -52,75 +43,6 @@ def set_log(level):
     return logger_f
 
 
-# class LDAPMgmt():
-#     """
-#     LDAP class for add, select, del, update
-#     LDAP 管理类，增删改查
-#     """
-#     def __init__(self,
-#                  host_url,
-#                  base_dn,
-#                  root_cn,
-#                  root_pw):
-#         self.ldap_host = host_url
-#         self.ldap_base_dn = base_dn
-#         self.conn = ldap.initialize(host_url)
-#         self.conn.set_option(ldap.OPT_REFERRALS, 0)
-#         self.conn.protocol_version = ldap.VERSION3
-#         self.conn.simple_bind_s(root_cn, root_pw)
-#
-#     def list(self, filter, scope=ldap.SCOPE_SUBTREE, attr=None):
-#         """
-#         query
-#         查询
-#         """
-#         result = {}
-#         try:
-#             ldap_result = self.conn.search_s(self.ldap_base_dn, scope, filter, attr)
-#             for entry in ldap_result:
-#                 name, data = entry
-#                 for k, v in data.items():
-#                     print '%s: %s' % (k, v)
-#                     result[k] = v
-#             return result
-#         except ldap.LDAPError, e:
-#             print e
-#
-#     def add(self, dn, attrs):
-#         """
-#         add
-#         添加
-#         """
-#         try:
-#             ldif = modlist.addModlist(attrs)
-#             self.conn.add_s(dn, ldif)
-#         except ldap.LDAPError, e:
-#             print e
-#
-#     def modify(self, dn, attrs):
-#         """
-#         modify
-#         更改
-#         """
-#         try:
-#             attr_s = []
-#             for k, v in attrs.items():
-#                 attr_s.append((2, k, v))
-#             self.conn.modify_s(dn, attr_s)
-#         except ldap.LDAPError, e:
-#             print e
-#
-#     def delete(self, dn):
-#         """
-#         delete
-#         删除
-#         """
-#         try:
-#             self.conn.delete_s(dn)
-#         except ldap.LDAPError, e:
-#             print e
-
-
 def page_list_return(total, current=1):
     """
     page
@@ -164,209 +86,6 @@ def pages(post_objects, request):
     return post_objects, paginator, page_objects, page_range, current_page, show_first, show_end
 
 
-class Jtty(object):
-    """
-    A virtual tty class
-    一个虚拟终端类，实现连接ssh和记录日志
-    """
-
-    def __init__(self, user, asset):
-        self.chan = None
-        self.username = user.username
-        self.ip = asset.ip
-        self.user = user
-        self.asset = asset
-
-    @staticmethod
-    def get_win_size():
-        """
-        This function use to get the size of the windows!
-        获得terminal窗口大小
-        """
-        if 'TIOCGWINSZ' in dir(termios):
-            TIOCGWINSZ = termios.TIOCGWINSZ
-        else:
-            TIOCGWINSZ = 1074295912L
-        s = struct.pack('HHHH', 0, 0, 0, 0)
-        x = fcntl.ioctl(sys.stdout.fileno(), TIOCGWINSZ, s)
-        return struct.unpack('HHHH', x)[0:2]
-
-    def set_win_size(self, sig, data):
-        """
-        This function use to set the window size of the terminal!
-        设置terminal窗口大小
-        """
-        try:
-            win_size = self.get_win_size()
-            self.chan.resize_pty(height=win_size[0], width=win_size[1])
-        except Exception:
-            pass
-
-    def log_record(self):
-        """
-        Logging user command and output.
-        记录用户的日志
-        """
-        tty_log_dir = os.path.join(log_dir, 'tty')
-        timestamp_start = int(time.time())
-        date_start = time.strftime('%Y%m%d', time.localtime(timestamp_start))
-        time_start = time.strftime('%H%M%S', time.localtime(timestamp_start))
-        log_filename = '%s_%s_%s.log' % (self.username, self.ip, time_start)
-        today_connect_log_dir = os.path.join(tty_log_dir, date_start)
-        log_file_path = os.path.join(today_connect_log_dir, log_filename)
-        dept_name = self.user.dept.name
-
-        pid = os.getpid()
-        pts = os.popen("ps axu | grep %s | grep -v grep | awk '{ print $7 }'" % pid).read().strip()
-        ip_list = os.popen("who | grep %s | awk '{ print $5 }'" % pts).read().strip('()\n')
-
-        try:
-            is_dir(today_connect_log_dir)
-        except OSError:
-            raise ServerError('Create %s failed, Please modify %s permission.' % (today_connect_log_dir, tty_log_dir))
-
-        try:
-            log_file = open(log_file_path, 'a')
-        except IOError:
-            raise ServerError('Create logfile failed, Please modify %s permission.' % today_connect_log_dir)
-
-        log = Log(user=self.username, host=self.ip, remote_ip=ip_list, dept_name=dept_name,
-                  log_path=log_file_path, start_time=datetime.datetime.now(), pid=pid)
-        log_file.write('Start time is %s\n' % datetime.datetime.now())
-        log.save()
-        return log_file, log
-
-    def posix_shell(self):
-        """
-        Use paramiko channel connect server interactive.
-        使用paramiko模块的channel，连接后端，进入交互式
-        """
-        log_file, log = self.log_record()
-        old_tty = termios.tcgetattr(sys.stdin)
-        try:
-            tty.setraw(sys.stdin.fileno())
-            tty.setcbreak(sys.stdin.fileno())
-            self.chan.settimeout(0.0)
-
-            while True:
-                try:
-                    r, w, e = select.select([self.chan, sys.stdin], [], [])
-                except Exception:
-                    pass
-
-                if self.chan in r:
-                    try:
-                        x = self.chan.recv(1024)
-                        if len(x) == 0:
-                            break
-                        sys.stdout.write(x)
-                        sys.stdout.flush()
-                        log_file.write(x)
-                        log_file.flush()
-                    except socket.timeout:
-                        pass
-
-                if sys.stdin in r:
-                    x = os.read(sys.stdin.fileno(), 1)
-                    if len(x) == 0:
-                        break
-                    self.chan.send(x)
-
-        finally:
-            termios.tcsetattr(sys.stdin, termios.TCSADRAIN, old_tty)
-            log_file.write('End time is %s' % datetime.datetime.now())
-            log_file.close()
-            log.is_finished = True
-            log.handle_finished = False
-            log.end_time = datetime.datetime.now()
-            log.save()
-
-    def get_connect_item(self):
-        """
-        get args for connect: ip, port, username, passwd
-        获取连接需要的参数，也就是服务ip, 端口, 用户账号和密码
-        """
-        if not self.asset.is_active:
-            raise ServerError('该主机被禁用 Host %s is not active.' % self.ip)
-
-        if not self.user.is_active:
-            raise ServerError('该用户被禁用 User %s is not active.' % self.username)
-
-        login_type_dict = {
-            'L': self.user.ldap_pwd,
-        }
-
-        if self.asset.login_type in login_type_dict:
-            password = CRYPTOR.decrypt(login_type_dict[self.asset.login_type])
-            return self.username, password, self.ip, int(self.asset.port)
-
-        elif self.asset.login_type == 'M':
-            username = self.asset.username
-            password = CRYPTOR.decrypt(self.asset.password)
-            return username, password, self.ip, int(self.asset.port)
-
-        else:
-            raise ServerError('不支持的服务器登录方式 Login type is not in ["L", "M"]')
-
-    def get_connection(self):
-        """
-        Get the ssh connection for reuse
-        获取连接套接字
-        """
-        username, password, ip, port = self.get_connect_item()
-        logger.debug("username: %s, password: %s, ip: %s, port: %s" % (username, password, ip, port))
-
-        # 发起ssh连接请求 Make a ssh connection
-        ssh = paramiko.SSHClient()
-        ssh.load_system_host_keys()
-        ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-        try:
-            ssh.connect(ip, port=port, username=username, password=password, compress=True)
-        except paramiko.ssh_exception.AuthenticationException, paramiko.ssh_exception.SSHException:
-            raise ServerError('认证错误 Authentication Error.')
-        except socket.error:
-            raise ServerError('端口可能不对 Connect SSH Socket Port Error, Please Correct it.')
-        else:
-            return ssh
-
-    def connect(self):
-        """
-        Connect server.
-        连接服务器
-        """
-        ps1 = "PS1='[\u@%s \W]\$ '\n" % self.ip
-        login_msg = "clear;echo -e '\\033[32mLogin %s done. Enjoy it.\\033[0m'\n" % self.asset.ip
-
-        # 发起ssh连接请求 Make a ssh connection
-        ssh = self.get_connection()
-
-        # 获取连接的隧道并设置窗口大小 Make a channel and set windows size
-        global channel
-        win_size = self.get_win_size()
-        self.chan = channel = ssh.invoke_shell(height=win_size[0], width=win_size[1])
-        try:
-            signal.signal(signal.SIGWINCH, self.set_win_size)
-        except:
-            pass
-
-        # 设置PS1并提示 Set PS1 and msg it
-        channel.send(ps1)
-        channel.send(login_msg)
-
-        # Make ssh interactive tunnel
-        self.posix_shell()
-
-        # Shutdown channel socket
-        channel.close()
-        ssh.close()
-
-    def execute(self, cmd):
-        """
-        execute cmd on the asset
-        执行命令
-        """
-        pass
-
 
 class PyCrypt(object):
     """
@@ -460,6 +179,10 @@ def get_object(model, **kwargs):
     use this function for query
     使用改封装函数查询数据库
     """
+    for value in kwargs.values():
+        if not value:
+            return None
+
     the_object = model.objects.filter(**kwargs)
     if len(the_object) == 1:
         the_object = the_object[0]
@@ -476,10 +199,10 @@ def require_role(role='user'):
 
     def _deco(func):
         def __deco(request, *args, **kwargs):
-            if role == 'user':
-                if not request.user.is_authenticated():
-                    return HttpResponseRedirect('/login/')
-            elif role == 'admin':
+            if not request.user.is_authenticated():
+                return HttpResponseRedirect('/login/')
+            
+            if role == 'admin':
                 # if request.session.get('role_id', 0) < 1:
                 if request.user.role == 'CU':
                     return HttpResponseRedirect('/')
@@ -691,13 +414,5 @@ def my_render(template, data, request):
 
 
 CRYPTOR = PyCrypt(KEY)
-
-# if LDAP_ENABLE:
-#     LDAP_HOST_URL = CONF.get('ldap', 'host_url')
-#     LDAP_BASE_DN = CONF.get('ldap', 'base_dn')
-#     LDAP_ROOT_DN = CONF.get('ldap', 'root_dn')
-#     LDAP_ROOT_PW = CONF.get('ldap', 'root_pw')
-#     ldap_conn = LDAPMgmt(LDAP_HOST_URL, LDAP_BASE_DN, LDAP_ROOT_DN, LDAP_ROOT_PW)
-# else:
-#     ldap_conn = None
 logger = set_log(log_level)
+

jumpserver/models.py

@@ -0,0 +1,13 @@
+# coding: utf-8
+
+from django.db import models
+
+
+class Setting(models.Model):
+    name = models.CharField(max_length=100)
+    default_user = models.CharField(max_length=100, null=True, blank=True)
+    default_port = models.IntegerField(max_length=10, null=True, blank=True)
+    default_pri_key_path = models.CharField(max_length=100, null=True, blank=True)
+
+    class Meta:
+        db_table = u'setting'

jumpserver/settings.py

@@ -44,9 +44,7 @@ URL = config.get('base', 'url')
 MAIL_ENABLE = config.get('mail', 'mail_enable')
 MAIL_FROM = config.get('mail', 'email_host_user')
 log_dir = os.path.join(BASE_DIR, 'logs')
-
 log_level = config.get('base', 'log')
-
 web_socket_host = config.get('websocket', 'web_socket_host')
 
 # Quick-start development settings - unsuitable for production
@@ -62,7 +60,6 @@ TEMPLATE_DEBUG = True
 
 ALLOWED_HOSTS = ['0.0.0.0/8']
 
-
 # Application definition
 
 INSTALLED_APPS = (
@@ -98,23 +95,23 @@ WSGI_APPLICATION = 'jumpserver.wsgi.application'
 # Database
 # https://docs.djangoproject.com/en/1.7/ref/settings/#databases
 
-# DATABASES = {
-#     'default': {
-#         'ENGINE': 'django.db.backends.mysql',
-#         'NAME': DB_DATABASE,
-#         'USER': DB_USER,
-#         'PASSWORD': DB_PASSWORD,
-#         'HOST': DB_HOST,
-#         'PORT': DB_PORT,
-#     }
-# }
-
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+        'ENGINE': 'django.db.backends.mysql',
+        'NAME': DB_DATABASE,
+        'USER': DB_USER,
+        'PASSWORD': DB_PASSWORD,
+        'HOST': DB_HOST,
+        'PORT': DB_PORT,
     }
 }
+
+# DATABASES = {
+#     'default': {
+#         'ENGINE': 'django.db.backends.sqlite3',
+#         'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+#     }
+# }
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.contrib.auth.context_processors.auth',
     'django.core.context_processors.debug',

jumpserver/tasks.py

@@ -0,0 +1,47 @@
+# coding: utf-8
+
+from ansible.playbook import PlayBook
+from ansible import callbacks, utils
+
+
+def playbook_run(inventory, playbook, default_user=None, default_port=None, default_pri_key_path=None):
+    stats = callbacks.AggregateStats()
+    playbook_cb = callbacks.PlaybookCallbacks(verbose=utils.VERBOSITY)
+    runner_cb = callbacks.PlaybookRunnerCallbacks(stats, verbose=utils.VERBOSITY)
+    # run the playbook
+    print default_user, default_port, default_pri_key_path, inventory, playbook
+    if default_user and default_port and default_pri_key_path:
+        playbook = PlayBook(host_list=inventory,
+                            playbook=playbook,
+                            forks=5,
+                            remote_user=default_user,
+                            remote_port=default_port,
+                            private_key_file=default_pri_key_path,
+                            callbacks=playbook_cb,
+                            runner_callbacks=runner_cb,
+                            stats=stats,
+                            become=True,
+                            become_user='root')
+    else:
+        playbook = PlayBook(host_list=inventory,
+                            playbook=playbook,
+                            forks=5,
+                            callbacks=playbook_cb,
+                            runner_callbacks=runner_cb,
+                            stats=stats,
+                            become=True,
+                            become_user='root')
+    results = playbook.run()
+    print results
+    results_r = {'unreachable': [], 'failures': [], 'success': []}
+    for hostname, result in results.items():
+        if result.get('unreachable', 2):
+            results_r['unreachable'].append(hostname)
+            print "%s >>> unreachable" % hostname
+        elif result.get('failures', 2):
+            results_r['failures'].append(hostname)
+            print "%s >>> Failed" % hostname
+        else:
+            results_r['success'].append(hostname)
+            print "%s >>> Success" % hostname
+    return results_r

jumpserver/templatetags/mytags.py

@@ -12,14 +12,6 @@ from jasset.models import AssetAlias
 register = template.Library()
 
 
-# @register.filter(name='stamp2str')
-# def stamp2str(value):
-#     try:
-#         return time.strftime('%Y/%m/%d %H:%M:%S', time.localtime(value))
-#     except AttributeError:
-#         return '0000/00/00 00:00:00'
-
-
 @register.filter(name='int2str')
 def int2str(value):
     """
@@ -42,20 +34,8 @@ def get_role(user_id):
         return u"普通用户"
 
 
-# @register.filter(name='groups_str')
-# def groups_str(user_id):
-#     groups = []
-#     user = User.objects.get(id=user_id)
-#     for group in user.group.all():
-#         groups.append(group.name)
-#     if len(groups) < 3:
-#         return ' '.join(groups)
-#     else:
-#         return "%s ..." % ' '.join(groups[0:2])
-#
-
-@register.filter(name='group_str2')
-def groups_str2(group_list):
+@register.filter(name='groups2str')
+def groups2str(group_list):
     """
     将用户组列表转换为str
     """
@@ -64,47 +44,28 @@ def groups_str2(group_list):
     else:
         return '%s ...' % ' '.join([group.name for group in group_list[0:2]])
 
-#
-# @register.filter(name='group_str2_all')
-# def group_str2_all(group_list):
-#     group_lis = []
-#     for i in group_list:
-#         if str(i) != 'ALL':
-#             group_lis.append(i)
-#     if len(group_lis) < 3:
-#         return ' '.join([group.name for group in group_lis])
-#     else:
-#         return '%s ...' % ' '.join([group.name for group in group_lis[0:2]])
-#
-#
-# @register.filter(name='group_dept_all')
-# def group_dept_all(group_list):
-#     group_lis = []
-#     for i in group_list:
-#         if str(i) != 'ALL':
-#             group_lis.append(i)
-#     return ' '.join([group.name for group in group_lis])
-#
-#
-# @register.filter(name='group_manage_str')
-# def group_manage_str(username):
-#     user = User.objects.get(username=username)
-#     group = user.user_group.filter(type='M')
-#     if group:
-#         return group[0].name
-#     else:
-#         return ''
-#
-#
-# @register.filter(name='get_item')
-# def get_item(dictionary, key):
-#     return dictionary.get(key)
-#
-#
-# @register.filter(name='get_login_type')
-# def get_login_type(login):
-#     login_types = {'L': 'LDAP', 'M': 'MAP'}
-#     return login_types[login]
+
+@register.filter(name='user_asset_count')
+def user_asset_count(user):
+    """
+    返回用户权限主机的数量
+    """
+    assets = user.asset.all()
+    asset_groups = user.asset_group.all()
+
+    for asset_group in asset_groups:
+        if asset_group:
+            assets.extend(asset_group.asset_set.all())
+
+    return len(assets)
+
+
+@register.filter(name='user_asset_group_count')
+def user_asset_group_count(user):
+    """
+    返回用户权限主机组的数量
+    """
+    return len(user.asset_group.all())
 
 
 @register.filter(name='bool2str')
@@ -115,16 +76,6 @@ def bool2str(value):
         return u'否'
 
 
-# # @register.filter(name='user_readonly')
-# # def user_readonly(user_id):
-# #     user = User.objects.filter(id=user_id)
-# #     if user:
-# #         user = user[0]
-# #         if user.role == 'CU':
-# #             return False
-# #     return True
-
-
 @register.filter(name='members_count')
 def members_count(group_id):
     """统计用户组下成员数量"""
@@ -134,148 +85,6 @@ def members_count(group_id):
     else:
         return 0
 
-#
-# @register.filter(name='group_user_count')
-# def group_user_count(group_id):
-#     group = UserGroup.objects.get(id=group_id)
-#     return group.user_set.count()
-#
-#
-# @register.filter(name='dept_user_num')
-# def dept_user_num(dept_id):
-#     dept = DEPT.objects.filter(id=dept_id)
-#     if dept:
-#         dept = dept[0]
-#         return dept.user_set.count()
-#     else:
-#         return 0
-#
-#
-# @register.filter(name='dept_group_num')
-# def dept_group_num(dept_id):
-#     dept = DEPT.objects.filter(id=dept_id)
-#     if dept:
-#         dept = dept[0]
-#         return dept.usergroup_set.all().count()
-#     else:
-#         return 0
-#
-#
-# @register.filter(name='perm_count')
-# def perm_count(group_id):
-#     group = UserGroup.objects.get(id=group_id)
-#     return group.perm_set.count()
-#
-#
-# @register.filter(name='dept_asset_num')
-# def dept_asset_num(dept_id):
-#     dept = DEPT.objects.filter(id=dept_id)
-#     if dept:
-#         dept = dept[0]
-#         return dept.asset_set.all().count()
-#     return 0
-#
-#
-# @register.filter(name='ugrp_perm_agrp_count')
-# def ugrp_perm_agrp_count(user_group_id):
-#     user_group = UserGroup.objects.filter(id=user_group_id)
-#     if user_group:
-#         user_group = user_group[0]
-#         return user_group.perm_set.all().count()
-#     return 0
-#
-#
-# @register.filter(name='ugrp_sudo_agrp_count')
-# def ugrp_sudo_agrp_count(user_group_id):
-#     user_group = UserGroup.objects.filter(id=user_group_id)
-#     asset_groups = []
-#     if user_group:
-#         user_group = user_group[0]
-#         for perm in user_group.sudoperm_set.all():
-#             asset_groups.extend(perm.asset_group.all())
-#         return len(set(asset_groups))
-#     return 0
-#
-#
-# @register.filter(name='ugrp_perm_asset_count')
-# def ugrp_perm_asset_count(user_group_id):
-#     user_group = UserGroup.objects.filter(id=user_group_id)
-#     assets = []
-#     if user_group:
-#         user_group = user_group[0]
-#         asset_groups = [perm.asset_group for perm in user_group.perm_set.all()]
-#         for asset_group in asset_groups:
-#             assets.extend(asset_group.asset_set.all())
-#     return len(set(assets))
-#
-#
-# @register.filter(name='ugrp_sudo_asset_count')
-# def ugrp_sudo_asset_count(user_group_id):
-#     user_group = UserGroup.objects.filter(id=user_group_id)
-#     asset_groups = []
-#     assets = []
-#     if user_group:
-#         user_group = user_group[0]
-#         for perm in user_group.sudoperm_set.all():
-#             asset_groups.extend(perm.asset_group.all())
-#
-#         for asset_group in asset_groups:
-#             assets.extend(asset_group.asset_set.all())
-#     return len(set(assets))
-#
-#
-# @register.filter(name='get_user_alias')
-# def get_user_alias(post, user_id):
-#     user = User.objects.get(id=user_id)
-#     host = Asset.objects.get(id=post.id)
-#     alias = AssetAlias.objects.filter(user=user, host=host)
-#     if alias:
-#         return alias[0].alias
-#     else:
-#         return ''
-#
-#
-# @register.filter(name='group_type_to_str')
-# def group_type_to_str(type_name):
-#     group_types = {
-#         'P': '用户',
-#         'M': '部门',
-#         'A': '用户组',
-#     }
-#     return group_types.get(type_name)
-#
-#
-# @register.filter(name='ast_to_list')
-# def ast_to_list(lis):
-#     ast_lis = ast.literal_eval(lis)
-#     if len(ast_lis) <= 2:
-#         return ','.join([i for i in ast_lis])
-#     else:
-#         restr = ','.join([i for i in ast_lis[0:2]]) + '...'
-#         return restr
-#
-#
-# @register.filter(name='get_group_count')
-# def get_group_count(post, dept):
-#     count = post.asset_set.filter(dept=dept).count()
-#     return count
-#
-#
-# @register.filter(name='get_idc_count')
-# def get_idc_count(post, dept):
-#     count = post.asset_set.filter(dept=dept).count()
-#     return count
-#
-#
-# @register.filter(name='ast_to_list_1')
-# def ast_to_list_1(lis):
-#     return ast.literal_eval(lis)
-#
-#
-# @register.filter(name='string_length')
-# def string_length(string, length):
-#     return '%s ...' % string[0:length]
-
 
 @register.filter(name='to_name')
 def to_name(user_id):
@@ -289,17 +98,6 @@ def to_name(user_id):
         return '非法用户'
 
 
-# @register.filter(name='to_dept_name')
-# def to_dept_name(user_id):
-#     try:
-#         user = User.objects.filter(id=int(user_id))
-#         if user:
-#             user = user[0]
-#             return user.dept.name
-#     except:
-#         return '非法部门'
-
-
 @register.filter(name='to_role_name')
 def to_role_name(role_id):
     """role_id 转变为角色名称"""
@@ -312,99 +110,16 @@ def to_avatar(role_id='0'):
     """不同角色不同头像"""
     role_dict = {'0': 'user', '1': 'admin', '2': 'root'}
     return role_dict.get(str(role_id), 'user')
-#
-#
-# @register.filter(name='get_user_asset_group')
-# def get_user_asset_group(user):
-#     return user.get_asset_group()
-#
-#
-# @register.filter(name='group_asset_list')
-# def group_asset_list(group):
-#     return group.asset_set.all()
-#
-#
-# @register.filter(name='group_asset_list_count')
-# def group_asset_list_count(group):
-#     return group.asset_set.all().count()
-#
-#
-# @register.filter(name='time_delta')
-# def time_delta(time_before):
-#     delta = datetime.datetime.now() - time_before
-#     days = delta.days
-#     if days:
-#         return "%s 天前" % days
-#     else:
-#         hours = delta.seconds/3600
-#         if hours:
-#             return "%s 小时前" % hours
-#         else:
-#             mins = delta.seconds/60
-#             if mins:
-#                 return '%s 分钟前' % mins
-#             else:
-#                 return '%s 秒前' % delta.seconds
-#
-#
-# @register.filter(name='sudo_cmd_list')
-# def sudo_cmd_list(cmd_group_id):
-#     cmd_group = CmdGroup.objects.filter(id=cmd_group_id)
-#     if cmd_group:
-#         cmd_group = cmd_group[0]
-#         return cmd_group.cmd.split(',')
-#
-#
-# @register.filter(name='sudo_cmd_count')
-# def sudo_cmd_count(user_group_id):
-#     user_group = UserGroup.objects.filter(id=user_group_id)
-#     cmds = []
-#     if user_group:
-#         user_group = user_group[0]
-#         cmd_groups = []
-#
-#         for perm in user_group.sudoperm_set.all():
-#             cmd_groups.extend(perm.cmd_group.all())
-#
-#         for cmd_group in cmd_groups:
-#             cmds.extend(cmd_group.cmd.split(','))
-#         return len(set(cmds))
-#
-#     else:
-#         return 0
-#
-#
-# @register.filter(name='sudo_cmd_count')
-# def sudo_cmd_count(user_group_id):
-#     user_group = UserGroup.objects.filter(id=user_group_id)
-#     cmds = []
-#     if user_group:
-#         user_group = user_group[0]
-#         cmd_groups = []
-#         for perm in user_group.sudoperm_set.all():
-#             cmd_groups.extend(perm.cmd_group.all())
-#
-#         for cmd_group in cmd_groups:
-#             cmds.extend(cmd_group.cmd.split(','))
-#         return len(set(cmds))
-#     else:
-#         return 0
-#
-#
-# @register.filter(name='sudo_cmd_ids')
-# def sudo_cmd_ids(user_group_id):
-#     user_group = UserGroup.objects.filter(id=user_group_id)
-#     if user_group:
-#         user_group = user_group[0]
-#         cmd_groups = []
-#         for perm in user_group.sudoperm_set.all():
-#             cmd_groups.extend(perm.cmd_group.all())
-#         cmd_ids = [str(cmd_group.id) for cmd_group in cmd_groups]
-#         return ','.join(cmd_ids)
-#     else:
-#         return '0'
-#
-#
-# @register.filter(name='cmd_group_split')
-# def cmd_group_split(cmd_group):
-#     return cmd_group.cmd.split(',')
+
+
+@register.filter(name='result2bool')
+def result2bool(result=''):
+    """将结果定向为结果"""
+    result = eval(result)
+    unreachable = result.get('unreachable', [])
+    failures = result.get('failures', [])
+
+    if unreachable or failures:
+        return '<b style="color: red">失败</b>'
+    else:
+        return '<b style="color: green">成功</b>'

jumpserver/urls.py

@@ -12,10 +12,11 @@ urlpatterns = patterns('',
     (r'^logout/$', 'jumpserver.views.Logout'),
     (r'^file/upload/$', 'jumpserver.views.upload'),
     (r'^file/download/$', 'jumpserver.views.download'),
+    (r'^setting', 'jumpserver.views.setting'),
     (r'^error/$', 'jumpserver.views.httperror'),
     (r'^juser/', include('juser.urls')),
     (r'^jasset/', include('jasset.urls')),
-    # (r'^jlog/', include('jlog.urls')),
+    (r'^jlog/', include('jlog.urls')),
     (r'^jperm/', include('jperm.urls')),
     (r'^node_auth/', 'jumpserver.views.node_auth'),
     (r'download/(\d{4}/\d\d/\d\d/.*)', 'jumpserver.views.download_file')

jumpserver/views.py

@@ -12,11 +12,13 @@ from django.http import HttpResponse
 # from jperm.models import Apply
 import paramiko
 from jumpserver.api import *
+from jumpserver.models import Setting
 from django.contrib.auth import authenticate, login, logout
 from django.contrib.auth.decorators import login_required
 from settings import BASE_DIR
 from jlog.models import Log
 
+
 def getDaysByNum(num):
     today = datetime.date.today()
     oneday = datetime.timedelta(days=1)
@@ -196,6 +198,7 @@ def is_latest():
 
 def Login(request):
     """登录界面"""
+    error = ''
     if request.user.is_authenticated():
         return HttpResponseRedirect('/')
     if request.method == 'GET':
@@ -240,6 +243,33 @@ def Logout(request):
     logout(request)
     return HttpResponseRedirect('/login/')
 
+
+def setting(request):
+    header_title, path1 = '项目设置', '设置'
+    setting_r = get_object(Setting, name='default')
+
+    if request.method == "POST":
+        username = request.POST.get('username', '')
+        port = request.POST.get('port', '')
+        private_key = request.POST.get('key', '')
+
+        if '' in [username, port, private_key]:
+            return HttpResponse('所填内容不能为空')
+        else:
+            settings = get_object(Setting, id=1)
+            private_key_path = os.path.join(BASE_DIR, 'keys', 'default', 'default_private_key.pem')
+            with open(private_key_path, 'w') as f:
+                    f.write(private_key)
+            os.chmod(private_key_path, 0600)
+            if settings:
+                Setting.objects.filter(name='default').update(default_user=username, default_port=port,
+                                                              default_pri_key_path=private_key_path)
+            else:
+                setting_r = Setting(name='default', default_user=username, default_port=port,
+                                    default_pri_key_path=private_key_path).save()
+
+            msg = "设置成功"
+    return my_render('setting.html', locals(), request)
 #
 # def filter_ajax_api(request):
 #     attr = request.GET.get('attr', 'user')

juser/models.py

@@ -3,22 +3,18 @@
 from django.db import models
 from django.contrib.auth.models import AbstractUser
 import time
+from jasset.models import Asset, AssetGroup
+
 
 class UserGroup(models.Model):
     name = models.CharField(max_length=80, unique=True)
     comment = models.CharField(max_length=160, blank=True, null=True)
+    asset = models.ManyToManyField(Asset)
+    asset_group = models.ManyToManyField(AssetGroup)
 
     def __unicode__(self):
         return self.name
 
-    def get_user(self):
-        return self.user_set.all()
-
-    def update(self, **kwargs):
-        for key, value in kwargs.items():
-            self.__setattr__(key, value)
-            self.save()
-
 
 class User(AbstractUser):
     USER_ROLE_CHOICES = (
@@ -35,83 +31,6 @@ class User(AbstractUser):
     def __unicode__(self):
         return self.username
 
-    def get_asset_group(self):
-        """
-        Get user host_groups.
-        获取用户有权限的主机组
-        """
-        host_group_list = []
-        perm_list = []
-        # user_group_all = self.group.all()
-        # for user_group in user_group_all:
-        #     perm_list.extend(user_group.perm_set.all())
-        # for perm in perm_list:
-        #     host_group_list.append(perm.asset_group)
-        return host_group_list
-
-    def get_asset_group_info(self, printable=False):
-        """
-        Get or print asset group info
-        获取或打印用户授权资产组
-        """
-        asset_groups_info = {}
-        asset_groups = self.get_asset_group()
-        for asset_group in asset_groups:
-            asset_groups_info[asset_group.id] = [asset_group.name, asset_group.comment]
-        if printable:
-            for group_id in asset_groups_info:
-                if asset_groups_info[group_id][1]:
-                    print "[%3s] %s -- %s" % (group_id,
-                                              asset_groups_info[group_id][0],
-                                              asset_groups_info[group_id][1])
-                else:
-                    print "[%3s] %s" % (group_id, asset_groups_info[group_id][0])
-                print ''
-        else:
-            return asset_groups_info
-
-    def get_asset(self):
-        """
-        Get the assets of under the user control.
-        获取主机列表
-        """
-        assets = []
-        asset_groups = self.get_asset_group()
-        for asset_group in asset_groups:
-            assets.extend(asset_group.asset_set.all())
-        return assets
-
-    def get_asset_info(self, printable=False):
-        """
-        Get or print the user asset info
-        获取或打印用户资产信息
-        """
-        from jasset.models import AssetAlias
-        assets_info = {}
-        assets = self.get_asset()
-        for asset in assets:
-            asset_alias = AssetAlias.objects.filter(user=self, asset=asset)
-            if asset_alias and asset_alias[0].alias != '':
-                assets_info[asset.ip] = [asset.id, asset.ip, str(asset_alias[0].alias)]
-            else:
-                assets_info[asset.ip] = [asset.id, asset.ip, str(asset.comment)]
-        if printable:
-            ips = assets_info.keys()
-            ips.sort()
-            for ip in ips:
-                if assets_info[ip][2]:
-                    print '%-15s -- %s' % (ip, assets_info[ip][2])
-                else:
-                    print '%-15s' % ip
-            print ''
-        else:
-            return assets_info
-
-    def update(self, **kwargs):
-        for key, value in kwargs.items():
-            self.__setattr__(key, value)
-            self.save()
-
 
 class AdminGroup(models.Model):
     """

juser/user_api.py

@@ -1,10 +1,12 @@
 # coding: utf-8
 
 from Crypto.PublicKey import RSA
+from subprocess import call
 
 from juser.models import AdminGroup
 from jumpserver.api import *
-from  jumpserver.settings import BASE_DIR
+from jumpserver.settings import BASE_DIR
+
 
 def group_add_user(group, user_id=None, username=None):
     """
@@ -118,30 +120,27 @@ def db_del_user(username):
         user.delete()
 
 
-def gen_ssh_key(username, password=None, length=2048):
+def gen_ssh_key(username, password='',
+                key_dir=os.path.join(BASE_DIR, 'keys/user/'),
+                authorized_keys=True, home="/home", length=2048):
     """
     generate a user ssh key in a property dir
     生成一个用户ssh密钥对
     """
-    print "gen_ssh_key" + str(time.time())
-    private_key_dir = os.path.join(BASE_DIR, 'keys/jumpserver/')
-    private_key_file = os.path.join(private_key_dir, username+".pem")
-    public_key_dir = '/home/%s/.ssh/' % username
-    public_key_file = os.path.join(public_key_dir, 'authorized_keys')
-    is_dir(private_key_dir)
-    is_dir(public_key_dir, username, mode=0700)
+    private_key_file = os.path.join(key_dir, username)
+    if os.path.isfile(private_key_file):
+        os.unlink(private_key_file)
+    ret = bash('ssh-keygen -t rsa -f %s -b %s -P "%s"' % (private_key_file, length, password))
 
-    key = RSA.generate(length)
-    with open(private_key_file, 'w') as pri_f:
-        pri_f.write(key.exportKey('PEM', password))
-    os.chmod(private_key_file, 0600)
-    print "gen_ssh_pub_key" + str(time.time())
-    pub_key = key.publickey()
-    with open(public_key_file, 'w') as pub_f:
-        pub_f.write(pub_key.exportKey('OpenSSH'))
-    os.chmod(public_key_file, 0600)
-    bash('chown %s:%s %s' % (username, username, public_key_file))
-    print "gen_ssh_key_end" + str(time.time())
+    if authorized_keys:
+        auth_key_dir = os.path.join(home, username, '.ssh')
+        is_dir(auth_key_dir, username, mode=0700)
+        authorized_key_file = os.path.join(auth_key_dir, 'authorized_keys')
+        with open(private_key_file+'.pub') as pub_f:
+            with open(authorized_key_file, 'w') as auth_f:
+                auth_f.write(pub_f.read())
+        os.chmod(authorized_key_file, 0600)
+        bash('chown %s:%s %s' % (username, username, authorized_key_file))
 
 
 def server_add_user(username, password, ssh_key_pwd, ssh_key_login_need):

juser/views.py

@@ -12,6 +12,7 @@ from django.template import RequestContext
 from django.db.models import ObjectDoesNotExist
 from jumpserver.settings import MAIL_FROM, MAIL_ENABLE
 from juser.user_api import *
+from jperm.perm_api import _public_perm_api, perm_user_api, user_permed
 
 
 def chg_role(request):
@@ -89,31 +90,6 @@ def group_del(request):
     return HttpResponse('删除成功')
 
 
-# @require_role(role='admin')
-# def group_list_adm(request):
-#     header_title, path1, path2 = '查看部门小组', '用户管理', '查看小组'
-#     keyword = request.GET.get('search', '')
-#     did = request.GET.get('did', '')
-#     user, dept = get_session_user_dept(request)
-#     contact_list = dept.usergroup_set.all().order_by('name')
-#
-#     if keyword:
-#         contact_list = contact_list.filter(Q(name__icontains=keyword) | Q(comment__icontains=keyword))
-#
-#     contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(contact_list, request)
-#     return render_to_response('juser/group_list.html', locals(), context_instance=RequestContext(request))
-
-#
-# @require_role(role='admin')
-# def group_detail(request):
-#     group_id = request.GET.get('id', None)
-#     if not group_id:
-#         return HttpResponseRedirect('/')
-#     group = UserGroup.objects.get(id=group_id)
-#     users = group.user_set.all()
-#     return render_to_response('juser/group_detail.html', locals(), context_instance=RequestContext(request))
-
-
 @require_role(role='super')
 def group_edit(request):
     error = ''
@@ -165,6 +141,7 @@ def group_edit(request):
     return my_render('juser/group_edit.html', locals(), request)
 
 
+<<<<<<< HEAD
 # @require_role(role='admin')
 # def group_edit_adm(request):
 #     error = ''
@@ -258,11 +235,20 @@ def user_add(request):
                                    is_active=is_active,
                                    date_joined=datetime.datetime.now())
                 server_add_user(username, password, ssh_key_pwd, ssh_key_login_need)
-            except Exception, e:
+                user = get_object(User, username=username)
+                if groups:
+                    user_groups = []
+                    for user_group_id in groups:
+                        user_groups.extend(UserGroup.objects.filter(id=user_group_id))
+                    print user_groups
+                    results = _public_perm_api({'type': 'new_user', 'user': user, 'group': user_groups})
+                    print results
+            except IndexError, e:
                 error = u'添加用户 %s 失败 %s ' % (username, e)
                 try:
                     db_del_user(username)
                     server_del_user(username)
+                    _public_perm_api({'type': 'del_user', 'user': user, 'group': user_groups})
                 except Exception:
                     pass
             else:
@@ -272,78 +258,6 @@ def user_add(request):
     return my_render('juser/user_add.html', locals(), request)
 
 
-# @require_role(role='admin')
-# def user_add_adm(request):
-#     error = ''
-#     msg = ''
-#     header_title, path1, path2 = '添加用户', '用户管理', '添加用户'
-#     user, dept = get_session_user_dept(request)
-#     group_all = dept.usergroup_set.all()
-#
-#     if request.method == 'POST':
-#         username = request.POST.get('username', '')
-#         password = PyCrypt.gen_rand_pwd(16)
-#         name = request.POST.get('name', '')
-#         email = request.POST.get('email', '')
-#         groups = request.POST.getlist('groups', [])
-#         ssh_key_pwd = PyCrypt.gen_rand_pwd(16)
-#         is_active = True if request.POST.get('is_active', '1') == '1' else False
-#         ldap_pwd = PyCrypt.gen_rand_pwd(16)
-#
-#         try:
-#             if '' in [username, password, ssh_key_pwd, name, groups, is_active]:
-#                 error = u'带*内容不能为空'
-#                 raise ServerError
-#             user = User.objects.filter(username=username)
-#             if user:
-#                 error = u'用户 %s 已存在' % username
-#                 raise ServerError
-#
-#         except ServerError:
-#             pass
-#         else:
-#             try:
-#                 user = db_add_user(username=username,
-#                                    password=CRYPTOR.md5_crypt(password),
-#                                    name=name, email=email, dept=dept,
-#                                    groups=groups, role='CU',
-#                                    ssh_key_pwd=CRYPTOR.md5_crypt(ssh_key_pwd),
-#                                    ldap_pwd=CRYPTOR.encrypt(ldap_pwd),
-#                                    is_active=is_active,
-#                                    date_joined=datetime.datetime.now())
-#
-#                 server_add_user(username, password, ssh_key_pwd)
-#                 if LDAP_ENABLE:
-#                     ldap_add_user(username, ldap_pwd)
-#
-#             except Exception, e:
-#                 error = u'添加用户 %s 失败 %s ' % (username, e)
-#                 try:
-#                     db_del_user(username)
-#                     server_del_user(username)
-#                     if LDAP_ENABLE:
-#                         ldap_del_user(username)
-#                 except Exception:
-#                     pass
-#             else:
-#                 mail_title = u'恭喜你的跳板机用户添加成功 Jumpserver'
-#                 mail_msg = """
-#                 Hi, %s
-#                     您的用户名： %s
-#                     您的部门: %s
-#                     您的角色： %s
-#                     您的web登录密码： %s
-#                     您的ssh密钥文件密码： %s
-#                     密钥下载地址： http://%s:%s/juser/down_key/?id=%s
-#                     说明： 请登陆后再下载密钥！
-#                 """ % (name, username, dept.name, '普通用户',
-#                        password, ssh_key_pwd, SEND_IP, SEND_PORT, user.id)
-#                 send_mail(mail_title, mail_msg, MAIL_FROM, [email], fail_silently=False)
-#                 msg = u'添加用户 %s 成功！ 用户密码已发送到 %s 邮箱！' % (username, email)
-#
-#     return render_to_response('juser/user_add.html', locals(), context_instance=RequestContext(request))
-
-
 @require_role(role='super')
 def user_list(request):
     user_role = {'SU': u'超级管理员', 'GA': u'组管理员', 'CU': u'普通用户'}
@@ -366,31 +280,6 @@ def user_list(request):
     return my_render('juser/user_list.html', locals(), request)
 
 
-# @require_role(role='admin')
-# def user_list_adm(request):
-#     user_role = {'SU': u'超级管理员', 'GA': u'组管理员', 'CU': u'普通用户'}
-#     header_title, path1, path2 = '查看用户', '用户管理', '用户列表'
-#     keyword = request.GET.get('keyword', '')
-#     user, dept = get_session_user_dept(request)
-#     gid = request.GET.get('gid', '')
-#     contact_list = dept.user_set.all().order_by('name')
-#
-#     if gid:
-#         if not validate(request, user_group=[gid]):
-#             return HttpResponseRedirect('/juser/user_list/')
-#         user_group = UserGroup.objects.filter(id=gid)
-#         if user_group:
-#             user_group = user_group[0]
-#             contact_list = user_group.user_set.all()
-#
-#     if keyword:
-#         contact_list = contact_list.filter(Q(username__icontains=keyword) | Q(name__icontains=keyword)).order_by('name')
-#
-#     contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(contact_list, request)
-#
-#     return render_to_response('juser/user_list.html', locals(), context_instance=RequestContext(request))
-
-
 @require_role(role='user')
 def user_detail(request):
     header_title, path1, path2 = '用户详情', '用户管理', '用户详情'
@@ -427,8 +316,12 @@ def user_del(request):
     else:
         return HttpResponse('错误请求')
     for user_id in user_id_list:
-        User.objects.filter(id=user_id).delete()
-
+        user = get_object(User, id=user_id)
+        if user:
+            assets = user_permed(user)
+            result = _public_perm_api({'type': 'del_user', 'user': user, 'asset': assets})
+            print result
+            user.delete()
     return HttpResponse('删除成功')
 
 
@@ -547,6 +440,7 @@ def user_edit(request):
                        admin_groups=admin_groups,
                        role=role_post,
                        is_active=is_active)
+        _public_perm_api({'type': 'del_user', 'user': user, 'asset': user_permed(user)})
 
         if email_need:
             msg = u"""
@@ -568,59 +462,6 @@ def user_edit(request):
 # @require_role(role='admin')
 def user_edit_adm(request):
     pass
-#     header_title, path1, path2 = '编辑用户', '用户管理', '用户编辑'
-#     user, dept = get_session_user_dept(request)
-#     if request.method == 'GET':
-#         user_id = request.GET.get('id', '')
-#         if not user_id:
-#             return HttpResponseRedirect('/juser/user_list/')
-#
-#         if not validate(request, user=[user_id]):
-#             return HttpResponseRedirect('/juser/user_list/')
-#
-#         user = User.objects.filter(id=user_id)
-#         dept_all = DEPT.objects.all()
-#         group_all = dept.usergroup_set.all()
-#         if user:
-#             user = user[0]
-#             groups_str = ' '.join([str(group.id) for group in user.group.all()])
-#
-#     else:
-#         user_id = request.POST.get('user_id', '')
-#         password = request.POST.get('password', '')
-#         name = request.POST.get('name', '')
-#         email = request.POST.get('email', '')
-#         groups = request.POST.getlist('groups', [])
-#         ssh_key_pwd = request.POST.get('ssh_key_pwd', '')
-#         is_active = True if request.POST.get('is_active', '1') == '1' else False
-#
-#         if not validate(request, user=[user_id], user_group=groups):
-#             return HttpResponseRedirect('/juser/user_edit/')
-#         if user_id:
-#             user = User.objects.filter(id=user_id)
-#             if user:
-#                 user = user[0]
-#         else:
-#             return HttpResponseRedirect('/juser/user_list/')
-#
-#         if password != user.password:
-#             password = CRYPTOR.md5_crypt(password)
-#
-#         if ssh_key_pwd != user.ssh_key_pwd:
-#             ssh_key_pwd = CRYPTOR.encrypt(ssh_key_pwd)
-#
-#         db_update_user(user_id=user_id,
-#                        password=password,
-#                        name=name,
-#                        email=email,
-#                        groups=groups,
-#                        is_active=is_active,
-#                        ssh_key_pwd=ssh_key_pwd)
-#
-#         return HttpResponseRedirect('/juser/user_list/')
-#
-#     return render_to_response('juser/user_edit.html', locals(), context_instance=RequestContext(request))
-#
 
 
 def profile(request):

playbook/user_perm.yaml

@@ -0,0 +1,17 @@
+- hosts: the_del_group
+  tasks:
+    - name: del user
+      user: name={{ item }} state=absent remove=yes
+      with_items: [ the_del_users ]
+
+- hosts: the_new_group
+  tasks:
+    - name: add user
+      user: name={{ item }} state=present
+      with_items: [ the_new_users ]
+    - name: .ssh direcotory
+      file: name=/home/{{ item }}/.ssh mode=700 owner={{ item }} group={{ item }} state=directory
+      with_items: [ the_new_users ]
+    - name: set authorizied_file
+      copy: src=KEY_DIR/{{ item }}.pub dest=/home/{{ item }}/.ssh/authorizied_keys owner={{ item }} group={{ item }} mode=600
+      with_items: [ the_new_users ]

run_websocket.py

@@ -0,0 +1,224 @@
+# coding: utf-8
+
+import time
+import json
+import os
+import sys
+import os.path
+import threading
+
+import tornado.ioloop
+import tornado.options
+import tornado.web
+import tornado.websocket
+import tornado.httpserver
+import tornado.gen
+from tornado.websocket import WebSocketClosedError
+
+from tornado.options import define, options
+from pyinotify import WatchManager, Notifier, ProcessEvent, IN_DELETE, IN_CREATE, IN_MODIFY, AsyncNotifier
+
+# from gevent import monkey
+# monkey.patch_all()
+# import gevent
+from gevent.socket import wait_read, wait_write
+
+import paramiko
+
+try:
+    import simplejson as json
+except ImportError:
+    import json
+
+
+define("port", default=3000, help="run on the given port", type=int)
+define("host", default='0.0.0.0', help="run port on", type=str)
+
+
+class MyThread(threading.Thread):
+    def __init__(self, *args, **kwargs):
+        super(MyThread, self).__init__(*args, **kwargs)
+
+    def run(self):
+        try:
+            super(MyThread, self).run()
+        except WebSocketClosedError:
+            pass
+
+
+class EventHandler(ProcessEvent):
+    def __init__(self, client=None):
+        self.client = client
+
+    def process_IN_CREATE(self, event):
+        print "Create file:%s." % os.path.join(event.path, event.name)
+
+    def process_IN_DELETE(self, event):
+        print "Delete file:%s." % os.path.join(event.path, event.name)
+
+    def process_IN_MODIFY(self, event):
+        print "Modify file:%s." % os.path.join(event.path, event.name)
+        self.client.write_message(f.read())
+
+
+def file_monitor(path='.', client=None):
+    wm = WatchManager()
+    mask = IN_DELETE | IN_CREATE | IN_MODIFY
+    notifier = AsyncNotifier(wm, EventHandler(client))
+    wm.add_watch(path, mask, auto_add=True, rec=True)
+    if not os.path.isfile(path):
+        print "You should monitor a file"
+        sys.exit(3)
+    else:
+        print "now starting monitor %s." % path
+        global f
+        f = open(path, 'r')
+        st_size = os.stat(path)[6]
+        f.seek(st_size)
+
+    while True:
+        try:
+            notifier.process_events()
+            if notifier.check_events():
+                notifier.read_events()
+        except KeyboardInterrupt:
+            print "keyboard Interrupt."
+            notifier.stop()
+            break
+
+
+class Application(tornado.web.Application):
+    def __init__(self):
+        handlers = [
+            (r'/monitor', MonitorHandler),
+            (r'/terminal', WebTerminalHandler),
+        ]
+
+        setting = {
+            'cookie_secret': 'DFksdfsasdfkasdfFKwlwfsdfsa1204mx',
+            'template_path': os.path.join(os.path.dirname(__file__), 'templates'),
+            'static_path': os.path.join(os.path.dirname(__file__), 'static'),
+            'debug': True,
+        }
+
+        tornado.web.Application.__init__(self, handlers, **setting)
+
+
+class MonitorHandler(tornado.websocket.WebSocketHandler):
+    clients = []
+    threads = []
+
+    def __init__(self, *args, **kwargs):
+        self.file_path = None
+        super(self.__class__, self).__init__(*args, **kwargs)
+
+    def check_origin(self, origin):
+        return True
+
+    def open(self):
+        # 获取监控的path
+        self.file_path = self.get_argument('file_path', '')
+        MonitorHandler.clients.append(self)
+        thread = MyThread(target=file_monitor, args=('%s.log' % self.file_path, self))
+        MonitorHandler.threads.append(thread)
+        self.stream.set_nodelay(True)
+
+        print len(MonitorHandler.threads), len(MonitorHandler.clients)
+
+    def on_message(self, message):
+        self.write_message('Connect WebSocket Success. <br/>')
+        # 监控日志，发生变动发向客户端
+
+        try:
+            for t in MonitorHandler.threads:
+                if t.is_alive():
+                    continue
+                t.setDaemon(True)
+                t.start()
+
+        except WebSocketClosedError:
+            client_index = MonitorHandler.clients.index(self)
+            MonitorHandler.threads[client_index].stop()
+            MonitorHandler.clients.remove(self)
+            MonitorHandler.threads.remove(MonitorHandler.threads[client_index])
+
+    def on_close(self):
+        # 客户端主动关闭
+        # self.close()
+
+        print "Close websocket."
+        client_index = MonitorHandler.clients.index(self)
+        MonitorHandler.clients.remove(self)
+        MonitorHandler.threads.remove(MonitorHandler.threads[client_index])
+
+
+class WebTerminalHandler(tornado.websocket.WebSocketHandler):
+    tasks = []
+
+    def __init__(self, *args, **kwargs):
+        self.chan = None
+        self.ssh = None
+        super(WebTerminalHandler, self).__init__(*args, **kwargs)
+
+    def check_origin(self, origin):
+        return True
+
+    def open(self):
+        self.ssh = paramiko.SSHClient()
+        self.ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+        try:
+            self.ssh.connect('127.0.0.1', 22, 'root', 'redhat')
+        except:
+            self.write_message(json.loads({'data': 'Connect server Error'}))
+            self.close()
+
+        self.chan = self.ssh.invoke_shell(term='xterm')
+        WebTerminalHandler.tasks.append(threading.Thread(target=self._forward_outbound))
+
+        for t in WebTerminalHandler.tasks:
+            if t.is_alive():
+                continue
+            t.setDaemon(True)
+            t.start()
+
+    def on_message(self, message):
+        data = json.loads(message)
+        if not data:
+            return
+        if 'resize' in data:
+            self.chan.resize_pty(
+                data['resize'].get('width', 80),
+                data['resize'].get('height', 24))
+        if 'data' in data:
+            self.chan.send(data['data'])
+
+    def on_close(self):
+        self.write_message(json.dumps({'data': 'close websocket'}))
+
+    def _forward_outbound(self):
+        """ Forward outbound traffic (ssh -> websockets) """
+        try:
+            data = ''
+            while True:
+                wait_read(self.chan.fileno())
+                recv = self.chan.recv(1024)
+                if not len(recv):
+                    return
+                data += recv
+                try:
+                    self.write_message(json.dumps({'data': data}))
+                    data = ''
+                except UnicodeDecodeError:
+                    pass
+        finally:
+            self.close()
+
+
+if __name__ == '__main__':
+    tornado.options.parse_command_line()
+    app = Application()
+    server = tornado.httpserver.HTTPServer(app)
+    server.bind(options.port, options.host)
+    # server.listen(options.port)
+    server.start(num_processes=1)
+    tornado.ioloop.IOLoop.instance().start()

static/css/plugins/bootstrap.min.css

@@ -0,0 +1,689 @@
+article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
+audio,canvas,video{display:inline-block;*display:inline;*zoom:1;}
+audio:not([controls]){display:none;}
+html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
+a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
+a:hover,a:active{outline:0;}
+sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;}
+sup{top:-0.5em;}
+sub{bottom:-0.25em;}
+img{height:auto;border:0;-ms-interpolation-mode:bicubic;vertical-align:middle;}
+button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;}
+button,input{*overflow:visible;line-height:normal;}
+button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;}
+button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;}
+input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;}
+input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;}
+textarea{overflow:auto;vertical-align:top;}
+.clearfix{*zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";}
+.clearfix:after{clear:both;}
+.hide-text{overflow:hidden;text-indent:100%;white-space:nowrap;}
+.input-block-level{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;}
+body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#333333;background-color:#ffffff;}
+a{color:#0088cc;text-decoration:none;}
+a:hover{color:#005580;text-decoration:underline;}
+.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";}
+.row:after{clear:both;}
+[class*="span"]{float:left;margin-left:20px;}
+.container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px;}
+.span12{width:940px;}
+.span11{width:860px;}
+.span10{width:780px;}
+.span9{width:700px;}
+.span8{width:620px;}
+.span7{width:540px;}
+.span6{width:460px;}
+.span5{width:380px;}
+.span4{width:300px;}
+.span3{width:220px;}
+.span2{width:140px;}
+.span1{width:60px;}
+.offset12{margin-left:980px;}
+.offset11{margin-left:900px;}
+.offset10{margin-left:820px;}
+.offset9{margin-left:740px;}
+.offset8{margin-left:660px;}
+.offset7{margin-left:580px;}
+.offset6{margin-left:500px;}
+.offset5{margin-left:420px;}
+.offset4{margin-left:340px;}
+.offset3{margin-left:260px;}
+.offset2{margin-left:180px;}
+.offset1{margin-left:100px;}
+.row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";}
+.row-fluid:after{clear:both;}
+.row-fluid>[class*="span"]{float:left;margin-left:2.127659574%;}
+.row-fluid>[class*="span"]:first-child{margin-left:0;}
+.row-fluid > .span12{width:99.99999998999999%;}
+.row-fluid > .span11{width:91.489361693%;}
+.row-fluid > .span10{width:82.97872339599999%;}
+.row-fluid > .span9{width:74.468085099%;}
+.row-fluid > .span8{width:65.95744680199999%;}
+.row-fluid > .span7{width:57.446808505%;}
+.row-fluid > .span6{width:48.93617020799999%;}
+.row-fluid > .span5{width:40.425531911%;}
+.row-fluid > .span4{width:31.914893614%;}
+.row-fluid > .span3{width:23.404255317%;}
+.row-fluid > .span2{width:14.89361702%;}
+.row-fluid > .span1{width:6.382978723%;}
+.container{margin-left:auto;margin-right:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";}
+.container:after{clear:both;}
+.container-fluid{padding-left:20px;padding-right:20px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";}
+.container-fluid:after{clear:both;}
+p{margin:0 0 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;}p small{font-size:11px;color:#999999;}
+.lead{margin-bottom:18px;font-size:20px;font-weight:200;line-height:27px;}
+h1,h2,h3,h4,h5,h6{margin:0;font-family:inherit;font-weight:bold;color:inherit;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;}
+h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;}
+h2{font-size:24px;line-height:36px;}h2 small{font-size:18px;}
+h3{line-height:27px;font-size:18px;}h3 small{font-size:14px;}
+h4,h5,h6{line-height:18px;}
+h4{font-size:14px;}h4 small{font-size:12px;}
+h5{font-size:12px;}
+h6{font-size:11px;color:#999999;text-transform:uppercase;}
+.page-header{padding-bottom:17px;margin:18px 0;border-bottom:1px solid #eeeeee;}
+.page-header h1{line-height:1;}
+ul,ol{padding:0;margin:0 0 9px 25px;}
+ul ul,ul ol,ol ol,ol ul{margin-bottom:0;}
+ul{list-style:disc;}
+ol{list-style:decimal;}
+li{line-height:18px;}
+ul.unstyled,ol.unstyled{margin-left:0;list-style:none;}
+dl{margin-bottom:18px;}
+dt,dd{line-height:18px;}
+dt{font-weight:bold;line-height:17px;}
+dd{margin-left:9px;}
+.dl-horizontal dt{float:left;clear:left;width:120px;text-align:right;}
+.dl-horizontal dd{margin-left:130px;}
+hr{margin:18px 0;border:0;border-top:1px solid #eeeeee;border-bottom:1px solid #ffffff;}
+strong{font-weight:bold;}
+em{font-style:italic;}
+.muted{color:#999999;}
+abbr[title]{border-bottom:1px dotted #ddd;cursor:help;}
+abbr.initialism{font-size:90%;text-transform:uppercase;}
+blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;}
+blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';}
+blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;}
+q:before,q:after,blockquote:before,blockquote:after{content:"";}
+address{display:block;margin-bottom:18px;line-height:18px;font-style:normal;}
+small{font-size:100%;}
+cite{font-style:normal;}
+code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+code{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;}
+pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12.025px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;word-wrap:break-word;}pre.prettyprint{margin-bottom:18px;}
+pre code{padding:0;color:inherit;background-color:transparent;border:0;}
+.pre-scrollable{max-height:340px;overflow-y:scroll;}
+form{margin:0 0 18px;}
+fieldset{padding:0;margin:0;border:0;}
+legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;}legend small{font-size:13.5px;color:#999999;}
+label,input,button,select,textarea{font-size:13px;font-weight:normal;line-height:18px;}
+input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;}
+label{display:block;margin-bottom:5px;color:#333333;}
+input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #cccccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+.uneditable-textarea{width:auto;height:auto;}
+label input,label textarea,label select{display:block;}
+input[type="image"],input[type="checkbox"],input[type="radio"]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;cursor:pointer;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;border:0 \9;}
+input[type="image"]{border:0;}
+input[type="file"]{width:auto;padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+input[type="button"],input[type="reset"],input[type="submit"]{width:auto;height:auto;}
+select,input[type="file"]{height:28px;*margin-top:4px;line-height:28px;}
+input[type="file"]{line-height:18px \9;}
+select{width:220px;background-color:#ffffff;}
+select[multiple],select[size]{height:auto;}
+input[type="image"]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+textarea{height:auto;}
+input[type="hidden"]{display:none;}
+.radio,.checkbox{padding-left:18px;}
+.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-18px;}
+.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;}
+.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle;}
+.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;}
+input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}
+input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);outline:0;outline:thin dotted \9;}
+input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
+.input-mini{width:60px;}
+.input-small{width:90px;}
+.input-medium{width:150px;}
+.input-large{width:210px;}
+.input-xlarge{width:270px;}
+.input-xxlarge{width:530px;}
+input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{float:none;margin-left:0;}
+input,textarea,.uneditable-input{margin-left:0;}
+input.span12, textarea.span12, .uneditable-input.span12{width:930px;}
+input.span11, textarea.span11, .uneditable-input.span11{width:850px;}
+input.span10, textarea.span10, .uneditable-input.span10{width:770px;}
+input.span9, textarea.span9, .uneditable-input.span9{width:690px;}
+input.span8, textarea.span8, .uneditable-input.span8{width:610px;}
+input.span7, textarea.span7, .uneditable-input.span7{width:530px;}
+input.span6, textarea.span6, .uneditable-input.span6{width:450px;}
+input.span5, textarea.span5, .uneditable-input.span5{width:370px;}
+input.span4, textarea.span4, .uneditable-input.span4{width:290px;}
+input.span3, textarea.span3, .uneditable-input.span3{width:210px;}
+input.span2, textarea.span2, .uneditable-input.span2{width:130px;}
+input.span1, textarea.span1, .uneditable-input.span1{width:50px;}
+input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#eeeeee;border-color:#ddd;cursor:not-allowed;}
+.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;}
+.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;}
+.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;}
+.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;}
+.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;}
+.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;}
+.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;}
+.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;}
+.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;}
+input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}
+.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#eeeeee;border-top:1px solid #ddd;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";}
+.form-actions:after{clear:both;}
+.uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;}
+:-moz-placeholder{color:#999999;}
+::-webkit-input-placeholder{color:#999999;}
+.help-block,.help-inline{color:#555555;}
+.help-block{display:block;margin-bottom:9px;}
+.help-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding-left:5px;}
+.input-prepend,.input-append{margin-bottom:5px;}.input-prepend input,.input-append input,.input-prepend select,.input-append select,.input-prepend .uneditable-input,.input-append .uneditable-input{*margin-left:0;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}.input-prepend input:focus,.input-append input:focus,.input-prepend select:focus,.input-append select:focus,.input-prepend .uneditable-input:focus,.input-append .uneditable-input:focus{position:relative;z-index:2;}
+.input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc;}
+.input-prepend .add-on,.input-append .add-on{display:inline-block;width:auto;min-width:16px;height:18px;padding:4px 5px;font-weight:normal;line-height:18px;text-align:center;text-shadow:0 1px 0 #ffffff;vertical-align:middle;background-color:#eeeeee;border:1px solid #ccc;}
+.input-prepend .add-on,.input-append .add-on,.input-prepend .btn,.input-append .btn{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546;}
+.input-prepend .add-on,.input-prepend .btn{margin-right:-1px;}
+.input-append input,.input-append select .uneditable-input{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.input-append .uneditable-input{border-left-color:#eee;border-right-color:#ccc;}
+.input-append .add-on,.input-append .btn{margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+.search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;}
+.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;margin-bottom:0;}
+.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none;}
+.form-search label,.form-inline label{display:inline-block;}
+.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0;}
+.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle;}
+.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-left:0;margin-right:3px;}
+.control-group{margin-bottom:9px;}
+legend+.control-group{margin-top:18px;-webkit-margin-top-collapse:separate;}
+.form-horizontal .control-group{margin-bottom:18px;*zoom:1;}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";}
+.form-horizontal .control-group:after{clear:both;}
+.form-horizontal .control-label{float:left;width:140px;padding-top:5px;text-align:right;}
+.form-horizontal .controls{margin-left:160px;*display:inline-block;*margin-left:0;*padding-left:20px;}
+.form-horizontal .help-block{margin-top:9px;margin-bottom:0;}
+.form-horizontal .form-actions{padding-left:160px;}
+table{max-width:100%;border-collapse:collapse;border-spacing:0;background-color:transparent;}
+.table{width:100%;margin-bottom:18px;}.table th,.table td{padding:8px;line-height:18px;text-align:left;vertical-align:top;border-top:1px solid #dddddd;}
+.table th{font-weight:bold;}
+.table thead th{vertical-align:bottom;}
+.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0;}
+.table tbody+tbody{border-top:2px solid #dddddd;}
+.table-condensed th,.table-condensed td{padding:4px 5px;}
+.table-bordered{border:1px solid #dddddd;border-left:0;border-collapse:separate;*border-collapse:collapsed;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th,.table-bordered td{border-left:1px solid #dddddd;}
+.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;}
+.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;}
+.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;}
+.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;}
+.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;}
+.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9;}
+.table tbody tr:hover td,.table tbody tr:hover th{background-color:#f5f5f5;}
+table .span1{float:none;width:44px;margin-left:0;}
+table .span2{float:none;width:124px;margin-left:0;}
+table .span3{float:none;width:204px;margin-left:0;}
+table .span4{float:none;width:284px;margin-left:0;}
+table .span5{float:none;width:364px;margin-left:0;}
+table .span6{float:none;width:444px;margin-left:0;}
+table .span7{float:none;width:524px;margin-left:0;}
+table .span8{float:none;width:604px;margin-left:0;}
+table .span9{float:none;width:684px;margin-left:0;}
+table .span10{float:none;width:764px;margin-left:0;}
+table .span11{float:none;width:844px;margin-left:0;}
+table .span12{float:none;width:924px;margin-left:0;}
+table .span13{float:none;width:1004px;margin-left:0;}
+table .span14{float:none;width:1084px;margin-left:0;}
+table .span15{float:none;width:1164px;margin-left:0;}
+table .span16{float:none;width:1244px;margin-left:0;}
+table .span17{float:none;width:1324px;margin-left:0;}
+table .span18{float:none;width:1404px;margin-left:0;}
+table .span19{float:none;width:1484px;margin-left:0;}
+table .span20{float:none;width:1564px;margin-left:0;}
+table .span21{float:none;width:1644px;margin-left:0;}
+table .span22{float:none;width:1724px;margin-left:0;}
+table .span23{float:none;width:1804px;margin-left:0;}
+table .span24{float:none;width:1884px;margin-left:0;}
+[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;*margin-right:.3em;}[class^="icon-"]:last-child,[class*=" icon-"]:last-child{*margin-left:0;}
+.icon-white{background-image:url("../img/glyphicons-halflings-white.png");}
+.icon-glass{background-position:0 0;}
+.icon-music{background-position:-24px 0;}
+.icon-search{background-position:-48px 0;}
+.icon-envelope{background-position:-72px 0;}
+.icon-heart{background-position:-96px 0;}
+.icon-star{background-position:-120px 0;}
+.icon-star-empty{background-position:-144px 0;}
+.icon-user{background-position:-168px 0;}
+.icon-film{background-position:-192px 0;}
+.icon-th-large{background-position:-216px 0;}
+.icon-th{background-position:-240px 0;}
+.icon-th-list{background-position:-264px 0;}
+.icon-ok{background-position:-288px 0;}
+.icon-remove{background-position:-312px 0;}
+.icon-zoom-in{background-position:-336px 0;}
+.icon-zoom-out{background-position:-360px 0;}
+.icon-off{background-position:-384px 0;}
+.icon-signal{background-position:-408px 0;}
+.icon-cog{background-position:-432px 0;}
+.icon-trash{background-position:-456px 0;}
+.icon-home{background-position:0 -24px;}
+.icon-file{background-position:-24px -24px;}
+.icon-time{background-position:-48px -24px;}
+.icon-road{background-position:-72px -24px;}
+.icon-download-alt{background-position:-96px -24px;}
+.icon-download{background-position:-120px -24px;}
+.icon-upload{background-position:-144px -24px;}
+.icon-inbox{background-position:-168px -24px;}
+.icon-play-circle{background-position:-192px -24px;}
+.icon-repeat{background-position:-216px -24px;}
+.icon-refresh{background-position:-240px -24px;}
+.icon-list-alt{background-position:-264px -24px;}
+.icon-lock{background-position:-287px -24px;}
+.icon-flag{background-position:-312px -24px;}
+.icon-headphones{background-position:-336px -24px;}
+.icon-volume-off{background-position:-360px -24px;}
+.icon-volume-down{background-position:-384px -24px;}
+.icon-volume-up{background-position:-408px -24px;}
+.icon-qrcode{background-position:-432px -24px;}
+.icon-barcode{background-position:-456px -24px;}
+.icon-tag{background-position:0 -48px;}
+.icon-tags{background-position:-25px -48px;}
+.icon-book{background-position:-48px -48px;}
+.icon-bookmark{background-position:-72px -48px;}
+.icon-print{background-position:-96px -48px;}
+.icon-camera{background-position:-120px -48px;}
+.icon-font{background-position:-144px -48px;}
+.icon-bold{background-position:-167px -48px;}
+.icon-italic{background-position:-192px -48px;}
+.icon-text-height{background-position:-216px -48px;}
+.icon-text-width{background-position:-240px -48px;}
+.icon-align-left{background-position:-264px -48px;}
+.icon-align-center{background-position:-288px -48px;}
+.icon-align-right{background-position:-312px -48px;}
+.icon-align-justify{background-position:-336px -48px;}
+.icon-list{background-position:-360px -48px;}
+.icon-indent-left{background-position:-384px -48px;}
+.icon-indent-right{background-position:-408px -48px;}
+.icon-facetime-video{background-position:-432px -48px;}
+.icon-picture{background-position:-456px -48px;}
+.icon-pencil{background-position:0 -72px;}
+.icon-map-marker{background-position:-24px -72px;}
+.icon-adjust{background-position:-48px -72px;}
+.icon-tint{background-position:-72px -72px;}
+.icon-edit{background-position:-96px -72px;}
+.icon-share{background-position:-120px -72px;}
+.icon-check{background-position:-144px -72px;}
+.icon-move{background-position:-168px -72px;}
+.icon-step-backward{background-position:-192px -72px;}
+.icon-fast-backward{background-position:-216px -72px;}
+.icon-backward{background-position:-240px -72px;}
+.icon-play{background-position:-264px -72px;}
+.icon-pause{background-position:-288px -72px;}
+.icon-stop{background-position:-312px -72px;}
+.icon-forward{background-position:-336px -72px;}
+.icon-fast-forward{background-position:-360px -72px;}
+.icon-step-forward{background-position:-384px -72px;}
+.icon-eject{background-position:-408px -72px;}
+.icon-chevron-left{background-position:-432px -72px;}
+.icon-chevron-right{background-position:-456px -72px;}
+.icon-plus-sign{background-position:0 -96px;}
+.icon-minus-sign{background-position:-24px -96px;}
+.icon-remove-sign{background-position:-48px -96px;}
+.icon-ok-sign{background-position:-72px -96px;}
+.icon-question-sign{background-position:-96px -96px;}
+.icon-info-sign{background-position:-120px -96px;}
+.icon-screenshot{background-position:-144px -96px;}
+.icon-remove-circle{background-position:-168px -96px;}
+.icon-ok-circle{background-position:-192px -96px;}
+.icon-ban-circle{background-position:-216px -96px;}
+.icon-arrow-left{background-position:-240px -96px;}
+.icon-arrow-right{background-position:-264px -96px;}
+.icon-arrow-up{background-position:-289px -96px;}
+.icon-arrow-down{background-position:-312px -96px;}
+.icon-share-alt{background-position:-336px -96px;}
+.icon-resize-full{background-position:-360px -96px;}
+.icon-resize-small{background-position:-384px -96px;}
+.icon-plus{background-position:-408px -96px;}
+.icon-minus{background-position:-433px -96px;}
+.icon-asterisk{background-position:-456px -96px;}
+.icon-exclamation-sign{background-position:0 -120px;}
+.icon-gift{background-position:-24px -120px;}
+.icon-leaf{background-position:-48px -120px;}
+.icon-fire{background-position:-72px -120px;}
+.icon-eye-open{background-position:-96px -120px;}
+.icon-eye-close{background-position:-120px -120px;}
+.icon-warning-sign{background-position:-144px -120px;}
+.icon-plane{background-position:-168px -120px;}
+.icon-calendar{background-position:-192px -120px;}
+.icon-random{background-position:-216px -120px;}
+.icon-comment{background-position:-240px -120px;}
+.icon-magnet{background-position:-264px -120px;}
+.icon-chevron-up{background-position:-288px -120px;}
+.icon-chevron-down{background-position:-313px -119px;}
+.icon-retweet{background-position:-336px -120px;}
+.icon-shopping-cart{background-position:-360px -120px;}
+.icon-folder-close{background-position:-384px -120px;}
+.icon-folder-open{background-position:-408px -120px;}
+.icon-resize-vertical{background-position:-432px -119px;}
+.icon-resize-horizontal{background-position:-456px -118px;}
+.dropdown{position:relative;}
+.dropdown-toggle{*margin-bottom:-3px;}
+.dropdown-toggle:active,.open .dropdown-toggle{outline:0;}
+.caret{display:inline-block;width:0;height:0;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;opacity:0.3;filter:alpha(opacity=30);content:"";}
+.dropdown .caret{margin-top:8px;margin-left:2px;}
+.dropdown:hover .caret,.open.dropdown .caret{opacity:1;filter:alpha(opacity=100);}
+.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;float:left;display:none;min-width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#ccc;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;*border-right-width:2px;*border-bottom-width:2px;}.dropdown-menu.pull-right{right:0;left:auto;}
+.dropdown-menu .divider{height:1px;margin:8px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;*width:100%;*margin:-5px 0 5px;}
+.dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#333333;white-space:nowrap;}
+.dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;background-color:#0088cc;}
+.dropdown.open{*z-index:1000;}.dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
+.dropdown.open .dropdown-menu{display:block;}
+.pull-right .dropdown-menu{left:auto;right:0;}
+.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000000;content:"\2191";}
+.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px;}
+.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);}
+.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
+.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+.fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;}
+.collapse{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;position:relative;overflow:hidden;height:0;}.collapse.in{height:auto;}
+.close{float:right;font-size:20px;font-weight:bold;line-height:18px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;opacity:0.4;filter:alpha(opacity=40);cursor:pointer;}
+.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 10px 4px;margin-bottom:0;font-size:13px;line-height:18px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);vertical-align:middle;background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-ms-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(top, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);border:1px solid #cccccc;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{background-color:#e6e6e6;}
+.btn:active,.btn.active{background-color:#cccccc \9;}
+.btn:first-child{*margin-left:0;}
+.btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;}
+.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
+.btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;outline:0;}
+.btn.disabled,.btn[disabled]{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.btn-large{padding:9px 14px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.btn-large [class^="icon-"]{margin-top:1px;}
+.btn-small{padding:5px 9px;font-size:11px;line-height:16px;}
+.btn-small [class^="icon-"]{margin-top:-1px;}
+.btn-mini{padding:2px 6px;font-size:11px;line-height:14px;}
+.btn-primary,.btn-primary:hover,.btn-warning,.btn-warning:hover,.btn-danger,.btn-danger:hover,.btn-success,.btn-success:hover,.btn-info,.btn-info:hover,.btn-inverse,.btn-inverse:hover{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);color:#ffffff;}
+.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255, 255, 255, 0.75);}
+.btn-primary{background-color:#0074cc;background-image:-moz-linear-gradient(top, #0088cc, #0055cc);background-image:-ms-linear-gradient(top, #0088cc, #0055cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc));background-image:-webkit-linear-gradient(top, #0088cc, #0055cc);background-image:-o-linear-gradient(top, #0088cc, #0055cc);background-image:linear-gradient(top, #0088cc, #0055cc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0);border-color:#0055cc #0055cc #003580;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#0055cc;}
+.btn-primary:active,.btn-primary.active{background-color:#004099 \9;}
+.btn-warning{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-ms-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(top, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#f89406;}
+.btn-warning:active,.btn-warning.active{background-color:#c67605 \9;}
+.btn-danger{background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-ms-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(top, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#bd362f;}
+.btn-danger:active,.btn-danger.active{background-color:#942a25 \9;}
+.btn-success{background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-ms-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(top, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{background-color:#51a351;}
+.btn-success:active,.btn-success.active{background-color:#408140 \9;}
+.btn-info{background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-ms-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(top, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{background-color:#2f96b4;}
+.btn-info:active,.btn-info.active{background-color:#24748c \9;}
+.btn-inverse{background-color:#414141;background-image:-moz-linear-gradient(top, #555555, #222222);background-image:-ms-linear-gradient(top, #555555, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222));background-image:-webkit-linear-gradient(top, #555555, #222222);background-image:-o-linear-gradient(top, #555555, #222222);background-image:linear-gradient(top, #555555, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{background-color:#222222;}
+.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9;}
+button.btn,input[type="submit"].btn{*padding-top:2px;*padding-bottom:2px;}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0;}
+button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px;}
+button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px;}
+button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px;}
+.btn-group{position:relative;*zoom:1;*margin-left:.3em;}.btn-group:before,.btn-group:after{display:table;content:"";}
+.btn-group:after{clear:both;}
+.btn-group:first-child{*margin-left:0;}
+.btn-group+.btn-group{margin-left:5px;}
+.btn-toolbar{margin-top:9px;margin-bottom:9px;}.btn-toolbar .btn-group{display:inline-block;*display:inline;*zoom:1;}
+.btn-group .btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.btn-group .btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;}
+.btn-group .btn:last-child,.btn-group .dropdown-toggle{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;}
+.btn-group .btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;}
+.btn-group .btn.large:last-child,.btn-group .large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;}
+.btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active,.btn-group .btn.active{z-index:2;}
+.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0;}
+.btn-group .dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);*padding-top:3px;*padding-bottom:3px;}
+.btn-group .btn-mini.dropdown-toggle{padding-left:5px;padding-right:5px;*padding-top:1px;*padding-bottom:1px;}
+.btn-group .btn-small.dropdown-toggle{*padding-top:4px;*padding-bottom:4px;}
+.btn-group .btn-large.dropdown-toggle{padding-left:12px;padding-right:12px;}
+.btn-group.open{*z-index:1000;}.btn-group.open .dropdown-menu{display:block;margin-top:1px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
+.btn .caret{margin-top:7px;margin-left:0;}
+.btn:hover .caret,.open.btn-group .caret{opacity:1;filter:alpha(opacity=100);}
+.btn-mini .caret{margin-top:5px;}
+.btn-small .caret{margin-top:6px;}
+.btn-large .caret{margin-top:6px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
+.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);}
+.alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#c09853;}
+.alert-heading{color:inherit;}
+.alert .close{position:relative;top:-2px;right:-21px;line-height:18px;}
+.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#468847;}
+.alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;color:#b94a48;}
+.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#3a87ad;}
+.alert-block{padding-top:14px;padding-bottom:14px;}
+.alert-block>p,.alert-block>ul{margin-bottom:0;}
+.alert-block p+p{margin-top:5px;}
+.nav{margin-left:0;margin-bottom:18px;list-style:none;}
+.nav>li>a{display:block;}
+.nav>li>a:hover{text-decoration:none;background-color:#eeeeee;}
+.nav .nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:18px;color:#999999;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);text-transform:uppercase;}
+.nav li+.nav-header{margin-top:9px;}
+.nav-list{padding-left:15px;padding-right:15px;margin-bottom:0;}
+.nav-list>li>a,.nav-list .nav-header{margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}
+.nav-list>li>a{padding:3px 15px;}
+.nav-list>.active>a,.nav-list>.active>a:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0088cc;}
+.nav-list [class^="icon-"]{margin-right:2px;}
+.nav-list .divider{height:1px;margin:8px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;*width:100%;*margin:-5px 0 5px;}
+.nav-tabs,.nav-pills{*zoom:1;}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;content:"";}
+.nav-tabs:after,.nav-pills:after{clear:both;}
+.nav-tabs>li,.nav-pills>li{float:left;}
+.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;}
+.nav-tabs{border-bottom:1px solid #ddd;}
+.nav-tabs>li{margin-bottom:-1px;}
+.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:18px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;}
+.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;}
+.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#ffffff;background-color:#0088cc;}
+.nav-stacked>li{float:none;}
+.nav-stacked>li>a{margin-right:0;}
+.nav-tabs.nav-stacked{border-bottom:0;}
+.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}
+.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}
+.nav-tabs.nav-stacked>li>a:hover{border-color:#ddd;z-index:2;}
+.nav-pills.nav-stacked>li>a{margin-bottom:3px;}
+.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px;}
+.nav-tabs .dropdown-menu,.nav-pills .dropdown-menu{margin-top:1px;border-width:1px;}
+.nav-pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.nav-tabs .dropdown-toggle .caret,.nav-pills .dropdown-toggle .caret{border-top-color:#0088cc;border-bottom-color:#0088cc;margin-top:6px;}
+.nav-tabs .dropdown-toggle:hover .caret,.nav-pills .dropdown-toggle:hover .caret{border-top-color:#005580;border-bottom-color:#005580;}
+.nav-tabs .active .dropdown-toggle .caret,.nav-pills .active .dropdown-toggle .caret{border-top-color:#333333;border-bottom-color:#333333;}
+.nav>.dropdown.active>a:hover{color:#000000;cursor:pointer;}
+.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>.open.active>a:hover{color:#ffffff;background-color:#999999;border-color:#999999;}
+.nav .open .caret,.nav .open.active .caret,.nav .open a:hover .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;opacity:1;filter:alpha(opacity=100);}
+.tabs-stacked .open>a:hover{border-color:#999999;}
+.tabbable{*zoom:1;}.tabbable:before,.tabbable:after{display:table;content:"";}
+.tabbable:after{clear:both;}
+.tab-content{display:table;width:100%;}
+.tabs-below .nav-tabs,.tabs-right .nav-tabs,.tabs-left .nav-tabs{border-bottom:0;}
+.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;}
+.tab-content>.active,.pill-content>.active{display:block;}
+.tabs-below .nav-tabs{border-top:1px solid #ddd;}
+.tabs-below .nav-tabs>li{margin-top:-1px;margin-bottom:0;}
+.tabs-below .nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabs-below .nav-tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;}
+.tabs-below .nav-tabs .active>a,.tabs-below .nav-tabs .active>a:hover{border-color:transparent #ddd #ddd #ddd;}
+.tabs-left .nav-tabs>li,.tabs-right .nav-tabs>li{float:none;}
+.tabs-left .nav-tabs>li>a,.tabs-right .nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;}
+.tabs-left .nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd;}
+.tabs-left .nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;}
+.tabs-left .nav-tabs>li>a:hover{border-color:#eeeeee #dddddd #eeeeee #eeeeee;}
+.tabs-left .nav-tabs .active>a,.tabs-left .nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#ffffff;}
+.tabs-right .nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd;}
+.tabs-right .nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}
+.tabs-right .nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;}
+.tabs-right .nav-tabs .active>a,.tabs-right .nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;}
+.navbar{*position:relative;*z-index:2;overflow:visible;margin-bottom:18px;}
+.navbar-inner{padding-left:20px;padding-right:20px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
+.navbar .container{width:auto;}
+.btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);}.btn-navbar:hover,.btn-navbar:active,.btn-navbar.active,.btn-navbar.disabled,.btn-navbar[disabled]{background-color:#222222;}
+.btn-navbar:active,.btn-navbar.active{background-color:#080808 \9;}
+.btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);}
+.btn-navbar .icon-bar+.icon-bar{margin-top:3px;}
+.nav-collapse.collapse{height:auto;}
+.navbar{color:#999999;}.navbar .brand:hover{text-decoration:none;}
+.navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;}
+.navbar .navbar-text{margin-bottom:0;line-height:40px;}
+.navbar .btn,.navbar .btn-group{margin-top:5px;}
+.navbar .btn-group .btn{margin-top:0;}
+.navbar-form{margin-bottom:0;*zoom:1;}.navbar-form:before,.navbar-form:after{display:table;content:"";}
+.navbar-form:after{clear:both;}
+.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px;}
+.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
+.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px;}
+.navbar-form .input-append,.navbar-form .input-prepend{margin-top:6px;white-space:nowrap;}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0;}
+.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;background-color:#626262;border:1px solid #151515;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#cccccc;}
+.navbar-search .search-query::-webkit-input-placeholder{color:#cccccc;}
+.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
+.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0;}
+.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-left:0;padding-right:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px;}
+.navbar-fixed-top{top:0;}
+.navbar-fixed-bottom{bottom:0;}
+.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;}
+.navbar .nav.pull-right{float:right;}
+.navbar .nav>li{display:block;float:left;}
+.navbar .nav>li>a{float:none;padding:10px 10px 11px;line-height:19px;color:#999999;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
+.navbar .nav>li>a:hover{background-color:transparent;color:#ffffff;text-decoration:none;}
+.navbar .nav .active>a,.navbar .nav .active>a:hover{color:#ffffff;text-decoration:none;background-color:#222222;}
+.navbar .divider-vertical{height:40px;width:1px;margin:0 9px;overflow:hidden;background-color:#222222;border-right:1px solid #333333;}
+.navbar .nav.pull-right{margin-left:10px;margin-right:0;}
+.navbar .dropdown-menu{margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;}
+.navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;}
+.navbar-fixed-bottom .dropdown-menu:before{border-top:7px solid #ccc;border-top-color:rgba(0, 0, 0, 0.2);border-bottom:0;bottom:-7px;top:auto;}
+.navbar-fixed-bottom .dropdown-menu:after{border-top:6px solid #ffffff;border-bottom:0;bottom:-6px;top:auto;}
+.navbar .nav .dropdown-toggle .caret,.navbar .nav .open.dropdown .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;}
+.navbar .nav .active .caret{opacity:1;filter:alpha(opacity=100);}
+.navbar .nav .open>.dropdown-toggle,.navbar .nav .active>.dropdown-toggle,.navbar .nav .open.active>.dropdown-toggle{background-color:transparent;}
+.navbar .nav .active>.dropdown-toggle:hover{color:#ffffff;}
+.navbar .nav.pull-right .dropdown-menu,.navbar .nav .dropdown-menu.pull-right{left:auto;right:0;}.navbar .nav.pull-right .dropdown-menu:before,.navbar .nav .dropdown-menu.pull-right:before{left:auto;right:12px;}
+.navbar .nav.pull-right .dropdown-menu:after,.navbar .nav .dropdown-menu.pull-right:after{left:auto;right:13px;}
+.breadcrumb{padding:7px 14px;margin:0 0 18px;list-style:none;background-color:#fbfbfb;background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 0 #ffffff;}
+.breadcrumb .divider{padding:0 5px;color:#999999;}
+.breadcrumb .active a{color:#333333;}
+.pagination{height:36px;margin:18px 0;}
+.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);}
+.pagination li{display:inline;}
+.pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border:1px solid #ddd;border-left-width:0;}
+.pagination a:hover,.pagination .active a{background-color:#f5f5f5;}
+.pagination .active a{color:#999999;cursor:default;}
+.pagination .disabled span,.pagination .disabled a,.pagination .disabled a:hover{color:#999999;background-color:transparent;cursor:default;}
+.pagination li:first-child a{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.pagination li:last-child a{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+.pagination-centered{text-align:center;}
+.pagination-right{text-align:right;}
+.pager{margin-left:0;margin-bottom:18px;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";}
+.pager:after{clear:both;}
+.pager li{display:inline;}
+.pager a{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}
+.pager a:hover{text-decoration:none;background-color:#f5f5f5;}
+.pager .next a{float:right;}
+.pager .previous a{float:left;}
+.pager .disabled a,.pager .disabled a:hover{color:#999999;background-color:#fff;cursor:default;}
+.modal-open .dropdown-menu{z-index:2050;}
+.modal-open .dropdown.open{*z-index:2050;}
+.modal-open .popover{z-index:2060;}
+.modal-open .tooltip{z-index:2070;}
+.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000000;}.modal-backdrop.fade{opacity:0;}
+.modal-backdrop,.modal-backdrop.fade.in{opacity:0.8;filter:alpha(opacity=80);}
+.modal{position:fixed;top:50%;left:50%;z-index:1050;overflow:auto;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;}
+.modal.fade.in{top:50%;}
+.modal-header{padding:9px 15px;border-bottom:1px solid #eee;}.modal-header .close{margin-top:2px;}
+.modal-body{overflow-y:auto;max-height:400px;padding:15px;}
+.modal-form{margin-bottom:0;}
+.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";}
+.modal-footer:after{clear:both;}
+.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0;}
+.modal-footer .btn-group .btn+.btn{margin-left:-1px;}
+.tooltip{position:absolute;z-index:1020;display:block;visibility:visible;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);}.tooltip.in{opacity:0.8;filter:alpha(opacity=80);}
+.tooltip.top{margin-top:-2px;}
+.tooltip.right{margin-left:2px;}
+.tooltip.bottom{margin-top:2px;}
+.tooltip.left{margin-left:-2px;}
+.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
+.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
+.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
+.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
+.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.tooltip-arrow{position:absolute;width:0;height:0;}
+.popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px;}.popover.top{margin-top:-5px;}
+.popover.right{margin-left:5px;}
+.popover.bottom{margin-top:5px;}
+.popover.left{margin-left:-5px;}
+.popover.top .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
+.popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
+.popover.bottom .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
+.popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
+.popover .arrow{position:absolute;width:0;height:0;}
+.popover-inner{padding:3px;width:280px;overflow:hidden;background:#000000;background:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);}
+.popover-title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}
+.popover-content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover-content p,.popover-content ul,.popover-content ol{margin-bottom:0;}
+.thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";}
+.thumbnails:after{clear:both;}
+.thumbnails>li{float:left;margin:0 0 18px 20px;}
+.thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);}
+a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
+.thumbnail>img{display:block;max-width:100%;margin-left:auto;margin-right:auto;}
+.thumbnail .caption{padding:9px;}
+.label{padding:1px 4px 2px;font-size:10.998px;font-weight:bold;line-height:13px;color:#ffffff;vertical-align:middle;white-space:nowrap;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+.label:hover{color:#ffffff;text-decoration:none;}
+.label-important{background-color:#b94a48;}
+.label-important:hover{background-color:#953b39;}
+.label-warning{background-color:#f89406;}
+.label-warning:hover{background-color:#c67605;}
+.label-success{background-color:#468847;}
+.label-success:hover{background-color:#356635;}
+.label-info{background-color:#3a87ad;}
+.label-info:hover{background-color:#2d6987;}
+.label-inverse{background-color:#333333;}
+.label-inverse:hover{background-color:#1a1a1a;}
+.badge{padding:1px 9px 2px;font-size:12.025px;font-weight:bold;white-space:nowrap;color:#ffffff;background-color:#999999;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px;}
+.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;}
+.badge-error{background-color:#b94a48;}
+.badge-error:hover{background-color:#953b39;}
+.badge-warning{background-color:#f89406;}
+.badge-warning:hover{background-color:#c67605;}
+.badge-success{background-color:#468847;}
+.badge-success:hover{background-color:#356635;}
+.badge-info{background-color:#3a87ad;}
+.badge-info:hover{background-color:#2d6987;}
+.badge-inverse{background-color:#333333;}
+.badge-inverse:hover{background-color:#1a1a1a;}
+@-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@-ms-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress{overflow:hidden;height:18px;margin-bottom:18px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
+.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;}
+.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;}
+.progress-danger .bar{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);}
+.progress-danger.progress-striped .bar{background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.progress-success .bar{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);}
+.progress-success.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.progress-info .bar{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);}
+.progress-info.progress-striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.progress-warning .bar{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-ms-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(top, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);}
+.progress-warning.progress-striped .bar{background-color:#fbb450;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.accordion{margin-bottom:18px;}
+.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.accordion-heading{border-bottom:0;}
+.accordion-heading .accordion-toggle{display:block;padding:8px 15px;}
+.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;}
+.carousel{position:relative;margin-bottom:18px;line-height:1;}
+.carousel-inner{overflow:hidden;width:100%;position:relative;}
+.carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-ms-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;}
+.carousel .item>img{display:block;line-height:1;}
+.carousel .active,.carousel .next,.carousel .prev{display:block;}
+.carousel .active{left:0;}
+.carousel .next,.carousel .prev{position:absolute;top:0;width:100%;}
+.carousel .next{left:100%;}
+.carousel .prev{left:-100%;}
+.carousel .next.left,.carousel .prev.right{left:0;}
+.carousel .active.left{left:-100%;}
+.carousel .active.right{left:100%;}
+.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ffffff;text-align:center;background:#222222;border:3px solid #ffffff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:0.5;filter:alpha(opacity=50);}.carousel-control.right{left:auto;right:15px;}
+.carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);}
+.carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);}
+.carousel-caption h4,.carousel-caption p{color:#ffffff;}
+.hero-unit{padding:60px;margin-bottom:30px;background-color:#eeeeee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;}
+.hero-unit p{font-size:18px;font-weight:200;line-height:27px;color:inherit;}
+.pull-right{float:right;}
+.pull-left{float:left;}
+.hide{display:none;}
+.show{display:block;}
+.invisible{visibility:hidden;}

static/css/plugins/chosen/chosen.css

@@ -0,0 +1,429 @@
+/*!
+Chosen, a Select Box Enhancer for jQuery and Prototype
+by Patrick Filler for Harvest, http://getharvest.com
+
+Version 1.1.0
+Full source at https://github.com/harvesthq/chosen
+Copyright (c) 2011 Harvest http://getharvest.com
+
+MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
+This file is generated by `grunt build`, do not edit it by hand.
+*/
+
+/* @group Base */
+.chosen-container {
+    position: relative;
+    display: inline-block;
+    vertical-align: middle;
+    font-size: 13px;
+    zoom: 1;
+    *display: inline;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    user-select: none;
+}
+.chosen-container .chosen-drop {
+    position: absolute;
+    top: 100%;
+    left: -9999px;
+    z-index: 1010;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    width: 100%;
+    border: 1px solid #aaa;
+    border-top: 0;
+    background: #fff;
+    box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15);
+}
+.chosen-container.chosen-with-drop .chosen-drop {
+    left: 0;
+}
+.chosen-container a {
+    cursor: pointer;
+}
+
+/* @end */
+/* @group Single Chosen */
+.chosen-container-single .chosen-single {
+    position: relative;
+    display: block;
+    overflow: hidden;
+    padding: 0 0 0 8px;
+    height: 23px;
+    border: 1px solid #aaa;
+    border-radius: 5px;
+    background-color: #fff;
+    background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #ffffff), color-stop(50%, #f6f6f6), color-stop(52%, #eeeeee), color-stop(100%, #f4f4f4));
+    background: -webkit-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
+    background: -moz-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
+    background: -o-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
+    background: linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
+    background-clip: padding-box;
+    box-shadow: 0 0 3px white inset, 0 1px 1px rgba(0, 0, 0, 0.1);
+    color: #444;
+    text-decoration: none;
+    white-space: nowrap;
+    line-height: 24px;
+}
+.chosen-container-single .chosen-default {
+    color: #999;
+}
+.chosen-container-single .chosen-single span {
+    display: block;
+    overflow: hidden;
+    margin-right: 26px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+.chosen-container-single .chosen-single-with-deselect span {
+    margin-right: 38px;
+}
+.chosen-container-single .chosen-single abbr {
+    position: absolute;
+    top: 6px;
+    right: 26px;
+    display: block;
+    width: 12px;
+    height: 12px;
+    background: url('chosen-sprite.png') -42px 1px no-repeat;
+    font-size: 1px;
+}
+.chosen-container-single .chosen-single abbr:hover {
+    background-position: -42px -10px;
+}
+.chosen-container-single.chosen-disabled .chosen-single abbr:hover {
+    background-position: -42px -10px;
+}
+.chosen-container-single .chosen-single div {
+    position: absolute;
+    top: 0;
+    right: 0;
+    display: block;
+    width: 18px;
+    height: 100%;
+}
+.chosen-container-single .chosen-single div b {
+    display: block;
+    width: 100%;
+    height: 100%;
+    background: url('chosen-sprite.png') no-repeat 0px 2px;
+}
+.chosen-container-single .chosen-search {
+    position: relative;
+    z-index: 1010;
+    margin: 0;
+    padding: 3px 4px;
+    white-space: nowrap;
+}
+.chosen-container-single .chosen-search input[type="text"] {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    margin: 1px 0;
+    padding: 4px 20px 4px 5px;
+    width: 100%;
+    height: auto;
+    outline: 0;
+    border: 1px solid #aaa;
+    background: white url('chosen-sprite.png') no-repeat 100% -20px;
+    background: url('chosen-sprite.png') no-repeat 100% -20px;
+    font-size: 1em;
+    font-family: sans-serif;
+    line-height: normal;
+    border-radius: 0;
+}
+.chosen-container-single .chosen-drop {
+    margin-top: -1px;
+    border-radius: 0 0 4px 4px;
+    background-clip: padding-box;
+}
+.chosen-container-single.chosen-container-single-nosearch .chosen-search {
+    position: absolute;
+    left: -9999px;
+}
+
+/* @end */
+/* @group Results */
+.chosen-container .chosen-results {
+    position: relative;
+    overflow-x: hidden;
+    overflow-y: auto;
+    margin: 0 4px 4px 0;
+    padding: 0 0 0 4px;
+    max-height: 240px;
+    -webkit-overflow-scrolling: touch;
+}
+.chosen-container .chosen-results li {
+    display: none;
+    margin: 0;
+    padding: 5px 6px;
+    list-style: none;
+    line-height: 15px;
+    -webkit-touch-callout: none;
+}
+.chosen-container .chosen-results li.active-result {
+    display: list-item;
+    cursor: pointer;
+}
+.chosen-container .chosen-results li.disabled-result {
+    display: list-item;
+    color: #ccc;
+    cursor: default;
+}
+.chosen-container .chosen-results li.highlighted {
+    background-color: #3875d7;
+    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #3875d7), color-stop(90%, #2a62bc));
+    background-image: -webkit-linear-gradient(#3875d7 20%, #2a62bc 90%);
+    background-image: -moz-linear-gradient(#3875d7 20%, #2a62bc 90%);
+    background-image: -o-linear-gradient(#3875d7 20%, #2a62bc 90%);
+    background-image: linear-gradient(#3875d7 20%, #2a62bc 90%);
+    color: #fff;
+}
+.chosen-container .chosen-results li.no-results {
+    display: list-item;
+    background: #f4f4f4;
+}
+.chosen-container .chosen-results li.group-result {
+    display: list-item;
+    font-weight: bold;
+    cursor: default;
+}
+.chosen-container .chosen-results li.group-option {
+    padding-left: 15px;
+}
+.chosen-container .chosen-results li em {
+    font-style: normal;
+    text-decoration: underline;
+}
+
+/* @end */
+/* @group Multi Chosen */
+.chosen-container-multi .chosen-choices {
+    -moz-box-sizing: border-box;
+    background-color: #FFFFFF;
+    border: 1px solid #CBD5DD;
+    border-radius: 2px;
+    cursor: text;
+    height: auto !important;
+    margin: 0;
+    min-height: 30px;
+    overflow: hidden;
+    padding: 2px;
+    position: relative;
+    width: 100%;
+}
+.chosen-container-multi .chosen-choices li {
+    float: left;
+    list-style: none;
+}
+.chosen-container-multi .chosen-choices li.search-field {
+    margin: 0;
+    padding: 0;
+    white-space: nowrap;
+}
+.chosen-container-multi .chosen-choices li.search-field input[type="text"] {
+    margin: 1px 0;
+    padding: 5px;
+    height: 25px;
+    outline: 0;
+    border: 0 !important;
+    background: transparent !important;
+    box-shadow: none;
+    color: #666;
+    font-size: 100%;
+    font-family: sans-serif;
+    line-height: normal;
+    border-radius: 0;
+}
+.chosen-container-multi .chosen-choices li.search-field .default {
+    color: #999;
+}
+.chosen-container-multi .chosen-choices li.search-choice {
+    position: relative;
+    margin: 3px 0 3px 5px;
+    padding: 3px 20px 3px 5px;
+    border: 1px solid #aaa;
+    border-radius: 3px;
+    background-color: #e4e4e4;
+    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
+    background-image: -webkit-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+    background-image: -moz-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+    background-image: -o-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+    background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+    background-clip: padding-box;
+    box-shadow: 0 0 2px white inset, 0 1px 0 rgba(0, 0, 0, 0.05);
+    color: #333;
+    line-height: 13px;
+    cursor: default;
+}
+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close {
+    position: absolute;
+    top: 4px;
+    right: 3px;
+    display: block;
+    width: 12px;
+    height: 12px;
+    background: url('chosen-sprite.png') -42px 1px no-repeat;
+    font-size: 1px;
+}
+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover {
+    background-position: -42px -10px;
+}
+.chosen-container-multi .chosen-choices li.search-choice-disabled {
+    padding-right: 5px;
+    border: 1px solid #ccc;
+    background-color: #e4e4e4;
+    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
+    background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+    background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+    background-image: -o-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+    background-image: linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+    color: #666;
+}
+.chosen-container-multi .chosen-choices li.search-choice-focus {
+    background: #d4d4d4;
+}
+.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close {
+    background-position: -42px -10px;
+}
+.chosen-container-multi .chosen-results {
+    margin: 0;
+    padding: 0;
+}
+.chosen-container-multi .chosen-drop .result-selected {
+    display: list-item;
+    color: #ccc;
+    cursor: default;
+}
+
+/* @end */
+/* @group Active  */
+.chosen-container-active .chosen-single {
+    border: 1px solid #5897fb;
+    box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+}
+.chosen-container-active.chosen-with-drop .chosen-single {
+    border: 1px solid #aaa;
+    -moz-border-radius-bottomright: 0;
+    border-bottom-right-radius: 0;
+    -moz-border-radius-bottomleft: 0;
+    border-bottom-left-radius: 0;
+    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #eeeeee), color-stop(80%, #ffffff));
+    background-image: -webkit-linear-gradient(#eeeeee 20%, #ffffff 80%);
+    background-image: -moz-linear-gradient(#eeeeee 20%, #ffffff 80%);
+    background-image: -o-linear-gradient(#eeeeee 20%, #ffffff 80%);
+    background-image: linear-gradient(#eeeeee 20%, #ffffff 80%);
+    box-shadow: 0 1px 0 #fff inset;
+}
+.chosen-container-active.chosen-with-drop .chosen-single div {
+    border-left: none;
+    background: transparent;
+}
+.chosen-container-active.chosen-with-drop .chosen-single div b {
+    background-position: -18px 2px;
+}
+.chosen-container-active .chosen-choices {
+    border: 1px solid #5897fb;
+    box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+}
+.chosen-container-active .chosen-choices li.search-field input[type="text"] {
+    color: #111 !important;
+}
+
+/* @end */
+/* @group Disabled Support */
+.chosen-disabled {
+    opacity: 0.5 !important;
+    cursor: default;
+}
+.chosen-disabled .chosen-single {
+    cursor: default;
+}
+.chosen-disabled .chosen-choices .search-choice .search-choice-close {
+    cursor: default;
+}
+
+/* @end */
+/* @group Right to Left */
+.chosen-rtl {
+    text-align: right;
+}
+.chosen-rtl .chosen-single {
+    overflow: visible;
+    padding: 0 8px 0 0;
+}
+.chosen-rtl .chosen-single span {
+    margin-right: 0;
+    margin-left: 26px;
+    direction: rtl;
+}
+.chosen-rtl .chosen-single-with-deselect span {
+    margin-left: 38px;
+}
+.chosen-rtl .chosen-single div {
+    right: auto;
+    left: 3px;
+}
+.chosen-rtl .chosen-single abbr {
+    right: auto;
+    left: 26px;
+}
+.chosen-rtl .chosen-choices li {
+    float: right;
+}
+.chosen-rtl .chosen-choices li.search-field input[type="text"] {
+    direction: rtl;
+}
+.chosen-rtl .chosen-choices li.search-choice {
+    margin: 3px 5px 3px 0;
+    padding: 3px 5px 3px 19px;
+}
+.chosen-rtl .chosen-choices li.search-choice .search-choice-close {
+    right: auto;
+    left: 4px;
+}
+.chosen-rtl.chosen-container-single-nosearch .chosen-search,
+.chosen-rtl .chosen-drop {
+    left: 9999px;
+}
+.chosen-rtl.chosen-container-single .chosen-results {
+    margin: 0 0 4px 4px;
+    padding: 0 4px 0 0;
+}
+.chosen-rtl .chosen-results li.group-option {
+    padding-right: 15px;
+    padding-left: 0;
+}
+.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div {
+    border-right: none;
+}
+.chosen-rtl .chosen-search input[type="text"] {
+    padding: 4px 5px 4px 20px;
+    background: white url('chosen-sprite.png') no-repeat -30px -20px;
+    background: url('chosen-sprite.png') no-repeat -30px -20px;
+    direction: rtl;
+}
+.chosen-rtl.chosen-container-single .chosen-single div b {
+    background-position: 6px 2px;
+}
+.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b {
+    background-position: -12px 2px;
+}
+
+/* @end */
+/* @group Retina compatibility */
+@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-resolution: 144dpi) {
+    .chosen-rtl .chosen-search input[type="text"],
+    .chosen-container-single .chosen-single abbr,
+    .chosen-container-single .chosen-single div b,
+    .chosen-container-single .chosen-search input[type="text"],
+    .chosen-container-multi .chosen-choices .search-choice .search-choice-close,
+    .chosen-container .chosen-results-scroll-down span,
+    .chosen-container .chosen-results-scroll-up span {
+        background-image: url('chosen-sprite@2x.png') !important;
+        background-size: 52px 37px !important;
+        background-repeat: no-repeat !important;
+    }
+}
+/* @end */

static/css/plugins/datapicker/datepicker3.css

@@ -0,0 +1,789 @@
+/*!
+ * Datepicker for Bootstrap
+ *
+ * Copyright 2012 Stefan Petre
+ * Improvements by Andrew Rowls
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ */
+.datepicker {
+  padding: 4px;
+  border-radius: 4px;
+  direction: ltr;
+  /*.dow {
+		border-top: 1px solid #ddd !important;
+	}*/
+}
+.datepicker-inline {
+  width: 220px;
+}
+.datepicker.datepicker-rtl {
+  direction: rtl;
+}
+.datepicker.datepicker-rtl table tr td span {
+  float: right;
+}
+.datepicker-dropdown {
+  top: 0;
+  left: 0;
+}
+.datepicker-dropdown:before {
+  content: '';
+  display: inline-block;
+  border-left: 7px solid transparent;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-top: 0;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  position: absolute;
+}
+.datepicker-dropdown:after {
+  content: '';
+  display: inline-block;
+  border-left: 6px solid transparent;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-top: 0;
+  position: absolute;
+}
+.datepicker-dropdown.datepicker-orient-left:before {
+  left: 6px;
+}
+.datepicker-dropdown.datepicker-orient-left:after {
+  left: 7px;
+}
+.datepicker-dropdown.datepicker-orient-right:before {
+  right: 6px;
+}
+.datepicker-dropdown.datepicker-orient-right:after {
+  right: 7px;
+}
+.datepicker-dropdown.datepicker-orient-top:before {
+  top: -7px;
+}
+.datepicker-dropdown.datepicker-orient-top:after {
+  top: -6px;
+}
+.datepicker-dropdown.datepicker-orient-bottom:before {
+  bottom: -7px;
+  border-bottom: 0;
+  border-top: 7px solid #999;
+}
+.datepicker-dropdown.datepicker-orient-bottom:after {
+  bottom: -6px;
+  border-bottom: 0;
+  border-top: 6px solid #fff;
+}
+.datepicker > div {
+  display: none;
+}
+.datepicker.days div.datepicker-days {
+  display: block;
+}
+.datepicker.months div.datepicker-months {
+  display: block;
+}
+.datepicker.years div.datepicker-years {
+  display: block;
+}
+.datepicker table {
+  margin: 0;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.datepicker table tr td,
+.datepicker table tr th {
+  text-align: center;
+  width: 30px;
+  height: 30px;
+  border-radius: 4px;
+  border: none;
+}
+.table-striped .datepicker table tr td,
+.table-striped .datepicker table tr th {
+  background-color: transparent;
+}
+.datepicker table tr td.day:hover,
+.datepicker table tr td.day.focused {
+  background: #eeeeee;
+  cursor: pointer;
+}
+.datepicker table tr td.old,
+.datepicker table tr td.new {
+  color: #999999;
+}
+.datepicker table tr td.disabled,
+.datepicker table tr td.disabled:hover {
+  background: none;
+  color: #999999;
+  cursor: default;
+}
+.datepicker table tr td.today,
+.datepicker table tr td.today:hover,
+.datepicker table tr td.today.disabled,
+.datepicker table tr td.today.disabled:hover {
+  color: #000000;
+  background-color: #ffdb99;
+  border-color: #ffb733;
+}
+.datepicker table tr td.today:hover,
+.datepicker table tr td.today:hover:hover,
+.datepicker table tr td.today.disabled:hover,
+.datepicker table tr td.today.disabled:hover:hover,
+.datepicker table tr td.today:focus,
+.datepicker table tr td.today:hover:focus,
+.datepicker table tr td.today.disabled:focus,
+.datepicker table tr td.today.disabled:hover:focus,
+.datepicker table tr td.today:active,
+.datepicker table tr td.today:hover:active,
+.datepicker table tr td.today.disabled:active,
+.datepicker table tr td.today.disabled:hover:active,
+.datepicker table tr td.today.active,
+.datepicker table tr td.today:hover.active,
+.datepicker table tr td.today.disabled.active,
+.datepicker table tr td.today.disabled:hover.active,
+.open .dropdown-toggle.datepicker table tr td.today,
+.open .dropdown-toggle.datepicker table tr td.today:hover,
+.open .dropdown-toggle.datepicker table tr td.today.disabled,
+.open .dropdown-toggle.datepicker table tr td.today.disabled:hover {
+  color: #000000;
+  background-color: #ffcd70;
+  border-color: #f59e00;
+}
+.datepicker table tr td.today:active,
+.datepicker table tr td.today:hover:active,
+.datepicker table tr td.today.disabled:active,
+.datepicker table tr td.today.disabled:hover:active,
+.datepicker table tr td.today.active,
+.datepicker table tr td.today:hover.active,
+.datepicker table tr td.today.disabled.active,
+.datepicker table tr td.today.disabled:hover.active,
+.open .dropdown-toggle.datepicker table tr td.today,
+.open .dropdown-toggle.datepicker table tr td.today:hover,
+.open .dropdown-toggle.datepicker table tr td.today.disabled,
+.open .dropdown-toggle.datepicker table tr td.today.disabled:hover {
+  background-image: none;
+}
+.datepicker table tr td.today.disabled,
+.datepicker table tr td.today:hover.disabled,
+.datepicker table tr td.today.disabled.disabled,
+.datepicker table tr td.today.disabled:hover.disabled,
+.datepicker table tr td.today[disabled],
+.datepicker table tr td.today:hover[disabled],
+.datepicker table tr td.today.disabled[disabled],
+.datepicker table tr td.today.disabled:hover[disabled],
+fieldset[disabled] .datepicker table tr td.today,
+fieldset[disabled] .datepicker table tr td.today:hover,
+fieldset[disabled] .datepicker table tr td.today.disabled,
+fieldset[disabled] .datepicker table tr td.today.disabled:hover,
+.datepicker table tr td.today.disabled:hover,
+.datepicker table tr td.today:hover.disabled:hover,
+.datepicker table tr td.today.disabled.disabled:hover,
+.datepicker table tr td.today.disabled:hover.disabled:hover,
+.datepicker table tr td.today[disabled]:hover,
+.datepicker table tr td.today:hover[disabled]:hover,
+.datepicker table tr td.today.disabled[disabled]:hover,
+.datepicker table tr td.today.disabled:hover[disabled]:hover,
+fieldset[disabled] .datepicker table tr td.today:hover,
+fieldset[disabled] .datepicker table tr td.today:hover:hover,
+fieldset[disabled] .datepicker table tr td.today.disabled:hover,
+fieldset[disabled] .datepicker table tr td.today.disabled:hover:hover,
+.datepicker table tr td.today.disabled:focus,
+.datepicker table tr td.today:hover.disabled:focus,
+.datepicker table tr td.today.disabled.disabled:focus,
+.datepicker table tr td.today.disabled:hover.disabled:focus,
+.datepicker table tr td.today[disabled]:focus,
+.datepicker table tr td.today:hover[disabled]:focus,
+.datepicker table tr td.today.disabled[disabled]:focus,
+.datepicker table tr td.today.disabled:hover[disabled]:focus,
+fieldset[disabled] .datepicker table tr td.today:focus,
+fieldset[disabled] .datepicker table tr td.today:hover:focus,
+fieldset[disabled] .datepicker table tr td.today.disabled:focus,
+fieldset[disabled] .datepicker table tr td.today.disabled:hover:focus,
+.datepicker table tr td.today.disabled:active,
+.datepicker table tr td.today:hover.disabled:active,
+.datepicker table tr td.today.disabled.disabled:active,
+.datepicker table tr td.today.disabled:hover.disabled:active,
+.datepicker table tr td.today[disabled]:active,
+.datepicker table tr td.today:hover[disabled]:active,
+.datepicker table tr td.today.disabled[disabled]:active,
+.datepicker table tr td.today.disabled:hover[disabled]:active,
+fieldset[disabled] .datepicker table tr td.today:active,
+fieldset[disabled] .datepicker table tr td.today:hover:active,
+fieldset[disabled] .datepicker table tr td.today.disabled:active,
+fieldset[disabled] .datepicker table tr td.today.disabled:hover:active,
+.datepicker table tr td.today.disabled.active,
+.datepicker table tr td.today:hover.disabled.active,
+.datepicker table tr td.today.disabled.disabled.active,
+.datepicker table tr td.today.disabled:hover.disabled.active,
+.datepicker table tr td.today[disabled].active,
+.datepicker table tr td.today:hover[disabled].active,
+.datepicker table tr td.today.disabled[disabled].active,
+.datepicker table tr td.today.disabled:hover[disabled].active,
+fieldset[disabled] .datepicker table tr td.today.active,
+fieldset[disabled] .datepicker table tr td.today:hover.active,
+fieldset[disabled] .datepicker table tr td.today.disabled.active,
+fieldset[disabled] .datepicker table tr td.today.disabled:hover.active {
+  background-color: #ffdb99;
+  border-color: #ffb733;
+}
+.datepicker table tr td.today:hover:hover {
+  color: #000;
+}
+.datepicker table tr td.today.active:hover {
+  color: #fff;
+}
+.datepicker table tr td.range,
+.datepicker table tr td.range:hover,
+.datepicker table tr td.range.disabled,
+.datepicker table tr td.range.disabled:hover {
+  background: #eeeeee;
+  border-radius: 0;
+}
+.datepicker table tr td.range.today,
+.datepicker table tr td.range.today:hover,
+.datepicker table tr td.range.today.disabled,
+.datepicker table tr td.range.today.disabled:hover {
+  color: #000000;
+  background-color: #f7ca77;
+  border-color: #f1a417;
+  border-radius: 0;
+}
+.datepicker table tr td.range.today:hover,
+.datepicker table tr td.range.today:hover:hover,
+.datepicker table tr td.range.today.disabled:hover,
+.datepicker table tr td.range.today.disabled:hover:hover,
+.datepicker table tr td.range.today:focus,
+.datepicker table tr td.range.today:hover:focus,
+.datepicker table tr td.range.today.disabled:focus,
+.datepicker table tr td.range.today.disabled:hover:focus,
+.datepicker table tr td.range.today:active,
+.datepicker table tr td.range.today:hover:active,
+.datepicker table tr td.range.today.disabled:active,
+.datepicker table tr td.range.today.disabled:hover:active,
+.datepicker table tr td.range.today.active,
+.datepicker table tr td.range.today:hover.active,
+.datepicker table tr td.range.today.disabled.active,
+.datepicker table tr td.range.today.disabled:hover.active,
+.open .dropdown-toggle.datepicker table tr td.range.today,
+.open .dropdown-toggle.datepicker table tr td.range.today:hover,
+.open .dropdown-toggle.datepicker table tr td.range.today.disabled,
+.open .dropdown-toggle.datepicker table tr td.range.today.disabled:hover {
+  color: #000000;
+  background-color: #f4bb51;
+  border-color: #bf800c;
+}
+.datepicker table tr td.range.today:active,
+.datepicker table tr td.range.today:hover:active,
+.datepicker table tr td.range.today.disabled:active,
+.datepicker table tr td.range.today.disabled:hover:active,
+.datepicker table tr td.range.today.active,
+.datepicker table tr td.range.today:hover.active,
+.datepicker table tr td.range.today.disabled.active,
+.datepicker table tr td.range.today.disabled:hover.active,
+.open .dropdown-toggle.datepicker table tr td.range.today,
+.open .dropdown-toggle.datepicker table tr td.range.today:hover,
+.open .dropdown-toggle.datepicker table tr td.range.today.disabled,
+.open .dropdown-toggle.datepicker table tr td.range.today.disabled:hover {
+  background-image: none;
+}
+.datepicker table tr td.range.today.disabled,
+.datepicker table tr td.range.today:hover.disabled,
+.datepicker table tr td.range.today.disabled.disabled,
+.datepicker table tr td.range.today.disabled:hover.disabled,
+.datepicker table tr td.range.today[disabled],
+.datepicker table tr td.range.today:hover[disabled],
+.datepicker table tr td.range.today.disabled[disabled],
+.datepicker table tr td.range.today.disabled:hover[disabled],
+fieldset[disabled] .datepicker table tr td.range.today,
+fieldset[disabled] .datepicker table tr td.range.today:hover,
+fieldset[disabled] .datepicker table tr td.range.today.disabled,
+fieldset[disabled] .datepicker table tr td.range.today.disabled:hover,
+.datepicker table tr td.range.today.disabled:hover,
+.datepicker table tr td.range.today:hover.disabled:hover,
+.datepicker table tr td.range.today.disabled.disabled:hover,
+.datepicker table tr td.range.today.disabled:hover.disabled:hover,
+.datepicker table tr td.range.today[disabled]:hover,
+.datepicker table tr td.range.today:hover[disabled]:hover,
+.datepicker table tr td.range.today.disabled[disabled]:hover,
+.datepicker table tr td.range.today.disabled:hover[disabled]:hover,
+fieldset[disabled] .datepicker table tr td.range.today:hover,
+fieldset[disabled] .datepicker table tr td.range.today:hover:hover,
+fieldset[disabled] .datepicker table tr td.range.today.disabled:hover,
+fieldset[disabled] .datepicker table tr td.range.today.disabled:hover:hover,
+.datepicker table tr td.range.today.disabled:focus,
+.datepicker table tr td.range.today:hover.disabled:focus,
+.datepicker table tr td.range.today.disabled.disabled:focus,
+.datepicker table tr td.range.today.disabled:hover.disabled:focus,
+.datepicker table tr td.range.today[disabled]:focus,
+.datepicker table tr td.range.today:hover[disabled]:focus,
+.datepicker table tr td.range.today.disabled[disabled]:focus,
+.datepicker table tr td.range.today.disabled:hover[disabled]:focus,
+fieldset[disabled] .datepicker table tr td.range.today:focus,
+fieldset[disabled] .datepicker table tr td.range.today:hover:focus,
+fieldset[disabled] .datepicker table tr td.range.today.disabled:focus,
+fieldset[disabled] .datepicker table tr td.range.today.disabled:hover:focus,
+.datepicker table tr td.range.today.disabled:active,
+.datepicker table tr td.range.today:hover.disabled:active,
+.datepicker table tr td.range.today.disabled.disabled:active,
+.datepicker table tr td.range.today.disabled:hover.disabled:active,
+.datepicker table tr td.range.today[disabled]:active,
+.datepicker table tr td.range.today:hover[disabled]:active,
+.datepicker table tr td.range.today.disabled[disabled]:active,
+.datepicker table tr td.range.today.disabled:hover[disabled]:active,
+fieldset[disabled] .datepicker table tr td.range.today:active,
+fieldset[disabled] .datepicker table tr td.range.today:hover:active,
+fieldset[disabled] .datepicker table tr td.range.today.disabled:active,
+fieldset[disabled] .datepicker table tr td.range.today.disabled:hover:active,
+.datepicker table tr td.range.today.disabled.active,
+.datepicker table tr td.range.today:hover.disabled.active,
+.datepicker table tr td.range.today.disabled.disabled.active,
+.datepicker table tr td.range.today.disabled:hover.disabled.active,
+.datepicker table tr td.range.today[disabled].active,
+.datepicker table tr td.range.today:hover[disabled].active,
+.datepicker table tr td.range.today.disabled[disabled].active,
+.datepicker table tr td.range.today.disabled:hover[disabled].active,
+fieldset[disabled] .datepicker table tr td.range.today.active,
+fieldset[disabled] .datepicker table tr td.range.today:hover.active,
+fieldset[disabled] .datepicker table tr td.range.today.disabled.active,
+fieldset[disabled] .datepicker table tr td.range.today.disabled:hover.active {
+  background-color: #f7ca77;
+  border-color: #f1a417;
+}
+.datepicker table tr td.selected,
+.datepicker table tr td.selected:hover,
+.datepicker table tr td.selected.disabled,
+.datepicker table tr td.selected.disabled:hover {
+  color: #ffffff;
+  background-color: #999999;
+  border-color: #555555;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.datepicker table tr td.selected:hover,
+.datepicker table tr td.selected:hover:hover,
+.datepicker table tr td.selected.disabled:hover,
+.datepicker table tr td.selected.disabled:hover:hover,
+.datepicker table tr td.selected:focus,
+.datepicker table tr td.selected:hover:focus,
+.datepicker table tr td.selected.disabled:focus,
+.datepicker table tr td.selected.disabled:hover:focus,
+.datepicker table tr td.selected:active,
+.datepicker table tr td.selected:hover:active,
+.datepicker table tr td.selected.disabled:active,
+.datepicker table tr td.selected.disabled:hover:active,
+.datepicker table tr td.selected.active,
+.datepicker table tr td.selected:hover.active,
+.datepicker table tr td.selected.disabled.active,
+.datepicker table tr td.selected.disabled:hover.active,
+.open .dropdown-toggle.datepicker table tr td.selected,
+.open .dropdown-toggle.datepicker table tr td.selected:hover,
+.open .dropdown-toggle.datepicker table tr td.selected.disabled,
+.open .dropdown-toggle.datepicker table tr td.selected.disabled:hover {
+  color: #ffffff;
+  background-color: #858585;
+  border-color: #373737;
+}
+.datepicker table tr td.selected:active,
+.datepicker table tr td.selected:hover:active,
+.datepicker table tr td.selected.disabled:active,
+.datepicker table tr td.selected.disabled:hover:active,
+.datepicker table tr td.selected.active,
+.datepicker table tr td.selected:hover.active,
+.datepicker table tr td.selected.disabled.active,
+.datepicker table tr td.selected.disabled:hover.active,
+.open .dropdown-toggle.datepicker table tr td.selected,
+.open .dropdown-toggle.datepicker table tr td.selected:hover,
+.open .dropdown-toggle.datepicker table tr td.selected.disabled,
+.open .dropdown-toggle.datepicker table tr td.selected.disabled:hover {
+  background-image: none;
+}
+.datepicker table tr td.selected.disabled,
+.datepicker table tr td.selected:hover.disabled,
+.datepicker table tr td.selected.disabled.disabled,
+.datepicker table tr td.selected.disabled:hover.disabled,
+.datepicker table tr td.selected[disabled],
+.datepicker table tr td.selected:hover[disabled],
+.datepicker table tr td.selected.disabled[disabled],
+.datepicker table tr td.selected.disabled:hover[disabled],
+fieldset[disabled] .datepicker table tr td.selected,
+fieldset[disabled] .datepicker table tr td.selected:hover,
+fieldset[disabled] .datepicker table tr td.selected.disabled,
+fieldset[disabled] .datepicker table tr td.selected.disabled:hover,
+.datepicker table tr td.selected.disabled:hover,
+.datepicker table tr td.selected:hover.disabled:hover,
+.datepicker table tr td.selected.disabled.disabled:hover,
+.datepicker table tr td.selected.disabled:hover.disabled:hover,
+.datepicker table tr td.selected[disabled]:hover,
+.datepicker table tr td.selected:hover[disabled]:hover,
+.datepicker table tr td.selected.disabled[disabled]:hover,
+.datepicker table tr td.selected.disabled:hover[disabled]:hover,
+fieldset[disabled] .datepicker table tr td.selected:hover,
+fieldset[disabled] .datepicker table tr td.selected:hover:hover,
+fieldset[disabled] .datepicker table tr td.selected.disabled:hover,
+fieldset[disabled] .datepicker table tr td.selected.disabled:hover:hover,
+.datepicker table tr td.selected.disabled:focus,
+.datepicker table tr td.selected:hover.disabled:focus,
+.datepicker table tr td.selected.disabled.disabled:focus,
+.datepicker table tr td.selected.disabled:hover.disabled:focus,
+.datepicker table tr td.selected[disabled]:focus,
+.datepicker table tr td.selected:hover[disabled]:focus,
+.datepicker table tr td.selected.disabled[disabled]:focus,
+.datepicker table tr td.selected.disabled:hover[disabled]:focus,
+fieldset[disabled] .datepicker table tr td.selected:focus,
+fieldset[disabled] .datepicker table tr td.selected:hover:focus,
+fieldset[disabled] .datepicker table tr td.selected.disabled:focus,
+fieldset[disabled] .datepicker table tr td.selected.disabled:hover:focus,
+.datepicker table tr td.selected.disabled:active,
+.datepicker table tr td.selected:hover.disabled:active,
+.datepicker table tr td.selected.disabled.disabled:active,
+.datepicker table tr td.selected.disabled:hover.disabled:active,
+.datepicker table tr td.selected[disabled]:active,
+.datepicker table tr td.selected:hover[disabled]:active,
+.datepicker table tr td.selected.disabled[disabled]:active,
+.datepicker table tr td.selected.disabled:hover[disabled]:active,
+fieldset[disabled] .datepicker table tr td.selected:active,
+fieldset[disabled] .datepicker table tr td.selected:hover:active,
+fieldset[disabled] .datepicker table tr td.selected.disabled:active,
+fieldset[disabled] .datepicker table tr td.selected.disabled:hover:active,
+.datepicker table tr td.selected.disabled.active,
+.datepicker table tr td.selected:hover.disabled.active,
+.datepicker table tr td.selected.disabled.disabled.active,
+.datepicker table tr td.selected.disabled:hover.disabled.active,
+.datepicker table tr td.selected[disabled].active,
+.datepicker table tr td.selected:hover[disabled].active,
+.datepicker table tr td.selected.disabled[disabled].active,
+.datepicker table tr td.selected.disabled:hover[disabled].active,
+fieldset[disabled] .datepicker table tr td.selected.active,
+fieldset[disabled] .datepicker table tr td.selected:hover.active,
+fieldset[disabled] .datepicker table tr td.selected.disabled.active,
+fieldset[disabled] .datepicker table tr td.selected.disabled:hover.active {
+  background-color: #999999;
+  border-color: #555555;
+}
+.datepicker table tr td.active,
+.datepicker table tr td.active:hover,
+.datepicker table tr td.active.disabled,
+.datepicker table tr td.active.disabled:hover {
+  color: #ffffff;
+  background-color: #428bca;
+  border-color: #357ebd;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.datepicker table tr td.active:hover,
+.datepicker table tr td.active:hover:hover,
+.datepicker table tr td.active.disabled:hover,
+.datepicker table tr td.active.disabled:hover:hover,
+.datepicker table tr td.active:focus,
+.datepicker table tr td.active:hover:focus,
+.datepicker table tr td.active.disabled:focus,
+.datepicker table tr td.active.disabled:hover:focus,
+.datepicker table tr td.active:active,
+.datepicker table tr td.active:hover:active,
+.datepicker table tr td.active.disabled:active,
+.datepicker table tr td.active.disabled:hover:active,
+.datepicker table tr td.active.active,
+.datepicker table tr td.active:hover.active,
+.datepicker table tr td.active.disabled.active,
+.datepicker table tr td.active.disabled:hover.active,
+.open .dropdown-toggle.datepicker table tr td.active,
+.open .dropdown-toggle.datepicker table tr td.active:hover,
+.open .dropdown-toggle.datepicker table tr td.active.disabled,
+.open .dropdown-toggle.datepicker table tr td.active.disabled:hover {
+  color: #ffffff;
+  background-color: #3276b1;
+  border-color: #285e8e;
+}
+.datepicker table tr td.active:active,
+.datepicker table tr td.active:hover:active,
+.datepicker table tr td.active.disabled:active,
+.datepicker table tr td.active.disabled:hover:active,
+.datepicker table tr td.active.active,
+.datepicker table tr td.active:hover.active,
+.datepicker table tr td.active.disabled.active,
+.datepicker table tr td.active.disabled:hover.active,
+.open .dropdown-toggle.datepicker table tr td.active,
+.open .dropdown-toggle.datepicker table tr td.active:hover,
+.open .dropdown-toggle.datepicker table tr td.active.disabled,
+.open .dropdown-toggle.datepicker table tr td.active.disabled:hover {
+  background-image: none;
+}
+.datepicker table tr td.active.disabled,
+.datepicker table tr td.active:hover.disabled,
+.datepicker table tr td.active.disabled.disabled,
+.datepicker table tr td.active.disabled:hover.disabled,
+.datepicker table tr td.active[disabled],
+.datepicker table tr td.active:hover[disabled],
+.datepicker table tr td.active.disabled[disabled],
+.datepicker table tr td.active.disabled:hover[disabled],
+fieldset[disabled] .datepicker table tr td.active,
+fieldset[disabled] .datepicker table tr td.active:hover,
+fieldset[disabled] .datepicker table tr td.active.disabled,
+fieldset[disabled] .datepicker table tr td.active.disabled:hover,
+.datepicker table tr td.active.disabled:hover,
+.datepicker table tr td.active:hover.disabled:hover,
+.datepicker table tr td.active.disabled.disabled:hover,
+.datepicker table tr td.active.disabled:hover.disabled:hover,
+.datepicker table tr td.active[disabled]:hover,
+.datepicker table tr td.active:hover[disabled]:hover,
+.datepicker table tr td.active.disabled[disabled]:hover,
+.datepicker table tr td.active.disabled:hover[disabled]:hover,
+fieldset[disabled] .datepicker table tr td.active:hover,
+fieldset[disabled] .datepicker table tr td.active:hover:hover,
+fieldset[disabled] .datepicker table tr td.active.disabled:hover,
+fieldset[disabled] .datepicker table tr td.active.disabled:hover:hover,
+.datepicker table tr td.active.disabled:focus,
+.datepicker table tr td.active:hover.disabled:focus,
+.datepicker table tr td.active.disabled.disabled:focus,
+.datepicker table tr td.active.disabled:hover.disabled:focus,
+.datepicker table tr td.active[disabled]:focus,
+.datepicker table tr td.active:hover[disabled]:focus,
+.datepicker table tr td.active.disabled[disabled]:focus,
+.datepicker table tr td.active.disabled:hover[disabled]:focus,
+fieldset[disabled] .datepicker table tr td.active:focus,
+fieldset[disabled] .datepicker table tr td.active:hover:focus,
+fieldset[disabled] .datepicker table tr td.active.disabled:focus,
+fieldset[disabled] .datepicker table tr td.active.disabled:hover:focus,
+.datepicker table tr td.active.disabled:active,
+.datepicker table tr td.active:hover.disabled:active,
+.datepicker table tr td.active.disabled.disabled:active,
+.datepicker table tr td.active.disabled:hover.disabled:active,
+.datepicker table tr td.active[disabled]:active,
+.datepicker table tr td.active:hover[disabled]:active,
+.datepicker table tr td.active.disabled[disabled]:active,
+.datepicker table tr td.active.disabled:hover[disabled]:active,
+fieldset[disabled] .datepicker table tr td.active:active,
+fieldset[disabled] .datepicker table tr td.active:hover:active,
+fieldset[disabled] .datepicker table tr td.active.disabled:active,
+fieldset[disabled] .datepicker table tr td.active.disabled:hover:active,
+.datepicker table tr td.active.disabled.active,
+.datepicker table tr td.active:hover.disabled.active,
+.datepicker table tr td.active.disabled.disabled.active,
+.datepicker table tr td.active.disabled:hover.disabled.active,
+.datepicker table tr td.active[disabled].active,
+.datepicker table tr td.active:hover[disabled].active,
+.datepicker table tr td.active.disabled[disabled].active,
+.datepicker table tr td.active.disabled:hover[disabled].active,
+fieldset[disabled] .datepicker table tr td.active.active,
+fieldset[disabled] .datepicker table tr td.active:hover.active,
+fieldset[disabled] .datepicker table tr td.active.disabled.active,
+fieldset[disabled] .datepicker table tr td.active.disabled:hover.active {
+  background-color: #428bca;
+  border-color: #357ebd;
+}
+.datepicker table tr td span {
+  display: block;
+  width: 23%;
+  height: 54px;
+  line-height: 54px;
+  float: left;
+  margin: 1%;
+  cursor: pointer;
+  border-radius: 4px;
+}
+.datepicker table tr td span:hover {
+  background: #eeeeee;
+}
+.datepicker table tr td span.disabled,
+.datepicker table tr td span.disabled:hover {
+  background: none;
+  color: #999999;
+  cursor: default;
+}
+.datepicker table tr td span.active,
+.datepicker table tr td span.active:hover,
+.datepicker table tr td span.active.disabled,
+.datepicker table tr td span.active.disabled:hover {
+  color: #ffffff;
+  background-color: #428bca;
+  border-color: #357ebd;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.datepicker table tr td span.active:hover,
+.datepicker table tr td span.active:hover:hover,
+.datepicker table tr td span.active.disabled:hover,
+.datepicker table tr td span.active.disabled:hover:hover,
+.datepicker table tr td span.active:focus,
+.datepicker table tr td span.active:hover:focus,
+.datepicker table tr td span.active.disabled:focus,
+.datepicker table tr td span.active.disabled:hover:focus,
+.datepicker table tr td span.active:active,
+.datepicker table tr td span.active:hover:active,
+.datepicker table tr td span.active.disabled:active,
+.datepicker table tr td span.active.disabled:hover:active,
+.datepicker table tr td span.active.active,
+.datepicker table tr td span.active:hover.active,
+.datepicker table tr td span.active.disabled.active,
+.datepicker table tr td span.active.disabled:hover.active,
+.open .dropdown-toggle.datepicker table tr td span.active,
+.open .dropdown-toggle.datepicker table tr td span.active:hover,
+.open .dropdown-toggle.datepicker table tr td span.active.disabled,
+.open .dropdown-toggle.datepicker table tr td span.active.disabled:hover {
+  color: #ffffff;
+  background-color: #3276b1;
+  border-color: #285e8e;
+}
+.datepicker table tr td span.active:active,
+.datepicker table tr td span.active:hover:active,
+.datepicker table tr td span.active.disabled:active,
+.datepicker table tr td span.active.disabled:hover:active,
+.datepicker table tr td span.active.active,
+.datepicker table tr td span.active:hover.active,
+.datepicker table tr td span.active.disabled.active,
+.datepicker table tr td span.active.disabled:hover.active,
+.open .dropdown-toggle.datepicker table tr td span.active,
+.open .dropdown-toggle.datepicker table tr td span.active:hover,
+.open .dropdown-toggle.datepicker table tr td span.active.disabled,
+.open .dropdown-toggle.datepicker table tr td span.active.disabled:hover {
+  background-image: none;
+}
+.datepicker table tr td span.active.disabled,
+.datepicker table tr td span.active:hover.disabled,
+.datepicker table tr td span.active.disabled.disabled,
+.datepicker table tr td span.active.disabled:hover.disabled,
+.datepicker table tr td span.active[disabled],
+.datepicker table tr td span.active:hover[disabled],
+.datepicker table tr td span.active.disabled[disabled],
+.datepicker table tr td span.active.disabled:hover[disabled],
+fieldset[disabled] .datepicker table tr td span.active,
+fieldset[disabled] .datepicker table tr td span.active:hover,
+fieldset[disabled] .datepicker table tr td span.active.disabled,
+fieldset[disabled] .datepicker table tr td span.active.disabled:hover,
+.datepicker table tr td span.active.disabled:hover,
+.datepicker table tr td span.active:hover.disabled:hover,
+.datepicker table tr td span.active.disabled.disabled:hover,
+.datepicker table tr td span.active.disabled:hover.disabled:hover,
+.datepicker table tr td span.active[disabled]:hover,
+.datepicker table tr td span.active:hover[disabled]:hover,
+.datepicker table tr td span.active.disabled[disabled]:hover,
+.datepicker table tr td span.active.disabled:hover[disabled]:hover,
+fieldset[disabled] .datepicker table tr td span.active:hover,
+fieldset[disabled] .datepicker table tr td span.active:hover:hover,
+fieldset[disabled] .datepicker table tr td span.active.disabled:hover,
+fieldset[disabled] .datepicker table tr td span.active.disabled:hover:hover,
+.datepicker table tr td span.active.disabled:focus,
+.datepicker table tr td span.active:hover.disabled:focus,
+.datepicker table tr td span.active.disabled.disabled:focus,
+.datepicker table tr td span.active.disabled:hover.disabled:focus,
+.datepicker table tr td span.active[disabled]:focus,
+.datepicker table tr td span.active:hover[disabled]:focus,
+.datepicker table tr td span.active.disabled[disabled]:focus,
+.datepicker table tr td span.active.disabled:hover[disabled]:focus,
+fieldset[disabled] .datepicker table tr td span.active:focus,
+fieldset[disabled] .datepicker table tr td span.active:hover:focus,
+fieldset[disabled] .datepicker table tr td span.active.disabled:focus,
+fieldset[disabled] .datepicker table tr td span.active.disabled:hover:focus,
+.datepicker table tr td span.active.disabled:active,
+.datepicker table tr td span.active:hover.disabled:active,
+.datepicker table tr td span.active.disabled.disabled:active,
+.datepicker table tr td span.active.disabled:hover.disabled:active,
+.datepicker table tr td span.active[disabled]:active,
+.datepicker table tr td span.active:hover[disabled]:active,
+.datepicker table tr td span.active.disabled[disabled]:active,
+.datepicker table tr td span.active.disabled:hover[disabled]:active,
+fieldset[disabled] .datepicker table tr td span.active:active,
+fieldset[disabled] .datepicker table tr td span.active:hover:active,
+fieldset[disabled] .datepicker table tr td span.active.disabled:active,
+fieldset[disabled] .datepicker table tr td span.active.disabled:hover:active,
+.datepicker table tr td span.active.disabled.active,
+.datepicker table tr td span.active:hover.disabled.active,
+.datepicker table tr td span.active.disabled.disabled.active,
+.datepicker table tr td span.active.disabled:hover.disabled.active,
+.datepicker table tr td span.active[disabled].active,
+.datepicker table tr td span.active:hover[disabled].active,
+.datepicker table tr td span.active.disabled[disabled].active,
+.datepicker table tr td span.active.disabled:hover[disabled].active,
+fieldset[disabled] .datepicker table tr td span.active.active,
+fieldset[disabled] .datepicker table tr td span.active:hover.active,
+fieldset[disabled] .datepicker table tr td span.active.disabled.active,
+fieldset[disabled] .datepicker table tr td span.active.disabled:hover.active {
+  background-color: #428bca;
+  border-color: #357ebd;
+}
+.datepicker table tr td span.old,
+.datepicker table tr td span.new {
+  color: #999999;
+}
+.datepicker th.datepicker-switch {
+  width: 145px;
+}
+.datepicker thead tr:first-child th,
+.datepicker tfoot tr th {
+  cursor: pointer;
+}
+.datepicker thead tr:first-child th:hover,
+.datepicker tfoot tr th:hover {
+  background: #eeeeee;
+}
+.datepicker .cw {
+  font-size: 10px;
+  width: 12px;
+  padding: 0 2px 0 5px;
+  vertical-align: middle;
+}
+.datepicker thead tr:first-child th.cw {
+  cursor: default;
+  background-color: transparent;
+}
+.input-group.date .input-group-addon i {
+  cursor: pointer;
+  width: 16px;
+  height: 16px;
+}
+.input-daterange input {
+  text-align: center;
+}
+.input-daterange input:first-child {
+  border-radius: 3px 0 0 3px;
+}
+.input-daterange input:last-child {
+  border-radius: 0 3px 3px 0;
+}
+.input-daterange .input-group-addon {
+  width: auto;
+  min-width: 16px;
+  padding: 4px 5px;
+  font-weight: normal;
+  line-height: 1.428571429;
+  text-align: center;
+  text-shadow: 0 1px 0 #fff;
+  vertical-align: middle;
+  background-color: #eeeeee;
+  border-width: 1px 0;
+  margin-left: -5px;
+  margin-right: -5px;
+}
+.datepicker.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
+  float: left;
+  display: none;
+  min-width: 160px;
+  list-style: none;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  border-radius: 5px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding;
+  background-clip: padding-box;
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
+  color: #333333;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  line-height: 1.428571429;
+}
+.datepicker.dropdown-menu th,
+.datepicker.dropdown-menu td {
+  padding: 4px 5px;
+}

static/js/base.js

@@ -16,6 +16,13 @@ function check_all(form) {
     }
 }
 
+function checkAll(){
+    // 选择该页面所有checkbox
+    $('input[type=checkbox]').each(function(){
+        $(this).attr('checked', true)
+    })
+}
+
 //提取指定行的数据，JSON格式
 function GetRowData(row){
     var rowData = {};
@@ -89,22 +96,31 @@ function move(from, to, from_o, to_o) {
 //}
 //
 
-function selectAll(){
-         var checklist = document.getElementsByName ("selected");
-            if(document.getElementById("select_all").checked)
-            {
-            for(var i=0;i<checklist.length;i++)
-            {
-              checklist[i].checked = 1;
-            }
-            }else{
-            for(var j=0;j<checklist.length;j++)
-            {
-             checklist[j].checked = 0;
-            }
-            }
+//function selectAllOption(){
+//         var checklist = document.getElementsByName ("selected");
+//            if(document.getElementById("select_all").checked)
+//            {
+//            for(var i=0;i<checklist.length;i++)
+//            {
+//              checklist[i].checked = 1;
+//            }
+//            }else{
+//            for(var j=0;j<checklist.length;j++)
+//            {
+//             checklist[j].checked = 0;
+//            }
+//            }
+//
+//        }
+
+
+function selectAll(){
+    // 选择该页面所有option
+    $('option').each(function(){
+        $(this).attr('selected', true)
+    })
+}
 
-        }
 
 //
 //function move_all(from, to){

static/js/wssh.js

@@ -0,0 +1,89 @@
+/*
+WSSH Javascript Client
+
+Usage:
+
+var client = new WSSHClient();
+
+client.connect({
+    // Connection and authentication parameters
+    username: 'root',
+    hostname: 'localhost',
+    authentication_method: 'password', // can either be password or private_key
+    password: 'secretpassword', // do not provide when using private_key
+    key_passphrase: 'secretpassphrase', // *may* be provided if the private_key is encrypted
+
+    // Callbacks
+    onError: function(error) {
+        // Called upon an error
+        console.error(error);
+    },
+    onConnect: function() {
+        // Called after a successful connection to the server
+        console.debug('Connected!');
+
+        client.send('ls\n'); // You can send data back to the server by using WSSHClient.send()
+    },
+    onClose: function() {
+        // Called when the remote closes the connection
+        console.debug('Connection Reset By Peer');
+    },
+    onData: function(data) {
+        // Called when data is received from the server
+        console.debug('Received: ' + data);
+    }
+});
+
+*/
+
+function WSSHClient() {
+}
+
+WSSHClient.prototype._generateEndpoint = function(options) {
+    console.log(options);
+    if (window.location.protocol == 'https:') {
+        var protocol = 'wss://';
+    } else {
+        var protocol = 'ws://';
+    }
+
+    var endpoint = protocol + window.location.host + ':8080' + '/terminal';
+    return endpoint;
+};
+
+WSSHClient.prototype.connect = function(options) {
+    var endpoint = this._generateEndpoint(options);
+
+    if (window.WebSocket) {
+        this._connection = new WebSocket(endpoint);
+    }
+    else if (window.MozWebSocket) {
+        this._connection = MozWebSocket(endpoint);
+    }
+    else {
+        options.onError('WebSocket Not Supported');
+        return ;
+    }
+
+    this._connection.onopen = function() {
+        options.onConnect();
+    };
+
+    this._connection.onmessage = function (evt) {
+        var data = JSON.parse(evt.data.toString());
+        if (data.error !== undefined) {
+            options.onError(data.error);
+        }
+        else {
+            options.onData(data.data);
+        }
+    };
+
+    this._connection.onclose = function(evt) {
+        options.onClose();
+    };
+};
+
+WSSHClient.prototype.send = function(data) {
+    this._connection.send(JSON.stringify({'data': data}));
+};

templates/head_script.html

@@ -8,4 +8,5 @@
 <!-- validator js -->
 <script src="/static/js/validator/jquery.validator.js"></script>
 <script src="/static/js/validator/zh_CN.js"></script>
+<script src="/static/js/datapicker/bootstrap-datepicker.js"></script>
 

templates/jasset/asset_add.html

@@ -42,27 +42,24 @@
                                         <div class="form-group"><label class="col-sm-2 control-label"> IP地址<span class="red-fonts">*</span> </label>
                                             <div class="col-sm-8"><input type="text" name="ip" placeholder="IP" class="form-control"></div>
                                         </div>
-
                                         <div class="hr-line-dashed"></div>
                                         <div class="form-group">
-                                            <label class="col-sm-2 control-label"> 端口号<span class="red-fonts">*</span> </label>
-                                            <div class="col-sm-8">
-                                                <input type="text" placeholder="Port" name="port" class="form-control">
-                                            </div>
-                                        </div>
-
-                                        <div class="hr-line-dashed"></div>
-                                        <div class="form-group">
-                                            <label for="j_group" class="col-sm-2 control-label">使用默认管理账号</label>
+                                            <label for="j_group" class="col-sm-2 control-label">使用默认</label>
                                             <div class="col-sm-1">
                                                 <div class="radio i-checks">
                                                     <label>
-                                                        <input type="checkbox" checked="" value="1" id="use_default_auth" name="use_default_auth">
+                                                        <input type="checkbox" checked="" value="1" id="use_default" name="use_default">
                                                     </label>
                                                 </div>
                                             </div>
                                         </div>
 
+                                        <div class="form-group" id="port" style="display: none">
+                                            <label class="col-sm-2 control-label"> 端口号<span class="red-fonts">*</span> </label>
+                                            <div class="col-sm-8">
+                                                <input type="text" placeholder="Port" name="port" class="form-control">
+                                            </div>
+                                        </div>
                                         <div class="form-group" id="admin_account" style="display: none">
                                             <label class="col-sm-2 control-label"> 管理用户名<span class="red-fonts">*</span> </label>
                                             <div class="col-sm-3">
@@ -125,12 +122,14 @@
 <script>
 
 $('document').ready(function(){
-    $('#use_default_auth').click(function(){
+    $('#use_default').click(function(){
         if ($(this).is(':checked')){
-            $('#admin_account').css('display', 'none')
+            $('#admin_account').css('display', 'none');
+            $('#port').css('display', 'none')
         }
         else {
-            $('#admin_account').css('display', 'block')
+            $('#admin_account').css('display', 'block');
+            $('#port').css('display', 'block')
         }
     })
 });
@@ -148,12 +147,6 @@ $('#assetForm').validator({
             tip: "输入IP",
             ok: "",
             msg: {required: "必须填写!"}
-        },
-        "port": {
-            rule: "required;check_port",
-            tip: "输入端口号",
-            ok: "",
-            msg: {required: "必须填写!"}
         }
     },
     valid: function(form) {

templates/jasset/asset_edit.html

@@ -50,21 +50,21 @@
                                             <div class="col-sm-1">
                                                 <div class="radio i-checks">
                                                     <label>
-                                                        <input type="checkbox" {% ifequal asset.use_default_auth 1 %} checked="" {% endifequal %} value="1" id="use_default_auth" name="use_default_auth">
+                                                        <input type="checkbox" {% ifequal asset.use_default 1 %} checked="" {% endifequal %} value="1" id="use_default" name="use_default">
                                                     </label>
                                                 </div>
                                             </div>
                                         </div>
 
-                                        <div class="form-group" id="admin_account" {% ifequal asset.use_default_auth 1 %} style="display: none" {% endifequal %}>
+                                        <div class="form-group" id="admin_account" {% ifequal asset.use_default 1 %} style="display: none" {% endifequal %}>
                                             <label class="col-sm-2 control-label"> 管理用户名<span class="red-fonts">*</span> </label>
                                             <div class="col-sm-3">
-                                                <input type="text" {% ifnotequal asset.use_default_auth 1 %} value="{{ asset.username }}" {% endifnotequal %} name="username" class="form-control">
+                                                <input type="text" {% ifnotequal asset.use_default 1 %} value="{{ asset.username }}" {% endifnotequal %} name="username" class="form-control">
                                             </div>
 
                                             <label class="col-sm-1 control-label"> 密码<span class="red-fonts">*</span> </label>
                                             <div class="col-sm-4">
-                                                <input type="password" {% ifnotequal asset.use_default_auth 1 %} value="{{ asset.password }}" {% endifnotequal %}  name="password" class="form-control">
+                                                <input type="password" {% ifnotequal asset.use_default 1 %} value="{{ asset.password }}" {% endifnotequal %}  name="password" class="form-control">
                                             </div>
                                         </div>
 
@@ -123,7 +123,7 @@
 <script>
 
 $('document').ready(function(){
-    $('#use_default_auth').click(function(){
+    $('#use_default').click(function(){
         if ($(this).is(':checked')){
             $('#admin_account').css('display', 'none')
         }

templates/jlog/base.jinja2

@@ -0,0 +1,111 @@
+<html>
+    <head>{% block head %}{% endblock %}
+    </head>
+    
+    <body>
+        <input type="button" value="Play/Pause" onclick="pause(false);" /> 
+        <input type="button" value="Restart" onclick="restart(1);" /> 
+        <span id="beforeScrubberText"></span>
+        <input id="scrubber" type="range" value="0" min=0 max=100
+               onmousedown="pause(true);" onmouseup="scrub();" />
+        <span id="afterScrubberText"></span>
+        -5x <input id="speed" type="range" value="0" min=-5 max=5
+               onmouseup="setSpeed();" /> +5x
+        <script>
+            var data = {{ json }};
+            var toggle = true;
+            var totalTime = 0;
+            var TICK = 33;
+            var TIMESTEP = 33;
+            var time = 33;
+            var pos = 0;
+            var timer;
+
+            // Thanks http://stackoverflow.com/a/2998822
+            function zeroPad(num, size) {
+                var s = "0" + num;
+                return s.substr(s.length-size);
+            }
+
+            function scrub() {
+               setPercent = document.getElementById('scrubber').value;
+               time = (setPercent / 100) * totalTime;
+               restart(time); 
+            }
+
+            function buildTimeString(millis) {
+                hours   = zeroPad(Math.floor(millis / (1000 * 60 * 60)), 2);
+                millis -= hours * (1000 * 60 * 60)
+                minutes = zeroPad(Math.floor(millis / (1000 * 60)), 2);
+                millis -= minutes * (1000 * 60);
+                seconds = zeroPad(Math.floor(millis / 1000), 2);
+                return hours + ':' + minutes + ':' + seconds;
+            }
+
+            function advance() {
+                document.getElementById('scrubber').value =
+                                           Math.ceil((time / totalTime) * 100);
+                timestr = buildTimeString(time);
+                document.getElementById("beforeScrubberText").innerHTML = 
+                                                                       timestr;
+                for (; pos < data.length; pos++) {
+                    if (data[pos][1] <= time) {
+                        term.write(eval(data[pos][0]));
+                    } else {
+                        break;
+                    }
+                }
+
+                if (pos >= data.length) {
+                    clearInterval(timer);
+                }
+
+                time += TIMESTEP;
+            }
+
+            function pause(test) {
+                if (!toggle && test) {
+                    return;
+                }
+                if (toggle) {
+                    clearInterval(timer);
+                    toggle = !toggle;
+                } else {
+                   timer = setInterval(advance, TICK);
+                   toggle = !toggle; 
+                }
+            }
+
+            function setSpeed() {
+                speed = document.getElementById('speed').value;
+                if (speed == 0) {
+                    TIMESTEP = TICK;
+                } else if (speed < 0) {
+                    TIMESTEP = TICK / -speed;
+                } else {
+                    TIMESTEP = TICK * speed;
+                }
+            }
+
+            function restart(millis) {
+                    clearInterval(timer);
+                    term.reset();
+                    time = millis;
+                    pos = 0;
+                    toggle = true;
+                    timer = setInterval(advance, TICK);
+            }
+
+            var term = new Terminal({
+                                        cols: {{ dimensions[1] }},
+                                        rows: {{ dimensions[0] }},
+                                        screenKeys: true
+                                    });
+            totalTime = data[data.length - 1][1];
+            timestr = buildTimeString(totalTime);
+            document.getElementById("afterScrubberText").innerHTML = timestr;
+            term.open(document.body);
+            timer = setInterval(advance, TICK);
+            </script>
+        </body>
+    </html>

templates/jlog/dynamic.jinja2

@@ -0,0 +1,11 @@
+{% extends "base.jinja2" %}
+{% block head %}
+        <script src='term.js'></script>
+        <link href='http://fonts.googleapis.com/css?family=Ubuntu+Mono' rel='stylesheet' type='text/css'>
+        <style>
+            body {
+                    font-family: 'Ubuntu Mono', Courier, monospace;
+                    font-size:  14pt;
+                 }
+        </style>
+{% endblock %}

templates/jlog/log_filter.html

@@ -0,0 +1,139 @@
+{% extends 'base.html' %}
+{% block self_head_css_js %}
+    <link href="/static/css/plugins/datapicker/datepicker3.css" rel="stylesheet">
+    <link href="/static/css/plugins/chosen/chosen.css" rel="stylesheet">
+    <script src="/static/js/plugins/chosen/chosen.jquery.js"></script>
+{% endblock %}
+{% block content %}
+{% include 'nav_cat_bar.html' %}
+
+<div class="wrapper wrapper-content animated fadeInRight">
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="ibox float-e-margins">
+                <div id="ibox-content" class="ibox-title">
+                    <h5> 用户日志详细信息列表 </h5>
+                    <div class="ibox-tools">
+                        <a class="collapse-link">
+                            <i class="fa fa-chevron-up"></i>
+                        </a>
+                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+                            <i class="fa fa-wrench"></i>
+                        </a>
+                        <a class="close-link">
+                            <i class="fa fa-times"></i>
+                        </a>
+                    </div>
+                </div>
+
+                <div class="ibox-content">
+                    <div class="panel-options">
+                        <ul class="nav nav-tabs">
+                            <li><a href="/jlog/log_list/online/" class="text-center"><i class="fa fa-laptop"></i> 在线 </a></li>
+                            <li><a href="/jlog/log_list/offline/" class="text-center"><i class="fa fa-bar-chart-o"></i> 历史记录 </a></li>
+                            <li class="active"><a href="/jlog/search/" class="text-center"><i class="fa fa-bar-chart-o"></i> 详细搜索 </a></li>
+                        </ul>
+                    </div>
+                    <br/>
+                    <div class="tab-content">
+                        <form method="get" action="" role="form" class="form-inline">
+                            <p>
+                                选择相应条件进行搜索
+                            </p>
+                            <div class="form-group" id="data_5">
+                                <div class="input-daterange input-group" id="datepicker">
+                                    <input type="text" class="input-sm form-control" style="width: 100px;" name="start" value="{{ date_seven_day }}">
+                                    <span class="input-group-addon">to</span>
+                                    <input type="text" class="input-sm form-control" style="width: 100px;" name="end" value="{{ date_now_str }}">
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <div class="input-group">
+                                    <select name="single" data-placeholder="用户名" class="chosen-select" multiple style="width:300px;" tabindex="2">
+                                        <option value="用户">用户名</option>
+                                        <option value="Bolivia, Plurinational State of">hongweiguang</option>
+                                        <option value="Bonaire, Sint Eustatius and Saba">wangyong</option>
+                                        <option value="Bosnia and Herzegovina">hehe</option>
+                                        <option value="Botswana">wangyong</option>
+                                        <option value="Bouvet Island">wangyongd</option>
+                                        <option value="Romania">Romania</option>
+                                        <option value="Zambia">Zambia</option>
+                                        <option value="Zimbabwe">Zimbabwe</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <div class="input-group">
+                                    <select name="multi" data-placeholder="主机" class="chosen-select" multiple style="width:200px;" tabindex="4">
+                                        <option value="主机">主机</option>
+                                        <option value="United States">172.16.1.1</option>
+                                        <option value="Afghanistan">172.16.1.1</option>
+                                        <option value="Aland Islands">172.16.1.1</option>
+                                        <option value="Albania">172.16.1.1</option>
+                                        <option value="Algeria">172.16.1.1</option>
+                                        <option value="American Samoa">172.16.1.1</option>
+                                        <option value="Andorra">172.16.1.1</option>
+                                        <option value="Angola">172.16.1.1</option>
+                                        <option value="Anguilla">172.16.1.1</option>
+                                        <option value="Antarctica">172.16.1.1</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <input id="cmd" name="cmd" placeholder="命令" type="text" class="form-control" style="width: 200px;">
+                            </div>
+                            <div class="form-group">
+                                <button id="submit_button" class="btn btn-primary" type="submit">搜索</button>
+                            </div>
+                        </form>
+
+                        <div class="row">
+                            <div class="col-sm-6">
+                            </div>
+                            {% include 'paginator.html' %}
+                        </div>
+                    </div>    
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    function log_search(){
+        $.ajax({
+            type: "GET",
+            url: "/jlog/search/?env=offline",
+            data: $("#search_form").serialize(),
+            success: function (data) {
+                $(".tab-content").html(data);
+            }
+        });
+    }
+
+    $(document).ready(function(){
+        $('#data_5 .input-daterange').datepicker({
+            dateFormat: 'yy-mm-dd',
+            keyboardNavigation: false,
+            forceParse: false,
+            autoclose: true
+        });
+    });
+
+    var config = {
+                '.chosen-select'           : {},
+                '.chosen-select-deselect'  : {allow_single_deselect:true},
+                '.chosen-select-no-single' : {disable_search_threshold:10},
+                '.chosen-select-no-results': {no_results_text:'Oops, nothing found!'},
+                '.chosen-select-width'     : {width:"95%"}
+            };
+    for (var selector in config) {
+        $(selector).chosen(config[selector]);
+    }
+
+</script>
+{% endblock %}
+{% block self_footer_js %}
+    <script src="/static/js/cropper/cropper.min.js"></script>
+    <script src="/static/js/datapicker/bootstrap-datepicker.js"></script>
+    <script src="/static/js/plugins/chosen/chosen.jquery.js"></script>
+{% endblock %}

templates/jlog/log_monitor.html

@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <title>Jumpserver | 开源跳板机系统</title>
+
+    <link rel="shortcut icon" href="/static/img/facio.ico" type="image/x-icon">
+    {% include 'link_css.html' %}
+    {% include 'head_script.html' %}
+
+</head>
+
+<body>
+    <div id="wrapper">
+        <div class="col-lg-12">
+            <div class="ibox float-e-margins">
+                <div class="ibox-title">
+                    <h5> 实时监控 </h5>
+                </div>
+
+                <div class="ibox-content blank-panel" id="content" style="background-color: #0b0b0b; color: #006621; height: 500px; padding: 20px;">
+                    你好<br>
+                </div>
+            </div>
+        </div>
+    </div>
+
+</body>
+    {% block self_footer_js %}
+    <script>
+    function monitor(){
+        var wsUri = 'ws://j:8080/send';
+        var ws = new WebSocket(wsUri);
+        ws.onopen = function(evt){
+            $('#content').append('Connect websocket success' + '<br />');
+            ws.send('Start')
+        };
+
+        ws.onmessage = function(evt){
+            console.log(evt.data);
+            $('#content').append(evt.data.replace(/\n|\r|(\r\n)|(\u0085)|(\u2028)|(\u2029)/g, '<br>'));
+        };
+
+        ws.onclose = function(evt){
+            $('#content').append('Disconnect with websocket')
+        }
+    }
+
+    monitor();
+    </script>
+    {% endblock %}
+</html>

templates/jlog/log_offline.html

@@ -1,12 +1,18 @@
 {% extends 'base.html' %}
+{% block self_head_css_js %}
+    <link href="/static/css/plugins/datapicker/datepicker3.css" rel="stylesheet">
+    <link href="/static/css/plugins/chosen/chosen.css" rel="stylesheet">
+    <script src="/static/js/plugins/chosen/chosen.jquery.js"></script>
+{% endblock %}
 {% block content %}
 {% include 'nav_cat_bar.html' %}
+
 <style>
     .bootstrap-dialog-body  {
         background-color: rgba(0, 0, 0, 0);
     }
     .bootstrap-dialog-message {
-        background-color: rgba(0, 0, 0, 0);
+        color: #00FF00;
     }
     .modal-content {
         background-color: rgba(0, 0, 0, 0.6);
@@ -21,9 +27,7 @@
     .modal-header {
         background-color: #FFFFFF;
     }
-    .bootstrap-dialog-message {
-        color: #00FF00;
-        }
+
 </style>
 
 <div class="wrapper wrapper-content animated fadeInRight">
@@ -39,12 +43,6 @@
                         <a class="dropdown-toggle" data-toggle="dropdown" href="#">
                             <i class="fa fa-wrench"></i>
                         </a>
-                        <ul class="dropdown-menu dropdown-user">
-                            <li><a href="#">未启用 1</a>
-                            </li>
-                            <li><a href="#">未启用 2</a>
-                            </li>
-                        </ul>
                         <a class="close-link">
                             <i class="fa fa-times"></i>
                         </a>
@@ -56,48 +54,73 @@
                         <ul class="nav nav-tabs">
                             <li><a href="/jlog/log_list/online/" class="text-center"><i class="fa fa-laptop"></i> 在线 </a></li>
                             <li class="active"><a href="/jlog/log_list/offline/" class="text-center"><i class="fa fa-bar-chart-o"></i> 历史记录 </a></li>
-                            <li style="float: right">
-                                <form id="search_form" method="get" action="" class="pull-right mail-search">
-                                    <div class="input-group">
-                                        <input type="text" class="form-control input-sm" id="search_input" name="keyword" placeholder="Search">
-                                        <input type="text" style="display: none">
-                                        <div class="input-group-btn">
-                                            <button id='search_btn' type="button" class="btn btn-sm btn-primary" onclick="log_search()">
-                                                Search
-                                            </button>
-                                        </div>
-                                    </div>
-                                </form>
-                            </li>
+{#                            <li><a href="/jlog/search/" class="text-center"><i class="fa fa-bar-chart-o"></i> 详细搜索 </a></li>#}
+
                         </ul>
                     </div>
                     <br/>
+                    <form class="form-inline" action="" method="get">
+                        <div class="form-group" id="data_5">
+                            <div class="form-group" id="data_5">
+                            <div class="input-daterange input-group" id="datepicker">
+                                <input type="text" class="input-sm form-control" style="width: 100px;" name="start" value="{{ date_seven_day }}">
+                                <span class="input-group-addon">to</span>
+                                <input type="text" class="input-sm form-control" style="width: 100px;" name="end" value="{{ date_now_str }}">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <div class="input-group">
+                                <select name="username" data-placeholder="用户名" class="chosen-select" multiple style="width:200px;" tabindex="2">
+                                    {% for username in username_all %}
+                                        <option value="{{ username }}"{% if username in username_list %}selected{% endif %}>{{ username }}</option>
+                                    {% endfor %}
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <div class="input-group">
+                                <select name="host" data-placeholder="主机" class="chosen-select" multiple style="width:200px;" tabindex="4">
+                                    {% for ip in ip_all %}
+                                    <option value="{{ ip }}" {% if ip in host_list %}selected{% endif %}>{{ ip }}</option>
+                                    {% endfor %}
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <input id="cmd" name="cmd" placeholder="命令" type="text" class="form-control" value="{{ cmd }}" style="width: 200px;">
+                        </div>
+                        </div>
+                        <button id='search_btn' type="submit" class="btn btn-sm btn-primary">
+                                Search
+                        </button>
+                    </form>
                     <div class="tab-content">
                         <table class="table table-striped table-bordered table-hover ">
                             <thead>
                                 <tr>
                                     <th class="text-center"> 用户名 </th>
-                                    <th class="text-center"> 所属部门 </th>
                                     <th class="text-center"> 登录主机 </th>
                                     <th class="text-center"> 来源IP </th>
                                     {% ifnotequal session_role_id 0 %}
                                         <th class="text-center"> 命令统计 </th>
                                     {% endifnotequal %}
+                                    <th class="text-center"> 回放录像 </th>
                                     <th class="text-center"> 登录时间 </th>
                                     <th class="text-center"> 结束时间 </th>
 
                                 </tr>
                             </thead>
                             <tbody>
+
                             {% for post in contacts.object_list %}
                                 <tr class="gradeX">
                                     <td class="text-center" id="username"> {{ post.user }} </td>
-                                    <td class="text-center" id="dept"> {{ post.dept_name }} </td>
                                     <td class="text-center" id="ip"> {{ post.host }} </td>
                                     <td class="text-center" id="remote_ip"> {{ post.remote_ip }} </td>
                                     {% ifnotequal session_role_id 0 %}
-                                        <td class="text-center"><a href="/jlog/history/?id={{ post.id }}" class="log_command"> 命令统计 </td>
+                                        <td class="text-center"><a href="/jlog/history/?id={{ post.id }}" class="log_command"> 命令统计 </a></td>
                                     {% endifnotequal %}
+                                    <td class="text-center"><a value="/jlog/record/?id={{ post.id }}" class="log_record"> 回放 </a></td>
                                     <td class="text-center" id="start_time"> {{ post.start_time|date:"Y-m-d H:i:s"}} </td>
                                     <td class="text-center" id="end_time"> {{ post.end_time|date:"Y-m-d H:i:s" }} </td>
                                 </tr>
@@ -116,10 +139,14 @@
     </div>
 </div>
 
-
-{#<script src="http://{{ web_socket_host }}/socket.io/socket.io.js"></script>#}
 <script>
-   $('.log_command').on('click',function(){
+    $('.log_record').click(function(){
+        var url = $(this).attr('value');
+        window.open(url, '播放', 'height=500, width=910, top=89px, left=99px,toolbar=no,menubar=no,scrollbars=auto,resizeable=no,location=no,status=no');
+        return false;
+    });
+
+    $('.log_command').on('click',function(){
        var url = $(this).attr('href');
        var username = $('#username')[0].innerText;
        var ip = $('#ip')[0].innerText;
@@ -127,17 +154,15 @@
        var end_time = $('#end_time')[0].innerText;
        var div_username = ' 用户名: '+'<span class="text-info">'+username+'' + '</span>';
        var div_ip = ' 主机: '+'<span class="text-info">' + ip + '</span>';
-       var div_time = ' 开始时间: ' + '<span class="text-info">'+start_time +'</span>' + ' 结束时间: ' +'<span class="text-info">' + end_time + '</span'
+       var div_time = ' 开始时间: ' + '<span class="text-info">'+start_time +'</span>' + ' 结束时间: ' +'<span class="text-info">' + end_time + '</span>';
        var title = 'JumpServer命令统计 '+ div_username + div_ip + div_time;
-        $.ajax({url:url,success:function(data){
-        var tag = $('<div style="height: 500px;overflow: auto;background-color: rgba(0, 0, 0, 0);"></div>').html(data.replace(/\n/g,"<br />"));
-        BootstrapDialog.show({title: title, message:tag[0]});
+        $.ajax({url:url,
+                success:function(data){
+                    var tag = $('<div style="height: 500px;overflow: auto;background-color: rgba(0, 0, 0, 0);"></div>').html(data.replace(/\n/g,"<br />"));
+                    BootstrapDialog.show({title: title, message:tag[0]});
         }});
        return false;
     });
-    globalConfig = {
-        SOCKET_HOST: "{{ web_socket_host }}"
-    };
 
     function log_search(){
         $.ajax({
@@ -150,11 +175,33 @@
         });
     }
 
-    $("#search_input").keydown(function(e){
-        if(e.keyCode==13){
-            log_search()
-            }
-    })
+{#    $("#search_input").keydown(function(e){#}
+{#        if(e.keyCode==13){#}
+{#            log_search()#}
+{#            }#}
+{#    });#}
+
+    $('#data_5 .input-daterange').datepicker({
+            dateFormat: 'yy-mm-dd',
+            keyboardNavigation: false,
+            forceParse: false,
+            autoclose: true
+    });
+
+    var config = {
+                '.chosen-select'           : {},
+                '.chosen-select-deselect'  : {allow_single_deselect:true},
+                '.chosen-select-no-single' : {disable_search_threshold:10},
+                '.chosen-select-no-results': {no_results_text:'Oops, nothing found!'},
+                '.chosen-select-width'     : {width:"95%"}
+            };
+    for (var selector in config) {
+        $(selector).chosen(config[selector]);
+    }
 
 </script>
+{% endblock %}
+{% block self_footer_js %}
+    <script src="/static/js/cropper/cropper.min.js"></script>
+    <script src="/static/js/datapicker/bootstrap-datepicker.js"></script>
 {% endblock %}

templates/jlog/log_online.html

@@ -1,18 +1,32 @@
 {% extends 'base.html' %}
-{% block content %}
-{% include 'nav_cat_bar.html' %}
-<style>
+{% block self_head_css_js %}
+    <style>
+    .terminal {
+        border: #000 solid 5px;
+        font-family: "Monaco", "DejaVu Sans Mono", "Liberation Mono", monospace;
+        font-size: 11px;
+        color: #f0f0f0;
+        background: rgba(0, 0, 0, 0.6);
+        width: 600px;
+        box-shadow: rgba(0, 0, 0, 0.6) 2px 2px 20px;
+    }
+
+    .reverse-video {
+        color: #000;
+        background: #f0f0f0;
+    }
+
     .bootstrap-dialog-body  {
         background-color: rgba(0, 0, 0, 0);
     }
     .bootstrap-dialog-message {
-        background-color: rgba(0, 0, 0, 0);
+        color: #00FF00;
     }
     .pre-class {
         background-color: rgba(0, 0, 0, 1);
     }
     .modal-content {
-        background-color: rgba(0, 0, 0, 0.6);
+        background-color: #000;
     }
     .modal-dialog {
         background-color: rgba(0, 0, 0, 0);
@@ -24,7 +38,12 @@
     .modal-header {
         background-color: #FFFFFF;
     }
-</style>
+    </style>
+    <script src="/static/js/term.js"></script>
+
+{% endblock %}
+{% block content %}
+{% include 'nav_cat_bar.html' %}
 
 <div class="wrapper wrapper-content animated fadeInRight">
     <div class="row">
@@ -39,12 +58,6 @@
                         <a class="dropdown-toggle" data-toggle="dropdown" href="#">
                             <i class="fa fa-wrench"></i>
                         </a>
-                        <ul class="dropdown-menu dropdown-user">
-                            <li><a href="#">未启用 1</a>
-                            </li>
-                            <li><a href="#">未启用 2</a>
-                            </li>
-                        </ul>
                         <a class="close-link">
                             <i class="fa fa-times"></i>
                         </a>
@@ -56,19 +69,6 @@
                         <ul class="nav nav-tabs">
                             <li class="active"><a href="/jlog/log_list/online/" class="text-center"><i class="fa fa-laptop"></i> 在线 </a></li>
                             <li><a href="/jlog/log_list/offline/" class="text-center"><i class="fa fa-bar-chart-o"></i> 历史记录 </a></li>
-                            <li style="float: right">
-                                <form id="search_form" method="get" action="" class="pull-right mail-search">
-                                    <div class="input-group">
-                                        <input type="text" class="form-control input-sm" id="search_input" name="keyword" placeholder="Search">
-                                        <input type="text" style="display: none">
-                                        <div class="input-group-btn">
-                                            <button id='search_btn' type="button" class="btn btn-sm btn-primary" onclick="log_search()">
-                                                Search
-                                            </button>
-                                        </div>
-                                    </div>
-                                </form>
-                            </li>
                         </ul>
                     </div>
                     <br/>
@@ -77,10 +77,10 @@
                             <thead>
                                 <tr>
                                     <th class="text-center"> 用户名 </th>
-                                    <th class="text-center"> 所属部门 </th>
                                     <th class="text-center"> 登录主机 </th>
                                     <th class="text-center"> 来源IP </th>
                                     {% ifnotequal session_role_id 0 %}
+                                        <th class="text-center"> 统计命令 </th>
                                         <th class="text-center"> 实时监控 </th>
                                         <th class="text-center"> 阻断 </th>
                                     {% endifnotequal %}
@@ -92,14 +92,14 @@
                             {% for post in contacts.object_list %}
                                 <tr class="gradeX">
                                     <td id="username" class="text-center"> {{ post.user }} </td>
-                                    <td id="deptname" class="text-center"> {{ post.dept_name }} </td>
                                     <td id="ip" class="text-center"> {{ post.host }} </td>
                                     <td id="remote_ip" class="text-center"> {{ post.remote_ip }} </td>
                                     {% ifnotequal session_role_id 0 %}
-                                        <td class="text-center"><a class="monitor" filename="{{ post.log_path }}"> 监控 </a></td>
+                                        <td class="text-center"><a href="/jlog/history/?id={{ post.id }}" class="log_command"> 命令统计 </a></td>
+                                        <td class="text-center"><a class="monitor" file_path="{{ post.log_path }}"> 监控 </a></td>
                                         <td class="text-center"><input type="button" id="cut" class="btn btn-danger btn-xs"  name="cut" value="阻断" onclick='cut("{{ post.pid }}")' /></td>
                                     {% endifnotequal %}
-                                    <td class="text-center"> {{ post.start_time|date:"Y-m-d H:i:s" }} </td>
+                                    <td class="text-center" id="start_time"> {{ post.start_time|date:"Y-m-d H:i:s" }} </td>
                                 </tr>
                             {% endfor %}
                             </tbody>
@@ -116,107 +116,93 @@
 </div>
 
 
-<script src="http://{{ web_socket_host }}/socket.io/socket.io.js"></script>
+{#<script src="http://{{ web_socket_host }}/socket.io/socket.io.js"></script>#}
 <script>
-   $.fn.webSocket = function(opt){
-    var st = {};
-    st = $.extend(st,opt);
-    var message = {};
-    var $this = $(this);
-    var genUid = function(){
-        return new Date().getTime()+""+Math.floor(Math.random()*899+100);
-    };
-    var init = function(e){
-        var socket = io.connect('ws://'+globalConfig.SOCKET_HOST);
-        var node = $(e.target);
-        message.id = genUid();
-        message.filename = node.attr('filename');
-        var username = $('#username')[0].innerText;
-        var ip = $('#ip')[0].innerText;
-        BootstrapDialog.show({message:function(){
-            var option, exsit_message;
-            var escapeString = function (html){
-                var elem = document.createElement('div');
-                var txt = document.createTextNode(html);
-                elem.appendChild(txt);
-                return elem.innerHTML;
-            };
-            var tag = $('<div id="log" style="height: 500px;overflow: auto;background-color: rgba(0, 0, 0, 0);"></div>');
+{#   $(document).ready(function(){#}
+{#       $('.monitor').click(function(){#}
+{#           window.open('/jlog/monitor/', '监控', 'height=500, width=910, top=89px, left=99px,toolbar=no,menubar=no,scrollbars=auto,resizeable=no,location=no,status=no');#}
+{#        })#}
+{#   });#}
+    function init(obj){
+        var file_path = obj.attr('file_path');
+        var wsUri = '{{ web_monitor_uri }}';
+        var socket = new WebSocket(wsUri + '?file_path=' + file_path);
+        socket.onopen = function(evt){
+             socket.send(file_path)
+        };
 
-            var username = "";
-            var seed = "";
-            document.cookie.split('; ').forEach(function(obj){
-                var info = obj.split('=');
-                if(info.length == 2 ){
-                    if(info[0] == 'username'){
-                        username = info[1];
-                    }else if(info[0] == 'seed'){
-                        seed = info[1];
-                    }
-                }
-            })
+        window.onbeforeunload = function(){
+            socket.close()
+        };
 
-            //告诉服务器端有用户登录
-            socket.emit('login', {userid:message.id, filename:message.filename,username:username,seed:seed});
-            socket.on('message',function(obj){
-                option = obj.option;
-                console.log(option+'so')
-                exsit_message = obj.content;
-                console.log(obj.content)
-                //去除log中的颜色控制字符
-                var regx =  /\x1B\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]/g;
-//                tag.append('<p>'+escapeString(obj.content.replace(regx,''))+'</p>');
-                if (option == 'new') {
-//                    tag.append('<p style="margin: 2px">' + escapeString(obj.content) + '</p>');
-                    tag.append('<p  style="margin: 2px">'+escapeString(obj.content.replace(regx,' '))+'</p>');
-                } else if (option == 'exist') {
-                    tag.append('<pre>' + exsit_message + '</pre>');
-                }
-                tag.animate({ scrollTop: tag[0].scrollHeight}, 1);
+        var username = obj.closest('tr').find('#username').text();
+        var ip = obj.closest('tr').find('#ip').text();
+
+
+
+        BootstrapDialog.show({message: function(){
+            //服务器端认证
+{#            socket.send('login', {userid:message.id, filename:message.filename,username:username,seed:seed});#}
+            var term = new Terminal({
+              cols: 80,
+              rows: 24,
+              screenKeys: false
             });
+            var tag = $('<div id="term" style="height:500px; overflow: auto;background-color: rgba(0, 0, 0, 0);border: none"></div>');
+            term.open();
+            term.resize(80, 24);
+
+            window.setTimeout(function(){
+                $('.terminal').detach().appendTo('#term');
+                socket.onmessage = function(evt){
+                term.write(evt.data);
+            }}, 1000);
+
+
+
             tag[0].style.color = "#00FF00";
             return tag[0];
-
         } ,
             title:'Jumpserver实时监控 '+' 登录用户名: '+'<span class="text-info">'+username+'</span>'+' 登录主机: '+'<span class="text-info">'+ip,
             onhide:function(){
-                socket.emit('disconnect');
+                socket.close();
         }});
     }
-    $this.on("click",function(e){
-        init(e);
-        return false;
-    });
-}
-   $('.log_command').on('click',function(){
-       var url = $(this).attr('href');
-        $.ajax({url:url,success:function(data){
-        BootstrapDialog.show({title:'命令统计',message:data});
-        }});
-       return false;
-    })
-   globalConfig = {
-        SOCKET_HOST: "{{ web_socket_host }}"
-   }
-   $(".monitor").webSocket()
 
-
-   function log_search(){
-        $.ajax({
-            type: "GET",
-            url: "/jlog/search/?env=online",
-            data: $("#search_form").serialize(),
-            success: function (data) {
-                $(".tab-content").html(data);
-            }
+    $(document).ready(function(){
+        $('.monitor').click(function(){
+            init($(this));
         });
-    }
 
-    $("#search_input").keydown(function(e){
-        if(e.keyCode==13){
-            log_search()
-            }
-    })
+        $('.log_command').on('click',function(){
+           var url = $(this).attr('href');
+           var username = $(this).closest('tr').find('#username').text();
+           var ip = $(this).closest('tr').find('#ip').text();
+           var start_time = $(this).closest('tr').find('#start_time').text();
+           var div_username = ' 用户名: '+'<span class="text-info">'+username+'' + '</span>';
+           var div_ip = ' 主机: '+'<span class="text-info">' + ip + '</span>';
+           var div_time = ' 开始时间: ' + '<span class="text-info">'+start_time +'</span>' + '</span>';
+           var title = 'JumpServer命令统计 '+ div_username + div_ip + div_time;
+            $.ajax({url:url,
+                    success:function(data){
+                        var tag = $('<div style="height: 500px;overflow: auto;background-color: rgba(0, 0, 0, 0);"></div>').html(data.replace(/\n/g,"<br />"));
+                        BootstrapDialog.show({title: title, message:tag[0]});
+            }});
+           return false;
+        });
+    });
+
+{#    function log_search(){#}
+{#        $.ajax({#}
+{#            type: "GET",#}
+{#            url: "/jlog/search/?env=online",#}
+{#            data: $("#search_form").serialize(),#}
+{#            success: function (data) {#}
+{#                $(".tab-content").html(data);#}
+{#            }#}
+{#        });#}
+{#     }#}
+
 
    function cut(num){
       var g_url = "/jlog/log_kill/?id="+num;
@@ -224,7 +210,6 @@
            type: "GET",
            url: g_url,
            success: window.open("/jlog/log_list/online/", "_self")
-//           error: window.open(g_url, "_self")
        });
 
 }

templates/jlog/web_terminal.html

@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>Jumpserver web terminal</title>
+
+        <style>
+            body {
+                padding-bottom: 40px;
+            }
+
+            .terminal {
+                border: #000 solid 5px;
+                font-family: "Monaco", "DejaVu Sans Mono", "Liberation Mono", monospace;
+                font-size: 11px;
+                color: #f0f0f0;
+                background: #000;
+                width: 600px;
+                box-shadow: rgba(0, 0, 0, 0.8) 2px 2px 20px;
+            }
+
+            .reverse-video {
+                color: #000;
+                background: #f0f0f0;
+            }
+        </style>
+    </head>
+
+    <body>
+        <div class="container">
+            <div id="term">
+            </div>
+        </div>
+
+        <script type="application/javascript" src="/static/js/jquery-2.1.1.js">
+        </script>
+        <script type="application/javascript" src="/static/js/term.js">
+        </script>
+        <script type="application/javascript">
+            function WSSHClient() {
+            }
+
+            WSSHClient.prototype.connect = function(options) {
+                var endpoint = '{{ web_terminal_uri }}';
+
+                if (window.WebSocket) {
+                    this._connection = new WebSocket(endpoint);
+                }
+                else if (window.MozWebSocket) {
+                    this._connection = MozWebSocket(endpoint);
+                }
+                else {
+                    options.onError('WebSocket Not Supported');
+                    return ;
+                }
+
+                this._connection.onopen = function() {
+                    options.onConnect();
+                };
+
+                this._connection.onmessage = function (evt) {
+                    var data = JSON.parse(evt.data.toString());
+                    if (data.error !== undefined) {
+                        options.onError(data.error);
+                    }
+                    else {
+                        options.onData(data.data);
+                    }
+                };
+
+                this._connection.onclose = function(evt) {
+                    options.onClose();
+                };
+            };
+
+            WSSHClient.prototype.send = function(data) {
+                this._connection.send(JSON.stringify({'data': data}));
+            };
+
+            function openTerminal(options) {
+                var client = new WSSHClient();
+                var term = new Terminal(80, 24, function(key) {
+                    client.send(key);
+                });
+                term.open();
+                $('.terminal').detach().appendTo('#term');
+                term.resize(80, 24);
+                term.write('Connecting...');
+                client.connect($.extend(options, {
+                    onError: function(error) {
+                        term.write('Error: ' + error + '\r\n');
+                    },
+                    onConnect: function() {
+                        // Erase our connecting message
+                        term.write('\r');
+                    },
+                    onClose: function() {
+                        term.write('Connection Reset By Peer');
+                    },
+                    onData: function(data) {
+                        term.write(data);
+                    }
+                }));
+            }
+        </script>
+
+        <script type='application/javascript'>
+            $(document).ready(function() {
+                var options = {
+                };
+
+                $('#ssh').show();
+                openTerminal(options);
+            });
+        </script>
+    </body>
+</html>

templates/jperm/dept_perm_edit.html

@@ -1,179 +0,0 @@
-{% extends 'base.html' %}
-{% load mytags %}
-{% block content %}
-{% include 'nav_cat_bar.html' %}
-<script type="text/javascript">
-function search_ip(text, noselect, total){
-    $("#" + noselect).children().each(
-        function(){
-            $(this).remove();
-        });
-
-    $("#" + total).children().each(function(){
-        if($(this).text().search(text) != -1){
-            $("#" + noselect).append($(this).clone())
-        }
-        })
-}
-
-</script>
-
-<div class="wrapper wrapper-content animated fadeInRight">
-    <div class="row">
-        <div class="col-lg-10">
-            <div class="ibox float-e-margins">
-                <div class="ibox-title">
-                    <h5> 部门授权编辑 </h5>
-                    <div class="ibox-tools">
-                        <a class="collapse-link">
-                            <i class="fa fa-chevron-up"></i>
-                        </a>
-                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                            <i class="fa fa-wrench"></i>
-                        </a>
-                        <ul class="dropdown-menu dropdown-user">
-                            <li><a href="#">未启用 1</a>
-                            </li>
-                            <li><a href="#">未启用 2</a>
-                            </li>
-                        </ul>
-                        <a class="close-link">
-                            <i class="fa fa-times"></i>
-                        </a>
-                    </div>
-                </div>
-
-                <select id="assets_total" name="assets" class="form-control m-b" size="12" multiple style="display: none">
-                    {% for asset in assets %}
-                        <option value="{{ asset.id }}">{{ asset.ip }}</option>
-                    {% endfor %}
-                </select>
-
-                <select id="asset_select_total" name="asset_select" class="form-control m-b" size="12"  multiple style="display: none">
-                    {% for asset in asset_select %}
-                    <option value="{{ asset.id }}">{{ asset.ip }}</option>
-                    {% endfor %}
-                </select>
-
-                <div class="ibox-content">
-                    <form id="sudoPerm" method="post" class="form-horizontal" action="">
-                        {% if error %}
-                            <div class="alert alert-warning text-center">{{ error }}</div>
-                        {% endif %}
-                        {% if msg %}
-                            <div class="alert alert-success text-center">{{ msg }}</div>
-                        {% endif %}
-                        <div class="row">
-                            <div class="form-group">
-                                <label for="group_name" class="col-sm-2 control-label">部门</label>
-                                <div class="col-sm-8">
-                                    <input id="dept_id" name="dept_id"  type="text" class="form-control" value="{{ dept.id }}" style="display: none">
-                                    <input id="dept_name" name="dept_name"  type="text" class="form-control" value="{{ dept.name }}" readonly>
-                                </div>
-                            </div>
-
-                            <div class="hr-line-dashed"></div>
-
-                            <div class="form-group">
-                                <label for="group_name" class="col-sm-2 control-label">过滤</label>
-                                <div class="col-sm-4">
-                                    <input id="noselect" class="form-control" oninput="search_ip(this.value, 'assets', 'assets_total')">
-                                </div>
-                                <div class="col-sm-1">
-                                </div>
-                                <div id="select" class="col-sm-3">
-                                    <input  class="form-control" oninput="search_ip(this.value, 'asset_select', 'asset_select_total')">
-                                </div>
-                            </div>
-
-
-                            <div class="form-group">
-                                <label for="" class="col-sm-2 control-label">主机<span class="red-fonts">*</span></label>
-                                <div class="col-sm-4">
-                                    <div>
-                                        <select id="assets" name="assets" class="form-control m-b" size="12" multiple>
-                                            {% for asset in assets %}
-                                            <option value="{{ asset.id }}">{{ asset.ip }}</option>
-                                            {% endfor %}
-                                        </select>
-                                    </div>
-                                </div>
-
-                                <div class="col-sm-1">
-                                    <div class="btn-group" style="margin-top: 60px;">
-                                        <button type="button" class="btn btn-white" onclick="move('assets', 'asset_select', 'assets_total', 'asset_select_total'  )"><i class="fa fa-chevron-right"></i></button>
-                                        <button type="button" class="btn btn-white" onclick="move('asset_select', 'assets', 'asset_select_total', 'assets_total')"><i class="fa fa-chevron-left"></i> </button>
-                                    </div>
-                                </div>
-
-                                <div class="col-sm-3">
-                                    <div>
-                                        <select id="asset_select" name="asset_select" class="form-control m-b" size="12"  multiple>
-                                            {% for asset in asset_select %}
-                                            <option value="{{ asset.id }}">{{ asset.ip }}</option>
-                                            {% endfor %}
-                                        </select>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="form-group">
-                                <div class="col-sm-4 col-sm-offset-2">
-                                    <button class="btn btn-white" type="reset">取消</button>
-                                    <button id="submit_button" class="btn btn-primary" type="submit">确认保存</button>
-                                </div>
-                            </div>
-                        </div>
-                    </form>
-
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-
-<script>
-$('#sudoPerm').validator({
-    timely: 2,
-    theme: "yellow_right_effect",
-    fields: {
-        "name": {
-            rule: "required",
-            tip: "输入授权名",
-            ok: "",
-            msg: {required: "必须填写!"}
-        },
-        "user_groups_select": {
-            rule: "required",
-            tip: "选择用户组",
-            ok: "",
-            msg: {checked: "至少选择一个用户组"}
-        },
-        "asset_groups_select": {
-            rule: "required",
-            tip: "选择主机组",
-            ok: "",
-            msg: {checked: "至少选择一个主机组"}
-        }
-
-    },
-    valid: function(form) {
-        form.submit();
-    }
-});
-
-
-$(document).ready(function(){
-    $("#submit_button").click(function(){
-        $('#sudoPerm option').each(function(){
-            $(this).prop('selected', true)
-        })
-    });
-
-})
-</script>
-
-{% endblock %}

templates/jperm/perm_apply.html

@@ -1,187 +0,0 @@
-{% extends 'base.html' %}
-{% block content %}
-{% include 'nav_cat_bar.html' %}
-<script type="text/javascript">
-    function search_ip(text, noselect, total){
-        $("#" + noselect).children().each(
-            function(){
-                $(this).remove();
-            });
-
-        $("#" + total).children().each(function(){
-            if($(this).text().search(text) != -1){
-                $("#" + noselect).append($(this).clone())
-            }
-            })
-    }
-</script>
-<div class="wrapper wrapper-content animated fadeInRight">
-    <div class="row">
-        <div class="col-lg-10">
-            <div id="add_asset" class="ibox float-e-margins">
-                <div id="ibox-content" class="ibox-title">
-                    <h5> 填写要申请主机的基本信息 </h5>
-                    <div class="ibox-tools">
-                        <a class="collapse-link">
-                            <i class="fa fa-chevron-up"></i>
-                        </a>
-                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                            <i class="fa fa-wrench"></i>
-                        </a>
-                        <ul class="dropdown-menu dropdown-user">
-                        </ul>
-                        <a class="close-link">
-                            <i class="fa fa-times"></i>
-                        </a>
-                    </div>
-                </div>
-
-                <select id="assets_total" name="assets" class="form-control m-b" size="12" multiple style="display: none">
-                    {% for asset in posts %}
-                        <option value="{{ asset.ip }}">{{ asset.ip }}</option>
-                    {% endfor %}
-                </select>
-
-                <select id="asset_select_total" name="j_hosts" class="form-control m-b" size="12"  multiple style="display: none">
-                    {% for asset in eposts %}
-                    <option value="{{ asset.ip }}">{{ asset.ip }}</option>
-                    {% endfor %}
-                </select>
-
-                <div class="ibox-content">
-                    {% if emg %}
-                        <div class="alert alert-warning text-center">{{ emg }}</div>
-                    {% endif %}
-                    {% if smg %}
-                        <div class="alert alert-success text-center">{{ smg }}</div>
-                    {% endif %}
-                    <form id="assetForm" method="post" class="form-horizontal">
-                        {% csrf_token %}
-                        <div class="form-group"><label class="col-sm-2 control-label"> 申请人 <span class="red-fonts">*</span></label>
-                            <div class="col-sm-8"><input type="text" name="applyer" value="{{  user.name }}" class="form-control" readonly="readonly"></div>
-                        </div>
-
-                        <div class="hr-line-dashed"></div>
-                        <div class="form-group"><label class="col-sm-2 control-label"> 所在用户组 <span class="red-fonts">*</span></label>
-                            <div class="col-sm-8"><input type="text" name="dept" value="{{  user.group.all | join:',' }}" class="form-control" readonly="readonly"></div>
-                        </div>
-
-                        <div class="hr-line-dashed"></div>
-                        <div class="form-group" id="j_da"><label class="col-sm-2 control-label"> 管理员 <span class="red-fonts">*</span></label>
-                            <div class="radio">
-                                    <label><input type="radio" value="{{ admin.id }}" name="da"> {{ admin.name }}</label>
-                                {% for da in dept_da %}
-                                    <label><input type="radio" value="{{ da.id }}" name="da"> {{ da.name }}</label>
-                                {% endfor %}
-                            </div>
-                        </div>
-
-                        <div class="hr-line-dashed"></div>
-                        <div class="form-group">
-                            <label for="group" class="col-lg-2 control-label">主机组</label>
-                            <div class="col-sm-8">
-                                <select id="group" name="group" class="form-control m-b" multiple size="10">
-                                    {% for g in egroup %}
-                                        <option type="checkbox" value="{{ g.name }}">{{ g.name }} {% if g.comment %} --- {{ g.comment }} {% endif %}</option>
-                                    {% endfor %}
-                                </select>
-                            </div>
-                        </div>
-
-                        <div class="hr-line-dashed"></div>
-                        <div class="form-group">
-                            <label for="group_name" class="col-sm-2 control-label">过滤</label>
-                            <div class="col-sm-4">
-                                <input id="noselect" class="form-control" oninput="search_ip(this.value, 'assets', 'assets_total')">
-                            </div>
-                            <div class="col-sm-1">
-                            </div>
-                            <div id="select" class="col-sm-3">
-                                <input  class="form-control" oninput="search_ip(this.value, 'asset_select', 'asset_select_total')">
-                            </div>
-                        </div>
-
-
-                        <div class="form-group">
-                            <label for="" class="col-sm-2 control-label">主机<span class="red-fonts">*</span></label>
-                            <div class="col-sm-4">
-                                <div>
-                                    <select id="assets" name="assets" class="form-control m-b" size="12" multiple>
-                                        {% for post in posts %}
-                                        <option value="{{ post.ip }}">{{ post.ip }}</option>
-                                        {% endfor %}
-                                    </select>
-                                </div>
-                            </div>
-
-                            <div class="col-sm-1">
-                                <div class="btn-group" style="margin-top: 60px;">
-                                    <button type="button" class="btn btn-white" onclick="move('assets', 'asset_select', 'assets_total', 'asset_select_total'  )"><i class="fa fa-chevron-right"></i></button>
-                                    <button type="button" class="btn btn-white" onclick="move_left('asset_select', 'assets', 'asset_select_total', 'assets_total')"><i class="fa fa-chevron-left"></i> </button>
-                                </div>
-                            </div>
-
-                            <div class="col-sm-3">
-                                <div>
-                                    <select id="asset_select" name="hosts" class="form-control m-b" size="12"  multiple></select>
-                                </div>
-                            </div>
-                        </div>
-
-
-                        <div class="hr-line-dashed"></div>
-                        <div class="form-group"><label class="col-sm-2 control-label"> 申请说明 </label>
-                            <div class="col-sm-8"><textarea type="text" placeholder="" name="comment" class="form-control" rows="5" cols="20"></textarea></div>
-                        </div>
-
-                        <div class="hr-line-dashed"></div>
-                        <div class="form-group">
-                            <div class="col-sm-4 col-sm-offset-5">
-                                <button class="btn btn-primary" id="submit_button" type="submit"> 提交 </button>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script>
-    $(document).ready(function(){
-        $("#submit_button").click(function(){
-            $('#assetForm option').each(function(){
-                $(this).prop('selected', true)
-            })
-        });
-
-    })
-
-    $('#assetForm').validator({
-    timely: 2,
-    theme: "yellow_right_effect",
-    fields: {
-        "j_da": {
-            rule: "required",
-            tip: "选择管理员",
-            ok: "",
-            msg: {required: "管理员必须选择!"},
-            data: {'data-ok':"ok"}
-        }
-    },
-    valid: function(form) {
-        form.submit();
-        }
-    });
-
-    var $rows = $('#groups option');
-    $('#search').keyup(function() {
-        var val = $.trim($(this).val()).replace(/ +/g, ' ').toLowerCase();
-
-        $rows.show().filter(function() {
-            var text = $(this).text().replace(/\s+/g, ' ').toLowerCase();
-            return !~text.indexOf(val);
-        }).hide();
-    });
-</script>
-{% endblock content %}

templates/jperm/perm_apply_exec.html

@@ -1,31 +0,0 @@
-{% extends 'base.html' %}
-{% block content %}
-{% include 'nav_cat_bar.html' %}
-<!--<h3 class="text-center">项目发布申请</h3>-->
-<div class="wrapper wrapper-content animated fadeInRight">
-    <div class="row">
-        <div class="col-lg-10">
-            <div id="add_asset" class="ibox float-e-margins">
-                <div class="ibox-content">
-                    <h2 id="jumpTo" class="text-center text-info"></h2>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script>
-    function countDown(secs,surl){
-         var jumpTo = document.getElementById('jumpTo');
-         jumpTo.innerHTML='{{ smg }}......' + secs + '秒';
-         if(--secs>0){
-             setTimeout("countDown("+secs+",'"+surl+"')",1000);
-             }
-         else{
-             location.href=surl;
-             }
-         }
-    countDown(10,'/');
-</script>
-
-{% endblock content %}

templates/jperm/perm_apply_info.html

@@ -1,55 +0,0 @@
-{% load mytags %}
-<html>
-    <head>
-        <link href="/static/css/bootstrap.min.css" rel="stylesheet">
-        <script src="/static/js/jquery-2.1.1.js"></script>
-        <script src="/static/js/bootstrap.min.js"></script>
-        <!--<link href="/static/css/style.css" rel="stylesheet">
-        <!--{% include 'head_script.html' %}
-
-        <!--<style type="text/css">-->
-        <!--body-->
-        <!--{-->
-        <!--background: #FFFFFF;-->
-        <!--}-->
-        <!--</style>-->
-    </head>
-
-    <body>
-        <div class="container">
-            <h3 class="text-center"><span class="text-success">{{ post.applyer }}</span>权限申请详情</h3>
-            <br/>
-            <div class="row">
-                <div class="col-xs-5">
-                    <h6 class="text-right">申请人</h6>
-                    <h6 class="text-right">所属部门</h6>
-                    <h6 class="text-right">申请主机组</h6>
-                    <h6 class="text-right">申请主机</h6>
-                    {% for i in post.asset|ast_to_list_1 %}
-                        <h6 class="text-right" style="color: #ffffff">Null</h6>
-                    {% endfor %}
-                    <h6 class="text-right">批准人</h6>
-                    <h6 class="text-right">申请时间</h6>
-                    <h6 class="text-right">批准时间</h6>
-                    <h6 class="text-right">备注</h6>
-                </div>
-                <div class="col-xs-2">
-                    <div class="col-sm-offset-6" style="width: 2; height: 70%; background-color: #1AB394; padding-top: 200px"></div>
-                </div>
-                <div class="col-xs-5">
-                    <h6 class="text-left">{{ post.applyer }}</h6>
-                    <h6 class="text-left">{{ post.dept }}</h6>
-                    <h6 class="text-left">{% for i in post.bisgroup|ast_to_list_1 %} {{ i }} {% endfor %}</h6>
-                    {% for i in post.asset|ast_to_list_1 %}
-                        <h6 class="text-left">{{ i }}</h6>
-                    {% endfor %}
-                    <h6 class="text-right" style="color: #ffffff">Null</h6>
-                    <h6 class="text-left">{{ post.approver }}1</h6>
-                    <h6 class="text-left">{{ post.date_add|date:"Y-m-d H:i:s"}}</h6>
-                    <h6 class="text-left"> {{ post.date_end|date:"Y-m-d H:i:s" }}1 </h6>
-                    <h6 class="text-left"> {{ post.comment }} </h6>
-                </div>
-            </div>
-        </div>
-    </body>
-</html>

templates/jperm/perm_apply_search.html

@@ -1,40 +0,0 @@
-{% load mytags %}
-<div class="tab-content">
-        <table class="table table-striped table-bordered table-hover ">
-            <thead>
-                <tr>
-                    <th class="text-center"> 申请人 </th>
-                    <th class="text-center"> 所属部门 </th>
-                    <th class="text-center"> 申请主机组 </th>
-                    <th class="text-center"> 申请主机 </th>
-                    <th class="text-center"> 批准人 </th>
-                    <th class="text-center"> 申请时间 </th>
-                    <th class="text-center"> 备注 </th>
-                    <th class="text-center"> 详情 </th>
-
-                </tr>
-            </thead>
-            <tbody>
-            {% for post in contacts.object_list %}
-                <tr class="gradeX">
-                    <td class="text-center" id="username"> {{ post.applyer }} </td>
-                    <td class="text-center" id="dept"> {{ post.dept }} </td>
-                    <td class="text-center" id="ip"> {{ post.bisgroup|ast_to_list }} </td>
-                    <td class="text-center" id="remote_ip"> {{ post.asset|ast_to_list }} </td>
-                    <td class="text-center" id="approver"> {{ post.approver }} </td>
-                    <td class="text-center" id="start_time"> {{ post.date_add|date:"Y-m-d H:i:s"}} </td>
-                    <td class="text-center" id=""> {{ post.comment }} </td>
-                    <td class="text-center" data-editable='false'>
-                        <a value="/jperm/apply_info/?uuid={{ post.uuid }}" class="iframe btn btn-xs btn-primary">详情</a>
-                    </td>
-                </tr>
-            {% endfor %}
-            </tbody>
-        </table>
-        <div class="row">
-            <div class="col-sm-6">
-            </div>
-            {% include 'paginator.html' %}
-        </div>
-    </div>
-</div>

templates/jperm/perm_asset_detail.html

@@ -1,61 +0,0 @@
-{% extends 'base.html' %}
-{% load mytags %}
-
-{% block content %}
-    {% include 'nav_cat_bar.html' %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-
-            <div class="col-lg-6">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>授权主机详情</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="#">未启用 1</a>
-                                </li>
-                                <li><a href="#">未启用 2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <table class="table">
-                            <thead>
-                            <tr>
-                                <th>IP</th>
-                                <th>IDC</th>
-                                <th>主机组</th>
-                            </tr>
-                            </thead>
-                            <tbody>
-                                {% for asset in assets_list %}
-                                    <tr>
-                                        <td>{{ asset.ip }}</td>
-                                        <td>{{ asset.idc.name }}</td>
-                                        <td>
-                                            {% for group in asset.bis_group.all|filter_private %}
-                                                {{ group }}
-                                            {% endfor %}
-                                        </td>
-                                    </tr>
-                                {% endfor %}
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-    </div>
-
-{% endblock %}

templates/jperm/perm_detail.html

@@ -1,118 +0,0 @@
-{% extends 'base.html' %}
-{% load mytags %}
-
-{% block content %}
-    {% include 'nav_cat_bar.html' %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-lg-4">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>授权主机/组</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="#">Config option 1</a>
-                                </li>
-                                <li><a href="#">Config option 2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content ibox-heading">
-                        <h3>用户</h3>
-                        <small><i class="fa fa-map-marker"></i> 组下用户.</small>
-                    </div>
-                    <div class="ibox-content inspinia-timeline">
-                        <div class="timeline-item">
-                            <div class="row">
-                                <div class="col-xs-3 date">
-                                    <i class="fa fa-users"></i>
-                                    <b>{{ user_group.name }}</b>
-                                    <br>
-                                    <small class="text-navy">共: {{ group_user_num }} 用户</small>
-                                </div>
-                                <div class="col-xs-7 content no-top-border">
-                                    <p class="m-b-xs"><strong>{{ user_group.comment }}</strong></p>
-                                    <p>
-                                        {% for user in users %}
-                                            {{ user.name }}<br>
-                                        {% endfor %}
-                                    </p>
-                                    <p></p>
-                                </div>
-                            </div>
-                        </div>
-                        {% if not user|get_user_asset_group %}
-                            (无)
-                        {% endif %}
-                    </div>
-                </div>
-            </div>
-
-            <div class="col-lg-4">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>授权主机/组</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="#">Config option 1</a>
-                                </li>
-                                <li><a href="#">Config option 2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content ibox-heading">
-                        <h3>授权主机/组</h3>
-                        <small><i class="fa fa-map-marker"></i> 这里包含了用户所有的主机组和组下的主机.</small>
-                    </div>
-                    <div class="ibox-content inspinia-timeline">
-                        {% for group in asset_groups %}
-                            <div class="timeline-item">
-                                <div class="row">
-                                    <div class="col-xs-3 date">
-                                        <i class="fa fa-repeat"></i>
-                                        <b>{{ group.name }}</b>
-                                        <br>
-                                        <small class="text-navy">共: {{ group | group_asset_list_count }}台</small>
-                                    </div>
-                                    <div class="col-xs-7 content no-top-border">
-                                        <p class="m-b-xs"><strong>{{ group.comment }}</strong></p>
-                                        <p>
-                                            {% for asset in group|group_asset_list %}
-                                                {{ asset.ip }}<br>
-                                            {% endfor %}
-                                        </p>
-                                        <p></p>
-                                    </div>
-                                </div>
-                            </div>
-                        {% endfor %}
-                        {% if not user|get_user_asset_group %}
-                            (暂无)
-                        {% endif %}
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-{% endblock %}

templates/jperm/perm_edit_bak.html

@@ -1,138 +0,0 @@
-{% extends 'base.html' %}
-{% load mytags %}
-
-{% block content %}
-<script type="text/javascript">
-
-
-    function search_host(text){
-        $("#asset_group_unperm").children().each(function(){$(this).remove();});
-        var permArray = [];
-        $("#asset_group_permed").children().each(function(){
-                permArray.push($(this).text());
-        });
-        $("#asset_groups").children().each(function(){
-        if ($(this).text().search(text) != -1 && permArray.indexOf($(this).text()) == -1) {
-          $("#asset_group_unperm").append($(this).clone())
-        }
-        });
-    }
-</script>
-
-    {% include 'nav_cat_bar.html' %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-lg-10">
-                <div class="ibox float-e-margins">
-                    <!-- title -->
-                    <div class="ibox-title">
-                        <h5>授权编辑表单 <small>Edit perm of Group</small></h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="#">Config option 1</a>
-                                </li>
-                                <li><a href="#">Config option 2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <!-- end title -->
-                    <div class="ibox-content">
-                        <div class="row">
-                            <div class="col-sm-5 ">
-                                <div class="form-group">
-                                    <label></label>
-                                    <input type="text" id="group_filter" placeholder="Search" class="form-control" value="" oninput="search_host(this.value)">
-                                </div>
-                            </div>
-                            <div class="col-sm-1 ">
-                                <div class="form-group">
-                                    <label></label>
-                                </div>
-                            </div>
-                            <div class="col-sm-5 ">
-                                <div class="form-group">
-                                    <label></label>
-                                    <input type="text" class="form-control" value="{{ user_group.name }}" readonly>
-                                </div>
-                            </div>
-
-                        </div>
-                        <form method="post"  action="">
-                            <input type="text" name="user_group_name" class="form-control" value="{{ user_group.name }}" style="display: none">
-                            <div class="row">
-                                <div class="col-sm-5"><h4>未授权主机组</h4>
-                                    <div>
-                                        <select id="asset_groups" name="asset_groups" class="form-control" size="10" multiple style="display: none">
-                                            {% for asset_group in asset_groups %}
-                                            <option value="{{ asset_group.id }}">{{ asset_group.name }}</option>
-                                            {% endfor %}
-                                        </select>
-                                        <select id="asset_group_unperm" name="asset_group_unperm" class="form-control m-b" size="12" multiple>
-                                            {% for asset_group in asset_groups_unperm %}
-                                            <option value="{{ asset_group.id }}">{{ asset_group.name }}</option>
-                                            {% endfor %}
-                                        </select>
-                                    </div>
-                                </div>
-
-                                <div class="col-sm-1">
-                                    <div class="btn-group" style="margin-top: 50px;">
-                                        <button type="button" class="btn btn-white" onclick="move('asset_group_unperm', 'asset_group_permed')"><i class="fa fa-chevron-right"></i></button>
-                                        <button type="button" class="btn btn-white" onclick="move('asset_group_permed', 'asset_group_unperm')"><i class="fa fa-chevron-left"></i> </button>
-                                    </div>
-                                </div>
-
-                                <div class="col-sm-5"><h4>授权主机</h4>
-                                    <div>
-                                        <select id="asset_group_permed" name="asset_group_permed" class="form-control m-b" size="12"  multiple>
-                                          {% for asset_group in asset_groups_permed %}
-                                                <option value="{{ asset_group.id }}">{{ asset_group.name  }}</option>
-                                          {% endfor %}
-                                        </select>
-                                    </div>
-                                </div>
-                             </div>
-                            <div class="row">
-                                <div class="form-group">
-                                <div class="col-sm-4 col-sm-offset-2">
-                                    <button class="btn btn-white" type="submit">取消</button>
-                                    <button class="btn btn-primary" type="submit" onclick="javascript: (function(){$('#asset_group_permed option').each(function(){$(this).prop('selected', true)})})()">确认保存</button>
-                                </div>
-                            </div>
-                            </div>
-                        </form>
-
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <script>
-        var str = document.location.pathname.split("/")[1];
-        var str1 = document.location.pathname.split("/")[2];
-        $("#"+str).addClass('active');
-        $("#"+str1).addClass('active');
-    </script>
-{#    <script type="text/javascript">#}
-{#        $("#asset_group_permed").children().each(function(){#}
-{#          $("#asset_groups").append($(this).clone());#}
-{##}
-{#          if ($(this).prop("selected") == false) {#}
-{#            $("#asset_group_unperm").append(this);#}
-{#          }#}
-{##}
-{#          $("#asset_groups").children().each(function(){$(this).prop("selected", false)});#}
-{#        });#}
-{#    </script>#}
-
-{% endblock %}

templates/jperm/perm_group_edit.html

@@ -8,7 +8,7 @@
         <div class="col-lg-10">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
-                    <h5> 主机授权添加 </h5>
+                    <h5> {{ user_group.name }}授权修改</h5>
                     <div class="ibox-tools">
                         <a class="collapse-link">
                             <i class="fa fa-chevron-up"></i>
@@ -23,7 +23,7 @@
                 </div>
 
                 <div class="ibox-content">
-                    <form id="sudoPerm" method="post" class="form-horizontal" action="">
+                    <form id="userPerm" method="post" class="form-horizontal" action="../perm_group_edit/?id={{ user_group.id }}">
                         {% if error %}
                             <div class="alert alert-warning text-center">{{ error }}</div>
                         {% endif %}
@@ -32,42 +32,48 @@
                         {% endif %}
                         <div class="row">
                             <div class="form-group">
-                                <label for="" class="col-sm-2 control-label">用户<span class="red-fonts">*</span></label>
+                                <label for="" class="col-sm-2 control-label">用户组<span class="red-fonts">*</span></label>
+                                <div class="col-sm-4">
+                                    <input id="user_group_name" name="user_group_name"  type="text" class="form-control" value="{{ user_group.name }}" readonly>
+                                </div>
+                            </div>
+
+                            <div class="hr-line-dashed"></div>
+
+                            <div class="form-group">
+                                <label for="" class="col-sm-2 control-label">资产<span class="red-fonts">*</span></label>
                                 <div class="col-sm-4">
                                     <div>
-                                        <select id="user_groups" name="user_groups" class="form-control" size="12" multiple>
-                                            {% for user_group in user_groups %}
-                                            <option value="{{ user_group.id }}">{{ user_group.name }}</option>
+                                        <select id="assets" name="assets" class="form-control m-b" size="12" multiple>
+                                            {% for asset in assets %}
+                                            <option value="{{ asset.id }}">{{ asset.ip }}</option>
                                             {% endfor %}
                                         </select>
                                     </div>
                                 </div>
 
                                 <div class="col-sm-1">
-                                    <div class="btn-group" style="margin-top: 12px;">
-                                        <button type="button" class="btn btn-white" onclick="move('user_groups', 'user_groups_select')"><i class="fa fa-chevron-right"></i></button>
-                                        <button type="button" class="btn btn-white" onclick="move('user_groups_select', 'user_groups')"><i class="fa fa-chevron-left"></i> </button>
+                                    <div class="btn-group" style="margin-top: 42px;">
+                                        <button type="button" class="btn btn-white" onclick="move('assets', 'asset_select')"><i class="fa fa-chevron-right"></i></button>
+                                        <button type="button" class="btn btn-white" onclick="move('asset_select', 'assets')"><i class="fa fa-chevron-left"></i> </button>
                                     </div>
                                 </div>
 
                                 <div class="col-sm-3">
                                     <div>
-                                        <select id="user_groups_select" name="user_groups_select" class="form-control m-b" size="12"  multiple>
+                                        <select id="asset_select" name="asset_select" class="form-control m-b" size="12"  multiple>
+                                            {% for asset in asset_permed %}
+                                            <option value="{{ asset.id }}">{{ asset.ip }}</option>
+                                            {% endfor %}
                                         </select>
                                     </div>
                                 </div>
                             </div>
 
                             <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label for="group_name" class="col-sm-2 control-label">类型<span class="red-fonts">*</span></label>
-                                <div class="col-sm-8">
-                                    <input id="comment" name="comment" placeholder="备注说明" type="text" class="form-control">
-                                </div>
-                            </div>
 
                             <div class="form-group">
-                                <label for="" class="col-sm-2 control-label">主机组<span class="red-fonts">*</span></label>
+                                <label for="" class="col-sm-2 control-label">资产组<span class="red-fonts">*</span></label>
                                 <div class="col-sm-4">
                                     <div>
                                         <select id="asset_groups" name="asset_groups" class="form-control m-b" size="12" multiple>
@@ -79,7 +85,7 @@
                                 </div>
 
                                 <div class="col-sm-1">
-                                    <div class="btn-group" style="margin-top: 12px;">
+                                    <div class="btn-group" style="margin-top: 42px;">
                                         <button type="button" class="btn btn-white" onclick="move('asset_groups', 'asset_groups_select')"><i class="fa fa-chevron-right"></i></button>
                                         <button type="button" class="btn btn-white" onclick="move('asset_groups_select', 'asset_groups')"><i class="fa fa-chevron-left"></i> </button>
                                     </div>
@@ -88,26 +94,20 @@
                                 <div class="col-sm-3">
                                     <div>
                                         <select id="asset_groups_select" name="asset_groups_select" class="form-control m-b" size="12"  multiple>
+                                            {% for asset_group in asset_group_permed %}
+                                            <option value="{{ asset_group.id }}">{{ asset_group.name }}</option>
+                                            {% endfor %}
                                         </select>
                                     </div>
                                 </div>
                             </div>
-
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label for="group_name" class="col-sm-2 control-label">备注</label>
-                                <div class="col-sm-8">
-                                    <input id="comment" name="comment" placeholder="备注说明" type="text" class="form-control">
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
                         </div>
 
                         <div class="row">
                             <div class="form-group">
                                 <div class="col-sm-4 col-sm-offset-2">
                                     <button class="btn btn-white" type="reset">取消</button>
-                                    <button id="submit_button" class="btn btn-primary" type="submit">确认保存</button>
+                                    <button id="submit_button" class="btn btn-primary" type="submit" onclick="selectAll()">确认保存</button>
                                 </div>
                             </div>
                         </div>
@@ -130,18 +130,6 @@ $('#sudoPerm').validator({
             tip: "输入授权名",
             ok: "",
             msg: {required: "必须填写!"}
-        },
-        "user_groups_select": {
-            rule: "required",
-            tip: "选择用户组",
-            ok: "",
-            msg: {checked: "至少选择一个用户组"}
-        },
-        "asset_groups_select": {
-            rule: "required",
-            tip: "选择主机组",
-            ok: "",
-            msg: {checked: "至少选择一个主机组"}
         }
 
     },
@@ -156,6 +144,7 @@ $(document).ready(function(){
         $('#user_groups_select option').each(function(){
             $(this).prop('selected', true)
         })
+
         $('#asset_groups_select option').each(function(){
             $(this).prop('selected', true)
         })

templates/jperm/perm_group_list.html

@@ -16,12 +16,6 @@
                         <a class="dropdown-toggle" data-toggle="dropdown" href="#">
                             <i class="fa fa-wrench"></i>
                         </a>
-                        <ul class="dropdown-menu dropdown-user">
-                            <li><a href="#">未启用 1</a>
-                            </li>
-                            <li><a href="#">未启用 2</a>
-                            </li>
-                        </ul>
                         <a class="close-link">
                             <i class="fa fa-times"></i>
                         </a>
@@ -30,13 +24,13 @@
 
                 <div class="ibox-content">
                     <div class="">
-                    <a target="_blank" href="/juser/group_add/" class="btn btn-sm btn-primary "> 添加小组 </a>
+                    <a target="_blank" href="/juser/group_add/" class="btn btn-sm btn-primary "> 添加用户组 </a>
                     <form id="search_form" method="get" action="" class="pull-right mail-search">
                         <div class="input-group">
                             <input type="text" class="form-control input-sm" id="search_input" name="search" placeholder="Search">
                             <div class="input-group-btn">
                                 <button id='search_btn' type="submit" class="btn btn-sm btn-primary">
-                                    Search
+                                    - 搜索 -
                                 </button>
                             </div>
                         </div>
@@ -46,27 +40,25 @@
                     <table class="table table-striped table-bordered table-hover " id="editable" >
                         <thead>
                             <tr>
-                                <th class="text-center">组名</th>
-                                <th class="text-center">所属部门</th>
-                                <th class="text-center">成员数目</th>
-                                <th class="text-center">授权主机组数目</th>
-                                <th class="text-center">授权主机数目</th>
-                                <th class="text-center">备注</th>
+                                <th class="text-center">用户组</th>
+                                <th class="text-center">成员</th>
+                                <th class="text-center">授权资产</th>
+                                <th class="text-center">授权资产组</th>
                                 <th class="text-center">操作</th>
                             </tr>
                         </thead>
                         <tbody>
-                        {% for group in contacts.object_list %}
+                        {% for user_group in user_groups.object_list %}
                             <tr class="gradeX">
-                                <td class="text-center"> {{ group.name }} </td>
-                                <td class="text-center"> {{ group.dept.name }} </td>
-                                <td class="text-center"> <a href="/juser/user_list/?gid={{ group.id }}">{{ group.id | member_count }} </a> </td>
-                                <td class="text-center"> <a href="/jasset/group_list/?gid={{ group.id }}"> {{ group.id | ugrp_perm_agrp_count }} </a> </td>
-                                <td class="text-center"> <a href="/jasset/host_list/?gid={{ group.id }}">{{ group.id | ugrp_perm_asset_count }} </a> </td>
-                                <td class="text-center"> {{ group.comment }} </td>
+                                <td class="text-center"> {{ user_group.name }} </td>
                                 <td class="text-center">
-                                    <a href="../perm_detail/?id={{ group.id }}" class="btn btn-xs btn-primary">详情</a>
-                                    <a href="../perm_edit/?id={{ group.id }}" class="btn btn-xs btn-danger">授权编辑</a>
+                                    <a href="/juser/user_list/?gid={{ user_group.id }}">{{ user_group.user_set.all | length  }} </a>
+                                </td>
+                                <td class="text-center"> <a href="/jasset/asset_list/?gid={{ user_group.id }}">{{ user_group | user_asset_count }} </a> </td>
+                                <td class="text-center"> <a href="/jasset/group_list/?gid={{ user_group.id }}">{{ user_group | user_asset_group_count }}</a></td>
+                                <td class="text-center">
+                                    <a href="../perm_user_detail/?id={{ user_group.id }}" class="btn btn-xs btn-primary">详情</a>
+                                    <a href="../perm_group_edit/?id={{ user_group.id }}" class="btn btn-xs btn-danger">编辑</a>
                                 </td>
                             </tr>
                         {% endfor %}
@@ -75,7 +67,7 @@
                     <div class="row">
                         <div class="col-sm-6">
                             <div class="dataTables_info" id="editable_info" role="status" aria-live="polite">
-                                Showing {{ contacts.start_index }} to {{ contacts.end_index }} of {{ p.count }} entries
+                                Showing {{ users.start_index }} to {{ users.end_index }} of {{ p.count }} entries
                             </div>
                         </div>
                         {% include 'paginator.html' %}
@@ -86,23 +78,4 @@
     </div>
 </div>
 
-<script>
-    $(document).ready(function(){
-        $(".iframe").colorbox({iframe:true, width:"70%", height:"70%"});
-        var check_array = []
-        $('#del_btn').click(function(){
-            $(".gradeX input:checked").each(function() {check_array.push($(this).attr("value")) })
-            $(".gradeX input:checked").closest("tr").remove()
-            $.post("/juser/group_del_ajax/",
-                    {group_ids: check_array.join(",")},
-                    function(data){
-                        alert(data)
-                    }
-            )
-        })
-    });
-
-
-</script>
-
 {% endblock %}

templates/jperm/perm_list_ajax.html

@@ -1,132 +0,0 @@
-{% load mytags %}
-{% ifequal tab 'tab1' %}
-    <table class="table table-striped table-bordered table-hover " id="editable" >
-        <thead>
-            <tr>
-                <th class="text-center">组名</th>
-                <th class="text-center">
-                <span class="text-muted text-xs block">类型</span>
-                </th>
-                <th class="text-center">成员数量</th>
-                <th class="text-center">授权数量</th>
-                <th class="text-center">操作</th>
-            </tr>
-        </thead>
-        <tbody id="perm_edit">
-        {% for group in contacts.object_list %}
-            <tr class="gradeX">
-                <td class="text-center"> {{ group.name }} </td>
-                <td class="text-center"> {{ group.type|group_type_to_str }} </td>
-                <td class="text-center"> {{ group.id|member_count }} </td>
-                <td class="text-center"> {{ group.id|perm_count }} </td>
-                <td class="text-center">
-                    <a title="[ {{ group.name }} ] 授权详情" href="../perm_detail/?id={{ group.id }}" class="iframe btn btn-xs btn-primary">详情</a>
-                    <a href="../perm_edit/?id={{ group.id }}" class="btn btn-xs btn-info">编辑</a>
-                    <a href="../perm_del/?id={{ group.id }}" class="btn btn-xs btn-danger">删除</a>
-                </td>
-            </tr>
-        {% endfor %}
-        </tbody>
-    </table>
-    <div class="row">
-        <div class="col-sm-6">
-            <div class="dataTables_info" id="editable_info" role="status" aria-live="polite">
-                Showing {{ contacts.start_index }} to {{ contacts.end_index }} of {{ p.count }} entries
-            </div>
-        </div>
-        <div class="col-sm-6">
-            <div class="dataTables_paginate paging_simple_numbers" id="editable_paginate">
-                <ul class="pagination" style="margin-top: 0; float: right">
-                    {% if contacts.has_previous %}
-                        <li class="paginate_button previous" aria-controls="editable" tabindex="0" id="editable_previous">
-                            <a href="?page={{ contacts.previous_page_number }}">Previous</a>
-                        </li>
-                    {% else %}
-                        <li class="paginate_button previous disabled" aria-controls="editable" tabindex="0" id="editable_previous">
-                             <a href="#">Previous</a>
-                        </li>
-                    {% endif %}
-                    {% for page in p.page_range %}
-                        {% ifequal offset1 page %}
-                            <li class="paginate_button active"  aria-controls="editable" tabindex="0"><a href="?page={{ page }}"  title="第{{ page }}页">{{ page }}</a></li>
-                        {% else %}
-                            <li class="paginate_button" aria-controls="editable" tabindex="0"><a href="?page={{ page }}"  title="第{{ page }}页">{{ page }}</a></li>
-                        {% endifequal %}
-                    {% endfor %}
-                    {% if contacts.has_next %}
-                        <li class="paginate_button next" aria-controls="editable" tabindex="0" id="editable_next">
-                            <a href="?page={{ contacts.next_page_number }}">Next</a>
-                        </li>
-                    {% else %}
-                        <li class="paginate_button next disabled" aria-controls="editable" tabindex="0" id="editable_next">
-                            <a href="#">Next</a>
-                        </li>
-                    {% endif %}
-                </ul>
-            </div>
-        </div>
-    </div>
-{% else %}
-    <table class="table table-striped table-bordered table-hover " id="editable" >
-        <thead>
-            <tr>
-                <th class="text-center">用户</th>
-                <th class="text-center">角色</th>
-                <th class="text-center">属组</th>
-                <th class="text-center">主机数量</th>
-                <th class="text-center">操作</th>
-            </tr>
-        </thead>
-        <tbody id="perm_list">
-        {% for user in contacts2.object_list %}
-            <tr class="gradeX">
-                <td class="text-center"> {{ user.name }} </td>
-                <td class="text-center"> {{ user.id | get_role }} </td>
-                <td class="text-center"> {{ user.username | groups_str }} </td>
-                <td class="text-center"> {{ user.id | perm_asset_count }} </td>
-                <td class="text-center">
-                    <a title="{{ user.name }} ] 授权详情" href="../perm_asset_detail/?id={{ user.id }}" class="iframe btn btn-xs btn-primary">详情</a>
-                </td>
-            </tr>
-        {% endfor %}
-        </tbody>
-    </table>
-    <div class="row">
-        <div class="col-sm-6">
-            <div class="dataTables_info" id="editable_info" role="status" aria-live="polite">
-                Showing {{ contacts2.start_index }} to {{ contacts2.end_index }} of {{ p2.count }} entries
-            </div>
-        </div>
-        <div class="col-sm-6">
-            <div class="dataTables_paginate paging_simple_numbers" id="editable_paginate">
-                <ul class="pagination" style="margin-top: 0; float: right">
-                    {% if contacts2.has_previous %}
-                        <li class="paginate_button previous" aria-controls="editable" tabindex="0" id="editable_previous">
-                            <a href="?page={{ contacts2.previous_page_number }}">Previous</a>
-                        </li>
-                    {% else %}
-                        <li class="paginate_button previous disabled" aria-controls="editable" tabindex="0" id="editable_previous">
-                             <a href="#">Previous</a>
-                        </li>
-                    {% endif %}
-                    {% for page in p2.page_range %}
-                        {% ifequal offset1 page %}
-                            <li class="paginate_button active"  aria-controls="editable" tabindex="0"><a href="?page={{ page }}"  title="第{{ page }}页">{{ page }}</a></li>
-                        {% else %}
-                            <li class="paginate_button" aria-controls="editable" tabindex="0"><a href="?page={{ page }}"  title="第{{ page }}页">{{ page }}</a></li>
-                        {% endifequal %}
-                    {% endfor %}
-                    {% if contacts2.has_next %}
-                        <li class="paginate_button next" aria-controls="editable" tabindex="0" id="editable_next">
-                            <a href="?page={{ contacts2.next_page_number }}">Next</a>
-                        </li>
-                    {% else %}
-                        <li class="paginate_button next disabled" aria-controls="editable" tabindex="0" id="editable_next">
-                            <a href="#">Next</a>
-                        </li>
-                    {% endif %}
-                </ul>
-            </div>
-        </div>
-    </div>
-{% endifequal %}

templates/jperm/perm_log.html

@@ -1,12 +1,14 @@
 {% extends 'base.html' %}
+{% load mytags %}
 {% block content %}
 {% include 'nav_cat_bar.html' %}
+
 <div class="wrapper wrapper-content animated fadeInRight">
     <div class="row">
-        <div class="col-lg-12">
+        <div class="col-lg-10">
             <div class="ibox float-e-margins">
-                <div id="ibox-content" class="ibox-title">
-                    <h5> 用户权限申请详细信息列表 </h5>
+                <div class="ibox-title">
+                    <h5> 查看小组</h5>
                     <div class="ibox-tools">
                         <a class="collapse-link">
                             <i class="fa fa-chevron-up"></i>
@@ -14,12 +16,6 @@
                         <a class="dropdown-toggle" data-toggle="dropdown" href="#">
                             <i class="fa fa-wrench"></i>
                         </a>
-                        <ul class="dropdown-menu dropdown-user">
-                            <li><a href="#">未启用 1</a>
-                            </li>
-                            <li><a href="#">未启用 2</a>
-                            </li>
-                        </ul>
                         <a class="close-link">
                             <i class="fa fa-times"></i>
                         </a>
@@ -27,67 +23,66 @@
                 </div>
 
                 <div class="ibox-content">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li><a href="/jperm/apply/online/" class="text-center"><i class="fa fa-laptop"></i> 未审批 </a></li>
-                            <li class="active"><a href="/jperm/apply/offline/" class="text-center"><i class="fa fa-bar-chart-o"></i> 已审批 </a></li>
-                            <li style="float: right">
-                                <form id="search_form" method="get" action="" class="pull-right mail-search">
-                                    <div class="input-group">
-                                        <input type="text" class="form-control input-sm" id="search_input" name="keyword" placeholder="Search">
-                                        <input type="text" style="display: none">
-                                        <div class="input-group-btn">
-                                            <button id='search_btn' type="button" class="btn btn-sm btn-primary" onclick="log_search()">
-                                                Search
-                                            </button>
-                                        </div>
-                                    </div>
-                                </form>
-                            </li>
-                        </ul>
-                    </div>
-                    <br/>
-                    <div class="tab-content">
-                        <table class="table table-striped table-bordered table-hover ">
-                            <thead>
-                                <tr>
-                                    <th class="text-center"> 申请人 </th>
-                                    <th class="text-center"> 所属部门 </th>
-                                    <th class="text-center"> 申请主机组 </th>
-                                    <th class="text-center"> 申请主机 </th>
-                                    <th class="text-center"> 申请时间 </th>
-                                    <th class="text-center"> 批准时间 </th>
-                                    <th class="text-center"> 备注 </th>
-
-                                </tr>
-                            </thead>
-                            <tbody>
-                            {% for post in contacts.object_list %}
-                                <tr class="gradeX">
-                                    <td class="text-center" id="username"> {{ post.applyer }} </td>
-                                    <td class="text-center" id="dept"> {{ post.dept }} </td>
-                                    <td class="text-center" id="ip"> {{ post.bisgroup }} </td>
-                                    <td class="text-center" id="remote_ip"> {{ post.asset }} </td>
-                                    <!--{% ifnotequal session_role_id 0 %}-->
-                                        <!--<td class="text-center"><a href="/jlog/history/?id={{ post.id }}" class="log_command"> 命令统计 </td>-->
-                                    <!--{% endifnotequal %}-->
-                                    <td class="text-center" id="start_time"> {{ post.date_add|date:"Y-m-d H:i:s"}} </td>
-                                    <td class="text-center" id="end_time"> {{ post.date_end|date:"Y-m-d H:i:s" }} </td>
-                                    <td class="text-center" id=""> {{ post.comment }} </td>
-                                </tr>
-                            {% endfor %}
-                            </tbody>
-                        </table>
-                        <div class="row">
-                            <div class="col-sm-6">
+                    <div class="">
+                    <form id="search_form" method="get" action="" class="pull-right mail-search">
+                        <div class="input-group">
+                            <input type="text" class="form-control input-sm" id="search_input" name="search" placeholder="Search">
+                            <div class="input-group-btn">
+                                <button id='search_btn' type="submit" class="btn btn-sm btn-primary">
+                                    - 搜索 -
+                                </button>
                             </div>
-                            {% include 'paginator.html' %}
                         </div>
-                    </div>    
+                    </form>
+                    </div>
+
+                    <table class="table table-striped table-bordered table-hover " id="editable" >
+                        <thead>
+                            <tr>
+                                <th class="text-center">日期</th>
+                                <th class="text-center">动作</th>
+                                <th class="text-center">成功</th>
+                                <th class="text-center">完成</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        {% for log in logs %}
+                            <tr class="gradeX">
+                                <td class="text-center"> {{ log.datetime | date:"Y-n-d G:i:s" }} </td>
+                                <td class="text-center"> {{ log.action }} </td>
+                                <td class="text-center">
+                                    <a class="log_result" value="{{ log.results }}">
+                                    {{ log.is_success | yesno:"是,否,为止" }}
+                                    </a>
+                                </td>
+                                <td class="text-center"> {{ log.is_finish | yesno:"是,否,为止" }} </td>
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+                    <div class="row">
+                        <div class="col-sm-6">
+                            <div class="dataTables_info" id="editable_info" role="status" aria-live="polite">
+                                Showing {{ users.start_index }} to {{ users.end_index }} of {{ p.count }} entries
+                            </div>
+                        </div>
+                        {% include 'paginator.html' %}
+                    </div>
                 </div>
             </div>
         </div>
     </div>
 </div>
 
+{% endblock %}
+
+{% block self_footer_js %}
+<script>
+$('document').ready(function(){
+    $('.log_result').click(function(){
+        alert($(this).attr('value'))
+    })
+})
+</script>
+
 {% endblock %}

templates/jperm/perm_log_offline.html

@@ -1,127 +0,0 @@
-{% extends 'base.html' %}
-{% load mytags %}
-{% block content %}
-{% include 'nav_cat_bar.html' %}
-<div class="wrapper wrapper-content animated fadeInRight">
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox float-e-margins">
-                <div id="ibox-content" class="ibox-title">
-                    <h5> 用户权限申请详细信息列表 </h5>
-                    <div class="ibox-tools">
-                        <a class="collapse-link">
-                            <i class="fa fa-chevron-up"></i>
-                        </a>
-                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                            <i class="fa fa-wrench"></i>
-                        </a>
-                        <ul class="dropdown-menu dropdown-user">
-                            <li><a href="#">未启用 1</a>
-                            </li>
-                            <li><a href="#">未启用 2</a>
-                            </li>
-                        </ul>
-                        <a class="close-link">
-                            <i class="fa fa-times"></i>
-                        </a>
-                    </div>
-                </div>
-
-                <div class="ibox-content">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li><a href="/jperm/apply_show/online/" class="text-center"><i class="fa fa-laptop"></i> 未审批 </a></li>
-                            <li class="active"><a href="/jperm/apply_show/offline/" class="text-center"><i class="fa fa-bar-chart-o"></i> 已审批 </a></li>
-                            <li style="float: right">
-                                <form id="search_form" method="get" action="" class="pull-right mail-search">
-                                    <div class="input-group">
-                                        <input type="text" class="form-control input-sm" id="search_input" name="keyword" placeholder="Search">
-                                        <input type="text" style="display: none">
-                                        <div class="input-group-btn">
-                                            <button id='search_btn' type="button" class="btn btn-sm btn-primary" onclick="apply_search()">
-                                                Search
-                                            </button>
-                                        </div>
-                                    </div>
-                                </form>
-                            </li>
-                        </ul>
-                    </div>
-                    <br/>
-                    <div class="tab-content">
-                        <table class="table table-striped table-bordered table-hover ">
-                            <thead>
-                                <tr>
-                                    <th class="text-center"> 申请人 </th>
-                                    <th class="text-center"> 所属部门 </th>
-                                    <th class="text-center"> 申请主机组 </th>
-                                    <th class="text-center"> 申请主机 </th>
-                                    <th class="text-center"> 批准人 </th>
-                                    <th class="text-center"> 申请时间 </th>
-                                    <th class="text-center"> 备注 </th>
-                                    <th class="text-center"> 详情 </th>
-
-                                </tr>
-                            </thead>
-                            <tbody>
-                            {% for post in contacts.object_list %}
-                                <tr class="gradeX">
-                                    <td class="text-center" id="username"> {{ post.applyer }} </td>
-                                    <td class="text-center" id="dept"> {{ post.dept }} </td>
-                                    <td class="text-center" id="ip"> {{ post.bisgroup|ast_to_list }} </td>
-                                    <td class="text-center" id="remote_ip">{{ post.asset|ast_to_list }} </td>
-                                    <td class="text-center" id="approver"> {{ post.approver }} </td>
-                                    <td class="text-center" id="start_time"> {{ post.date_add|date:"Y-m-d H:i:s"}} </td>
-                                    <td class="text-center" id=""> {{ post.comment }} </td>
-                                    <td class="text-center" data-editable='false'>
-                                        <a value="/jperm/apply_info/?uuid={{ post.uuid }}" class="iframe btn btn-xs btn-primary">详情</a>
-                                    </td>
-                                </tr>
-                            {% endfor %}
-                            </tbody>
-                        </table>
-                        <div class="row">
-                            <div class="col-sm-6">
-                            </div>
-                            {% include 'paginator.html' %}
-                        </div>
-                    </div>    
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script>
-    $(".iframe").on('click', function(){
-        var url= $(this).attr("value");
-        $.layer({
-            type: 2,
-            title: '权限申请详情',
-            maxmin: true,
-            shift: 'top',
-            border: [2, 0.3, '#1AB394'],
-            shade: [0.5, '#000000'],
-            shadeClose: true,
-            area : ['800px' , '600px'],
-            iframe: {src: url}
-        });
-    });
-    function apply_search(){
-        $.ajax({
-            type: "GET",
-            url: "/jperm/apply_search/?env=offline",
-            data: $("#search_form").serialize(),
-            success: function (data) {
-                $(".tab-content").html(data);
-            }
-        });
-    }
-    $("#search_input").keydown(function(e){
-        if(e.keyCode==13){
-            apply_search()
-            }
-    })
-</script>
-
-{% endblock %}

templates/jperm/perm_log_online.html

@@ -1,128 +0,0 @@
-{% extends 'base.html' %}
-{% load mytags %}
-{% block content %}
-{% include 'nav_cat_bar.html' %}
-<div class="wrapper wrapper-content animated fadeInRight">
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox float-e-margins">
-                <div id="ibox-content" class="ibox-title">
-                    <h5> 用户权限申请详细信息列表 </h5>
-                    <div class="ibox-tools">
-                        <a class="collapse-link">
-                            <i class="fa fa-chevron-up"></i>
-                        </a>
-                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                            <i class="fa fa-wrench"></i>
-                        </a>
-                        <ul class="dropdown-menu dropdown-user">
-                            <li><a href="#">未启用 1</a>
-                            </li>
-                            <li><a href="#">未启用 2</a>
-                            </li>
-                        </ul>
-                        <a class="close-link">
-                            <i class="fa fa-times"></i>
-                        </a>
-                    </div>
-                </div>
-
-                <div class="ibox-content">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li class="active"><a href="/jperm/apply_show/online/" class="text-center"><i class="fa fa-laptop"></i> 未审批 </a></li>
-                            <li><a href="/jperm/apply_show/offline/" class="text-center"><i class="fa fa-bar-chart-o"></i> 已审批 </a></li>
-                            <li style="float: right">
-                                <form id="search_form" method="get" action="" class="pull-right mail-search">
-                                    <div class="input-group">
-                                        <input type="text" class="form-control input-sm" id="search_input" name="keyword" placeholder="Search">
-                                        <input type="text" style="display: none">
-                                        <div class="input-group-btn">
-                                            <button id='search_btn' type="button" class="btn btn-sm btn-primary" onclick="apply_search()">
-                                                Search
-                                            </button>
-                                        </div>
-                                    </div>
-                                </form>
-                            </li>
-                        </ul>
-                    </div>
-                    <br/>
-                    <div class="tab-content">
-                        <table class="table table-striped table-bordered table-hover ">
-                            <thead>
-                                <tr>
-                                    <th class="text-center"> 申请人 </th>
-                                    <th class="text-center"> 所属部门 </th>
-                                    <th class="text-center"> 申请主机组 </th>
-                                    <th class="text-center"> 申请主机 </th>
-                                    <th class="text-center"> 申请时间 </th>
-                                    <th class="text-center"> 备注 </th>
-                                    <th class="text-center"> 操作 </th>
-
-                                </tr>
-                            </thead>
-                            <tbody>
-                            {% for post in contacts.object_list %}
-                                <tr class="gradeX">
-                                    <td class="text-center" id="username"> {{ post.applyer }} </td>
-                                    <td class="text-center" id="dept"> {{ post.dept }} </td>
-                                    <td class="text-center" id="ip"> {{ post.bisgroup|ast_to_list }}</td>
-                                    <td class="text-center" id="remote_ip"> {{ post.asset|ast_to_list }} </td>
-                                    <td class="text-center" id="start_time"> {{ post.date_add|date:"Y-m-d H:i:s"}} </td>
-                                    <td class="text-center" id=""> {{ post.comment }} </td>
-                                    <td class="text-center" data-editable='false'>
-                                    <a value="/jperm/apply_info/?uuid={{ post.uuid }}" class="iframe btn btn-xs btn-primary">详情</a>
-                                        {% ifnotequal session_role_id 0 %}
-                                            <a href="/jperm/apply_exec/?uuid={{ post.uuid }}" class="btn btn-xs btn-info">确认</a>
-                                            <a href="/jperm/apply_del/?uuid={{ post.uuid }}" class="btn btn-xs btn-danger">删除</a>
-                                        {% endifnotequal %}
-                                    </td>
-                                </tr>
-                            {% endfor %}
-                            </tbody>
-                        </table>
-                        <div class="row">
-                            <div class="col-sm-6">
-                            </div>
-                            {% include 'paginator.html' %}
-                        </div>
-                    </div>    
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script>
-    $(".iframe").on('click', function(){
-        var url= $(this).attr("value");
-        $.layer({
-            type: 2,
-            title: '权限申请详情',
-            maxmin: true,
-            shift: 'top',
-            border: [2, 0.3, '#1AB394'],
-            shade: [0.5, '#000000'],
-            shadeClose: true,
-            area : ['800px' , '600px'],
-            iframe: {src: url}
-        });
-    });
-    function apply_search(){
-        $.ajax({
-            type: "GET",
-            url: "/jperm/apply_search/?env=online",
-            data: $("#search_form").serialize(),
-            success: function (data) {
-                $(".tab-content").html(data);
-            }
-        });
-    }
-    $("#search_input").keydown(function(e){
-        if(e.keyCode==13){
-            apply_search()
-            }
-    })
-</script>
-
-{% endblock %}

templates/jperm/perm_user_detail.html

@@ -1,240 +0,0 @@
-{% extends 'base.html' %}
-{% load mytags %}
-{% block content %}
-{% include 'nav_cat_bar.html' %}
-
-<div class="wrapper wrapper-content animated fadeInRight">
-    <div class="row">
-        <div class="col-lg-10">
-            <div class="ibox float-e-margins">
-                <div class="ibox-title">
-                    <h5> 用户授权详情</h5>
-                    <div class="ibox-tools">
-                        <a class="collapse-link">
-                            <i class="fa fa-chevron-up"></i>
-                        </a>
-                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                            <i class="fa fa-wrench"></i>
-                        </a>
-                        <ul class="dropdown-menu dropdown-user">
-                            <li><a href="#">未启用 1</a>
-                            </li>
-                            <li><a href="#">未启用 2</a>
-                            </li>
-                        </ul>
-                        <a class="close-link">
-                            <i class="fa fa-times"></i>
-                        </a>
-                    </div>
-                </div>
-
-                <div class="ibox-content">
-                    <div class="panel blank-panel">
-                        <div class="panel-heading">
-                            <div class="panel-options">
-                                <ul class="nav nav-tabs">
-                                    <li id="tab1" class="active"><a data-toggle="tab" href="/perm_list/">授权查看</a></li>
-                                    <li id="tab2" class=""><a data-toggle="tab" href="/perm_user_detail/">用户授权详情</a></li>
-                                    <li style="float: right">
-                                        <form method="get" action="" class="pull-right mail-search">
-                                            <div class="input-group">
-                                                <input type="text" class="form-control input-sm" id="search_input" name="search" placeholder="Search">
-                                                <div class="input-group-btn">
-                                                    <button id='search_btn' type="button" class="btn btn-sm btn-primary">
-                                                        Search
-                                                    </button>
-                                                </div>
-                                            </div>
-                                        </form>
-                                    </li>
-                                </ul>
-                            </div>
-                        </div>
-
-                        <div class="panel-body">
-
-                            <div class="tab-content">
-                                <div id="tab-1" class="tab-pane active">
-                                    <table class="table table-striped table-bordered table-hover " id="editable" >
-                                        <thead>
-                                            <tr>
-                                                <th class="text-center">名称</th>
-                                                <th class="text-center">用户组</th>
-                                                <th class="text-center">主机组</th>
-                                                <th class="text-center">备注</th>
-                                                <th class="text-center">操作</th>
-                                            </tr>
-                                        </thead>
-                                        <tbody id="perm_edit">
-                                        {% for perm in contacts.object_list %}
-                                            <tr class="gradeX">
-                                                <td class="text-center"> {{ perm.name }} </td>
-                                                <td class="text-center">
-                                                    {% for user_group in perm.user_group.all %}
-                                                        {{ user_group.name }}
-                                                    {% endfor %}
-                                                </td>
-                                                <td class="text-center">
-                                                    {% for asset_group in perm.asset_group.all %}
-                                                        {{ asset_group.name }}
-                                                    {% endfor %}
-                                                </td>
-                                                <td class="text-center"> {{ perm.comment }} </td>
-                                                <td class="text-center">
-                                                    <a title="[ {{ group.name }} 授权详情 ]" href="../perm_detail/?id={{ perm.id }}" class=" btn btn-xs btn-primary">详情</a>
-                                                    <a href="../perm_edit/?id={{ perm.id }}" class="btn btn-xs btn-info">编辑</a>
-                                                    <a href="../perm_del/?id={{ perm.id }}" class="btn btn-xs btn-danger">删除</a>
-                                                </td>
-                                            </tr>
-                                        {% endfor %}
-                                        </tbody>
-                                    </table>
-                                    <div class="row">
-                                        <div class="col-sm-6">
-                                            <div class="dataTables_info" id="editable_info" role="status" aria-live="polite">
-                                                Showing {{ contacts.start_index }} to {{ contacts.end_index }} of {{ p.count }} entries
-                                            </div>
-                                        </div>
-                                        <div class="col-sm-6">
-                                            <div class="dataTables_paginate paging_simple_numbers" id="editable_paginate">
-                                                <ul class="pagination" style="margin-top: 0; float: right">
-                                                    {% if contacts.has_previous %}
-                                                        <li class="paginate_button previous" aria-controls="editable" tabindex="0" id="editable_previous">
-                                                            <a href="?page={{ contacts.previous_page_number }}">Previous</a>
-                                                        </li>
-                                                    {% else %}
-                                                        <li class="paginate_button previous disabled" aria-controls="editable" tabindex="0" id="editable_previous">
-                                                             <a href="#">Previous</a>
-                                                        </li>
-                                                    {% endif %}
-                                                    {% for page in page_range %}
-                                                        {% ifequal current_page page %}
-                                                            <li class="paginate_button active"  aria-controls="editable" tabindex="0"><a href="?page={{ page }}"  title="第{{ page }}页">{{ page }}</a></li>
-                                                        {% else %}
-                                                            <li class="paginate_button" aria-controls="editable" tabindex="0"><a href="?page={{ page }}"  title="第{{ page }}页">{{ page }}</a></li>
-                                                        {% endifequal %}
-                                                    {% endfor %}
-                                                    {% if contacts.has_next %}
-                                                        <li class="paginate_button next" aria-controls="editable" tabindex="0" id="editable_next">
-                                                            <a href="?page={{ contacts.next_page_number }}">Next</a>
-                                                        </li>
-                                                    {% else %}
-                                                        <li class="paginate_button next disabled" aria-controls="editable" tabindex="0" id="editable_next">
-                                                            <a href="#">Next</a>
-                                                        </li>
-                                                    {% endif %}
-                                                </ul>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <div id="tab-2" class="tab-pane">
-{#                                    <table class="table table-striped table-bordered table-hover " id="editable" >#}
-{#                                        <thead>#}
-{#                                            <tr>#}
-{#                                                <th class="text-center">用户</th>#}
-{#                                                <th class="text-center">角色</th>#}
-{#                                                <th class="text-center">属组</th>#}
-{#                                                <th class="text-center">主机数量</th>#}
-{#                                                <th class="text-center">操作</th>#}
-{#                                            </tr>#}
-{#                                        </thead>#}
-{#                                        <tbody id="perm_list">#}
-{#                                        {% for user in contacts2.object_list %}#}
-{#                                            <tr class="gradeX">#}
-{#                                                <td class="text-center"> {{ user.name }} </td>#}
-{#                                                <td class="text-center"> {{ user.id | get_role }} </td>#}
-{#                                                <td class="text-center"> {{ user.username | groups_str }} </td>#}
-{#                                                <td class="text-center"> {{ user.id | perm_asset_count }} </td>#}
-{#                                                <td class="text-center">#}
-{#                                                    <a title="[ {{ user.name }} ] 授权详情" href="../perm_asset_detail/?id={{ user.id }}" class="btn btn-xs btn-primary">详情</a>#}
-{#                                                </td>#}
-{#                                            </tr>#}
-{#                                        {% endfor %}#}
-{#                                        </tbody>#}
-{#                                    </table>#}
-{#                                    <div class="row">#}
-{#                                        <div class="col-sm-6">#}
-{#                                            <div class="dataTables_info" id="editable_info" role="status" aria-live="polite">#}
-{#                                                Showing {{ contacts2.start_index }} to {{ contacts2.end_index }} of {{ p2.count }} entries#}
-{#                                            </div>#}
-{#                                        </div>#}
-{#                                        <div class="col-sm-6">#}
-{#                                            <div class="dataTables_paginate paging_simple_numbers" id="editable_paginate">#}
-{#                                                <ul class="pagination" style="margin-top: 0; float: right">#}
-{#                                                    {% if contacts2.has_previous %}#}
-{#                                                        <li class="paginate_button previous" aria-controls="editable" tabindex="0" id="editable_previous">#}
-{#                                                            <a href="?page={{ contacts2.previous_page_number }}">Previous</a>#}
-{#                                                        </li>#}
-{#                                                    {% else %}#}
-{#                                                        <li class="paginate_button previous disabled" aria-controls="editable" tabindex="0" id="editable_previous">#}
-{#                                                             <a href="#">Previous</a>#}
-{#                                                        </li>#}
-{#                                                    {% endif %}#}
-{#                                                    {% for page in page_range2 %}#}
-{#                                                        {% ifequal current_page page %}#}
-{#                                                            <li class="paginate_button active"  aria-controls="editable" tabindex="0"><a href="?page={{ page }}"  title="第{{ page }}页">{{ page }}</a></li>#}
-{#                                                        {% else %}#}
-{#                                                            <li class="paginate_button" aria-controls="editable" tabindex="0"><a href="?page={{ page }}"  title="第{{ page }}页">{{ page }}</a></li>#}
-{#                                                        {% endifequal %}#}
-{#                                                    {% endfor %}#}
-{#                                                    {% if contacts2.has_next %}#}
-{#                                                        <li class="paginate_button next" aria-controls="editable" tabindex="0" id="editable_next">#}
-{#                                                            <a href="?page={{ contacts2.next_page_number }}">Next</a>#}
-{#                                                        </li>#}
-{#                                                    {% else %}#}
-{#                                                        <li class="paginate_button next disabled" aria-controls="editable" tabindex="0" id="editable_next">#}
-{#                                                            <a href="#">Next</a>#}
-{#                                                        </li>#}
-{#                                                    {% endif %}#}
-{#                                                </ul>#}
-{#                                            </div>#}
-{#                                        </div>#}
-{#                                    </div>#}
-
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-
-
-
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script>
-    $(document).ready(function(){
-        $(".iframe").colorbox({iframe:true, width:"70%", height:"70%"});
-    });
-
-    $(document).ready(function(){
-        $('#search_btn').click(function(){
-            if ($('#tab2').attr('class') == 'active'){
-                var tab='tab2'
-            } else {
-                var tab='tab1'
-            }
-
-            var search=$('#search_input').val()
-
-            $.post('/jperm/perm_list_ajax/',
-                    {'tab': tab, 'search': search},
-                    function(data){
-                        if ($('#tab2').attr('class') == 'active'){
-                            $('#tab-2').html(data)
-                        } else {
-                            $('#tab-1').html(data)
-                        }
-                    })
-
-        })
-    })
-</script>
-
-{% endblock %}

templates/jperm/perm_user_edit.html

@@ -8,7 +8,7 @@
         <div class="col-lg-10">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
-                    <h5> 主机授权修改</h5>
+                    <h5> {{ user.name }}授权修改</h5>
                     <div class="ibox-tools">
                         <a class="collapse-link">
                             <i class="fa fa-chevron-up"></i>
@@ -16,12 +16,6 @@
                         <a class="dropdown-toggle" data-toggle="dropdown" href="#">
                             <i class="fa fa-wrench"></i>
                         </a>
-                        <ul class="dropdown-menu dropdown-user">
-                            <li><a href="#">未启用 1</a>
-                            </li>
-                            <li><a href="#">未启用 2</a>
-                            </li>
-                        </ul>
                         <a class="close-link">
                             <i class="fa fa-times"></i>
                         </a>
@@ -29,7 +23,7 @@
                 </div>
 
                 <div class="ibox-content">
-                    <form id="sudoPerm" method="post" class="form-horizontal" action="">
+                    <form id="userPerm" method="post" class="form-horizontal" action="../perm_user_edit/?id={{ user.id }}">
                         {% if error %}
                             <div class="alert alert-warning text-center">{{ error }}</div>
                         {% endif %}
@@ -38,17 +32,48 @@
                         {% endif %}
                         <div class="row">
                             <div class="form-group">
-                                <label for="" class="col-sm-2 control-label">小组<span class="red-fonts">*</span></label>
+                                <label for="" class="col-sm-2 control-label">用户<span class="red-fonts">*</span></label>
                                 <div class="col-sm-4">
-                                    <input id="user_group_id" name="user_group_id"type="text"  value="{{ user_group.id }}" style="display: none">
-                                    <input id="user_group_name" name="user_group_name"  type="text" class="form-control" value="{{ user_group.name }}" readonly>
+                                    <input id="user_group_name" name="user_group_name"  type="text" class="form-control" value="{{ user.name }}" readonly>
                                 </div>
                             </div>
 
                             <div class="hr-line-dashed"></div>
 
                             <div class="form-group">
-                                <label for="" class="col-sm-2 control-label">主机组<span class="red-fonts">*</span></label>
+                                <label for="" class="col-sm-2 control-label">资产<span class="red-fonts">*</span></label>
+                                <div class="col-sm-4">
+                                    <div>
+                                        <select id="assets" name="assets" class="form-control m-b" size="12" multiple>
+                                            {% for asset in assets %}
+                                            <option value="{{ asset.id }}">{{ asset.ip }}</option>
+                                            {% endfor %}
+                                        </select>
+                                    </div>
+                                </div>
+
+                                <div class="col-sm-1">
+                                    <div class="btn-group" style="margin-top: 42px;">
+                                        <button type="button" class="btn btn-white" onclick="move('assets', 'asset_select')"><i class="fa fa-chevron-right"></i></button>
+                                        <button type="button" class="btn btn-white" onclick="move('asset_select', 'assets')"><i class="fa fa-chevron-left"></i> </button>
+                                    </div>
+                                </div>
+
+                                <div class="col-sm-3">
+                                    <div>
+                                        <select id="asset_select" name="asset_select" class="form-control m-b" size="12"  multiple>
+                                            {% for asset in asset_permed %}
+                                            <option value="{{ asset.id }}">{{ asset.ip }}</option>
+                                            {% endfor %}
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="hr-line-dashed"></div>
+
+                            <div class="form-group">
+                                <label for="" class="col-sm-2 control-label">资产组<span class="red-fonts">*</span></label>
                                 <div class="col-sm-4">
                                     <div>
                                         <select id="asset_groups" name="asset_groups" class="form-control m-b" size="12" multiple>
@@ -69,20 +94,20 @@
                                 <div class="col-sm-3">
                                     <div>
                                         <select id="asset_groups_select" name="asset_groups_select" class="form-control m-b" size="12"  multiple>
-                                            {% for asset_group in asset_groups_select %}
+                                            {% for asset_group in asset_group_permed %}
                                             <option value="{{ asset_group.id }}">{{ asset_group.name }}</option>
                                             {% endfor %}
                                         </select>
                                     </div>
                                 </div>
                             </div>
-                            </div>
+                        </div>
 
                         <div class="row">
                             <div class="form-group">
                                 <div class="col-sm-4 col-sm-offset-2">
                                     <button class="btn btn-white" type="reset">取消</button>
-                                    <button id="submit_button" class="btn btn-primary" type="submit">确认保存</button>
+                                    <button id="submit_button" class="btn btn-primary" type="submit" onclick="selectAll()">确认保存</button>
                                 </div>
                             </div>
                         </div>
@@ -94,37 +119,4 @@
     </div>
 </div>
 
-
-<script>
-$('#sudoPerm').validator({
-    timely: 2,
-    theme: "yellow_right_effect",
-    fields: {
-        "name": {
-            rule: "required",
-            tip: "输入授权名",
-            ok: "",
-            msg: {required: "必须填写!"}
-        }
-
-    },
-    valid: function(form) {
-        form.submit();
-    }
-});
-
-
-$(document).ready(function(){
-    $("#submit_button").click(function(){
-        $('#user_groups_select option').each(function(){
-            $(this).prop('selected', true)
-        })
-
-        $('#asset_groups_select option').each(function(){
-            $(this).prop('selected', true)
-        })
-    })
-})
-</script>
-
 {% endblock %}

templates/jperm/perm_user_list.html

@@ -8,7 +8,7 @@
         <div class="col-lg-10">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
-                    <h5> 查看部门 </h5>
+                    <h5> 查看小组</h5>
                     <div class="ibox-tools">
                         <a class="collapse-link">
                             <i class="fa fa-chevron-up"></i>
@@ -16,12 +16,6 @@
                         <a class="dropdown-toggle" data-toggle="dropdown" href="#">
                             <i class="fa fa-wrench"></i>
                         </a>
-                        <ul class="dropdown-menu dropdown-user">
-                            <li><a href="#">未启用 1</a>
-                            </li>
-                            <li><a href="#">未启用 2</a>
-                            </li>
-                        </ul>
                         <a class="close-link">
                             <i class="fa fa-times"></i>
                         </a>
@@ -30,13 +24,13 @@
 
                 <div class="ibox-content">
                     <div class="">
-                    <a target="_blank" href="/juser/dept_add/" class="btn btn-sm btn-primary "> 添加部门 </a>
+                    <a target="_blank" href="/juser/user_add/" class="btn btn-sm btn-primary "> 添加用户 </a>
                     <form id="search_form" method="get" action="" class="pull-right mail-search">
                         <div class="input-group">
                             <input type="text" class="form-control input-sm" id="search_input" name="search" placeholder="Search">
                             <div class="input-group-btn">
                                 <button id='search_btn' type="submit" class="btn btn-sm btn-primary">
-                                    Search
+                                    - 搜索 -
                                 </button>
                             </div>
                         </div>
@@ -46,24 +40,25 @@
                     <table class="table table-striped table-bordered table-hover " id="editable" >
                         <thead>
                             <tr>
-
-                                <th class="text-center">部门名称</th>
-                                <th class="text-center">部门成员数目</th>
-                                <th class="text-center">授权主机数目</th>
-                                <th class="text-center">备注</th>
+                                <th class="text-center">用户</th>
+                                <th class="text-center">所属用户组</th>
+                                <th class="text-center">授权资产</th>
+                                <th class="text-center">授权资产组</th>
                                 <th class="text-center">操作</th>
                             </tr>
                         </thead>
                         <tbody>
-                        {% for dept in contacts.object_list %}
+                        {% for user in users.object_list %}
                             <tr class="gradeX">
-                                <td class="text-center"> {{ dept.name }} </td>
-                                <td class="text-center"><a href="/juser/user_list/?did={{ dept.id }}">{{ dept.id | dept_user_num }}</a> </td>
-                                <td class="text-center"><a href="/jasset/host_list/?did={{ dept.id }}">{{ dept.id | dept_asset_num }}</a> </td>
-                                <td class="text-center"> {{ dept.comment }} </td>
+                                <td class="text-center"> {{ user.name }} </td>
                                 <td class="text-center">
-{#                                    <a title="[ {{ dept.name }} ] 成员信息" href="../dept_detail/?id={{ dept.id }}" class="iframe btn btn-xs btn-primary">主机</a>#}
-                                    <a href="../dept_perm_edit/?id={{ dept.id }}" class="btn btn-xs btn-danger">授权编辑</a>
+                                    <a href="/juser/user_list/?gid={{ user.id }}">{{ user.group.all | groups2str  }} </a>
+                                </td>
+                                <td class="text-center"> <a href="/jasset/asset_list/?gid={{ user.id }}">{{ user.name }} </a> </td>
+                                <td class="text-center"> <a href="/jasset/group_list/?gid={{ user.id }}">{{ user.name }}</a></td>
+                                <td class="text-center">
+                                    <a href="../perm_user_detail/?id={{ user.id }}" class="btn btn-xs btn-primary">详情</a>
+                                    <a href="../perm_user_edit/?id={{ user.id }}" class="btn btn-xs btn-danger">编辑</a>
                                 </td>
                             </tr>
                         {% endfor %}
@@ -72,7 +67,7 @@
                     <div class="row">
                         <div class="col-sm-6">
                             <div class="dataTables_info" id="editable_info" role="status" aria-live="polite">
-                                Showing {{ contacts.start_index }} to {{ contacts.end_index }} of {{ p.count }} entries
+                                Showing {{ users.start_index }} to {{ users.end_index }} of {{ p.count }} entries
                             </div>
                         </div>
                         {% include 'paginator.html' %}
@@ -83,22 +78,4 @@
     </div>
 </div>
 
-<script>
-    $(document).ready(function(){
-        $(".iframe").colorbox({iframe:true, width:"70%", height:"70%"});
-        var check_array = []
-        $('#del_btn').click(function(){
-            $(".gradeX input:checked").each(function() {check_array.push($(this).attr("value")) })
-            $(".gradeX input:checked").closest("tr").remove()
-            $.post("/juser/dept_del_ajax/",
-                    {dept_ids: check_array.join(",")},
-                    function(data){
-                        alert(data)
-                    }
-            )
-        })
-
-    });
-</script>
-
 {% endblock %}

templates/jperm/sudo_add.html

@@ -1,226 +0,0 @@
-{% extends 'base.html' %}
-{% load mytags %}
-{% block content %}
-{% include 'nav_cat_bar.html' %}
-
-<div class="wrapper wrapper-content animated fadeInRight">
-    <div class="row">
-        <div class="col-lg-10">
-            <div class="ibox float-e-margins">
-                <div class="ibox-title">
-                    <h5> Sudo授权添加</h5>
-                    <div class="ibox-tools">
-                        <a class="collapse-link">
-                            <i class="fa fa-chevron-up"></i>
-                        </a>
-                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                            <i class="fa fa-wrench"></i>
-                        </a>
-                        <ul class="dropdown-menu dropdown-user">
-                            <li><a href="#">未启用 1</a>
-                            </li>
-                            <li><a href="#">未启用 2</a>
-                            </li>
-                        </ul>
-                        <a class="close-link">
-                            <i class="fa fa-times"></i>
-                        </a>
-                    </div>
-                </div>
-
-                <div class="panel blank-panel">
-                        <div class="panel-heading">
-                            <div class="panel-options">
-                                <ul class="nav nav-tabs">
-                                    <li id="tab1" class=""><a href="/jperm/sudo_list/">查看Sudo授权</a></li>
-                                    <li id="tab2" class="active"><a href="/jperm/sudo_add/">Sudo授权添加</a></li>
-                                    <li id="tab3" class=""><a href="/jperm/cmd_list/">查看命令组</a></li>
-                                    <li id="tab4" class=""><a href="/jperm/cmd_add/">添加命令组</a></li>
-                                </ul>
-                            </div>
-                        </div>
-
-                <div class="panel-body">
-
-                <div class="tab-content">
-                <div id="tab-1" class="tab-pane active">
-                    <form id="sudoPerm" method="post" class="form-horizontal" action="">
-                        {% if error %}
-                            <div class="alert alert-warning text-center">{{ error }}</div>
-                        {% endif %}
-                        {% if msg %}
-                            <div class="alert alert-success text-center">{{ msg }}</div>
-                        {% endif %}
-                        <div class="row">
-                            <div class="form-group">
-                                <label for="name" class="col-sm-2 control-label">授权名<span class="red-fonts">*</span></label>
-                                <div class="col-sm-8">
-                                    <input id="name" name="name" placeholder="OnlyForEnglish" type="text" class="form-control">
-                                    <span class="help-block m-b-none">取个名字方便辨识，只支持英文</span>
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-
-                            <div class="form-group">
-                                <label for="runas" class="col-sm-2 control-label">RunAsUser<span class="red-fonts">*</span></label>
-                                <div class="col-sm-8">
-                                    <input id="runas" name="runas" placeholder="RunAsUser" type="text" class="form-control">
-                                    <span class="help-block m-b-none">
-                                        允许以哪个用户允许sudo,逗号分隔,默认root
-                                    </span>
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-
-                            <div class="form-group">
-                                <label for="" class="col-sm-2 control-label">用户组<span class="red-fonts">*</span></label>
-                                <div class="col-sm-4">
-                                    <div>
-                                        <select id="user_groups" name="user_groups" class="form-control" size="5" multiple>
-                                            {% for user_group in user_groups %}
-                                            <option value="{{ user_group.id }}">{{ user_group.name }}</option>
-                                            {% endfor %}
-                                        </select>
-                                    </div>
-                                </div>
-
-
-                                <div class="col-sm-1">
-                                    <div class="btn-group" style="margin-top: 12px;">
-                                        <button type="button" class="btn btn-white" onclick="move('user_groups', 'user_groups_select')"><i class="fa fa-chevron-right"></i></button>
-                                        <button type="button" class="btn btn-white" onclick="move('user_groups_select', 'user_groups')"><i class="fa fa-chevron-left"></i> </button>
-                                    </div>
-                                </div>
-
-                                <div class="col-sm-3">
-                                    <div>
-                                        <select id="user_groups_select" name="user_groups_select" class="form-control m-b" size="5"  multiple>
-                                        </select>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="hr-line-dashed"></div>
-
-                            <div class="form-group">
-                                <label for="" class="col-sm-2 control-label">主机组<span class="red-fonts">*</span></label>
-                                <div class="col-sm-4">
-                                    <div>
-                                        <select id="asset_groups" name="asset_groups" class="form-control m-b" size="5" multiple>
-                                            {% for asset_group in asset_groups %}
-                                            <option value="{{ asset_group.id }}">{{ asset_group.name }}</option>
-                                            {% endfor %}
-                                        </select>
-                                    </div>
-                                </div>
-
-                                <div class="col-sm-1">
-                                    <div class="btn-group" style="margin-top: 12px;">
-                                        <button type="button" class="btn btn-white" onclick="move('asset_groups', 'asset_groups_select')"><i class="fa fa-chevron-right"></i></button>
-                                        <button type="button" class="btn btn-white" onclick="move('asset_groups_select', 'asset_groups')"><i class="fa fa-chevron-left"></i> </button>
-                                    </div>
-                                </div>
-
-                                <div class="col-sm-3">
-                                    <div>
-                                        <select id="asset_groups_select" name="asset_groups_select" class="form-control m-b" size="5"  multiple>
-                                        </select>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="hr-line-dashed"></div>
-
-                            <div class="form-group">
-                                <label for="" class="col-sm-2 control-label">命令组<span class="red-fonts">*</span></label>
-                                <div class="col-sm-4">
-                                    <div>
-                                        <select id="cmd_groups" name="cmd_groups" class="form-control m-b" size="5" multiple>
-                                            {% for cmd_group in cmd_groups %}
-                                            <option value="{{ cmd_group.id }}">{{ cmd_group.name }}</option>
-                                            {% endfor %}
-                                        </select>
-                                    </div>
-                                </div>
-
-                                <div class="col-sm-1">
-                                    <div class="btn-group" style="margin-top: 12px;">
-                                        <button type="button" class="btn btn-white" onclick="move('cmd_groups', 'cmd_groups_select')"><i class="fa fa-chevron-right"></i></button>
-                                        <button type="button" class="btn btn-white" onclick="move('cmd_groups_select', 'cmd_groups')"><i class="fa fa-chevron-left"></i> </button>
-                                    </div>
-                                </div>
-
-                                <div class="col-sm-3">
-                                    <div>
-                                        <select id="cmd_groups_select" name="cmd_groups_select" class="form-control m-b" size="5"  multiple>
-                                        </select>
-                                    </div>
-                                </div>
-                            </div>
-
-
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label for="group_name" class="col-sm-2 control-label">备注</label>
-                                <div class="col-sm-8">
-                                    <input id="comment" name="comment" placeholder="备注说明" type="text" class="form-control">
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                        </div>
-
-                        <div class="row">
-                            <div class="form-group">
-                                <div class="col-sm-4 col-sm-offset-2">
-                                    <button class="btn btn-white" type="reset">取消</button>
-                                    <button id="submit_button" class="btn btn-primary" type="submit">确认保存</button>
-                                </div>
-                            </div>
-                        </div>
-                    </form>
-                    </div>
-                </div>
-                </div>
-
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-
-<script>
-$('#sudoPerm').validator({
-    timely: 2,
-    theme: "yellow_right_effect",
-    fields: {
-        "name": {
-            rule: "required",
-            tip: "输入授权名",
-            ok: "",
-            msg: {required: "必须填写!"}
-        },
-        "runas": {
-            rule: "required",
-            tip: "输入sudoas用户",
-            ok: "",
-            msg: {required: "必须填写!"}
-        }
-
-    },
-    valid: function(form) {
-        form.submit();
-    }
-});
-
-
-$(document).ready(function(){
-    $("#submit_button").click(function(){
-        $('#sudoPerm option').each(function(){
-            $(this).prop('selected', true)
-        })
-    })
-})
-</script>
-
-{% endblock %}

templates/jperm/sudo_cmd_add.html

@@ -1,148 +0,0 @@
-{% extends 'base.html' %}
-
-{% block content %}
-    {% include 'nav_cat_bar.html' %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-lg-10">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>填写基本信息</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="#">未启用 1</a>
-                                </li>
-                                <li><a href="#">未启用 2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                     <div class="panel blank-panel">
-                        <div class="panel-heading">
-                            <div class="panel-options">
-                                <ul class="nav nav-tabs">
-                                    <li id="tab1" class=""><a href="/jperm/sudo_list/">查看Sudo授权</a></li>
-                                    <li id="tab2" class=""><a href="/jperm/cmd_list/">查看命令组</a></li>
-                                    <li id="tab3" class="active"><a href="/jperm/cmd_add/">添加命令组</a></li>
-                                </ul>
-                            </div>
-                        </div>
-
-                        <div class="panel-body">
-
-                        <div class="tab-content">
-                        <div id="tab-1" class="tab-pane active">
-                        <form id="cmdForm" method="post" class="form-horizontal" action="">
-                            {% if error %}
-                                <div class="alert alert-warning text-center">{{ error }}</div>
-                            {% endif %}
-                            {% if msg %}
-                                <div class="alert alert-success text-center">{{ msg }}</div>
-                            {% endif %}
-                            <div class="form-group">
-                                <label for="group_name" class="col-sm-2 control-label">组名<span class="red-fonts">*</span></label>
-                                <div class="col-sm-8">
-                                    <input id="name" name="name" placeholder="Group name" type="text" class="form-control" value="{{ name }}" required="">
-                                    <input id="cmd_group_id" name="cmd_group_id"  type="text" class="form-control" value="{{ cmd_group_id }}" style="display: none">
-                                </div>
-                            </div>
-                            {% ifequal session_role_id 2 %}
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label for="dept_id" class="col-sm-2 control-label">部门<span class="red-fonts">*</span></label>
-                                <div class="col-sm-8">
-                                    <select id="dept_id" name="dept_id" class="form-control m-b">
-                                        {% for dept in dept_all %}
-                                            {% ifequal dept_id dept.id %}
-                                                <option value="{{ dept.id }}" selected>{{ dept.name }}</option>
-                                            {% else %}
-                                                <option value="{{ dept.id }}">{{ dept.name }}</option>
-                                            {% endifequal %}
-
-                                        {% endfor %}
-                                    </select>
-                                </div>
-                            </div>
-                            {% endifequal %}
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label for="group_type" class="col-sm-2 control-label">命令<span class="red-fonts">*</span></label>
-                                <div class="col-sm-8">
-                                    <textarea id='cmd' name='cmd' class="form-control" rows="10" placeholder="/bin/su">{{ cmd }}</textarea>
-                                    <span class="help-block m-b-none">
-                                        输入命令一行一个，请写绝对路径如: /bin/su，所有是ALL，排除su是 !/bin/su
-                                    </span>
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label for="group_name" class="col-sm-2 control-label">备注</label>
-                                <div class="col-sm-8">
-                                    <input id="comment" name="comment" placeholder="备注说明" type="text" class="form-control" value="{{ comment }}">
-                                </div>
-                            </div>
-
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <div class="col-sm-4 col-sm-offset-2">
-                                    <button class="btn btn-white" type="reset">取消</button>
-                                    <button id="submit_button" class="btn btn-primary" type="submit">确认保存</button>
-                                </div>
-                            </div>
-
-                        </form>
-                     </div>
-                     </div>
-                     </div>
-                     </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-<script>
-$('#cmdForm').validator({
-    timely: 2,
-    theme: "yellow_right_effect",
-    fields: {
-        "name": {
-            rule: "required",
-            tip: "输入组名",
-            ok: "",
-            msg: {required: "必须填写!"}
-        },
-        "cmd": {
-            rule: "required",
-            tip: "输入组名",
-            ok: "",
-            msg: {required: "必须填写!"}
-        }
-    },
-    valid: function(form) {
-        form.submit();
-    }
-});
-
-
-$(document).ready(function(){
-    $("#submit_button").click(function(){
-        $('#users_selected option').each(function(){
-            $(this).prop('selected', true)
-        })
-    })
-})
-
-
-</script>
-{% endblock %}

templates/jperm/sudo_cmd_detail.html

@@ -1,48 +0,0 @@
-{% load mytags %}
-<html>
-    <head>
-        {% include 'link_css.html' %}
-
-        <style type="text/css">
-        body
-        {
-        background: #FFFFFF;
-        }
-        </style>
-    </head>
-
-    <body>
-        <div class="row">
-            <div class="contact-box">
-                {% if cmd_group_name %}
-                <h2 class="text-center">{{ cmd_group.name }} 命令详情</h2>
-                {% endif %}
-                <div class="ibox-content">
-
-                    <table class="table table-striped table-bordered table-hover " id="editable" >
-                        {% if cmd_group_name %}
-                        <thead>
-                            <tr>
-                                <td class="text-center" width="120">ID</td>
-                                <td class="text-center">名称</td>
-                                <td class="text-center">部门</td>
-                            </tr>
-                        </thead>
-                        <tbody>
-                        <tr class="gradeX">
-                            <td class="text-center">{{ cmd_group.id }}</td>
-                            <td class="text-center">{{ cmd_group.name }}</td>
-                            <td class="text-center">{{ cmd_group.dept.name }}</td>
-                        </tr>
-                        {% endif %}
-                        <tr>
-                            <td colspan="1" class="text-center">命令：</td>
-                            <td colspan="6" class="text-center">
-                                    <b>{{ cmds_str }}</b>
-                            </td>
-                        </tr>
-                    </table>
-            </div>
-        </div>
-    </body>
-</html>

templates/jperm/sudo_cmd_list.html

@@ -1,140 +0,0 @@
-{% extends 'base.html' %}
-{% load mytags %}
-{% block content %}
-{% include 'nav_cat_bar.html' %}
-
-<div class="wrapper wrapper-content animated fadeInRight">
-    <div class="row">
-        <div class="col-lg-10">
-            <div class="ibox float-e-margins">
-                <div class="ibox-title">
-                    <h5> 查看命令分组 </h5>
-                    <div class="ibox-tools">
-                        <a class="collapse-link">
-                            <i class="fa fa-chevron-up"></i>
-                        </a>
-                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                            <i class="fa fa-wrench"></i>
-                        </a>
-                        <ul class="dropdown-menu dropdown-user">
-                            <li><a href="#">未启用 1</a>
-                            </li>
-                            <li><a href="#">未启用 2</a>
-                            </li>
-                        </ul>
-                        <a class="close-link">
-                            <i class="fa fa-times"></i>
-                        </a>
-                    </div>
-                </div>
-
-                <div class="ibox-content">
-                    <div class="panel blank-panel">
-                        <div class="panel-heading">
-                            <div class="panel-options">
-                                <ul class="nav nav-tabs">
-                                    <li id="tab1" class=""><a href="/jperm/sudo_list/">查看Sudo授权</a></li>
-                                    <li id="tab2" class="active"><a href="/jperm/cmd_list/">查看命令组</a></li>
-                                    <li id="tab3" class=""><a href="/jperm/cmd_add/">添加命令组</a></li>
-                                </ul>
-                            </div>
-                        </div>
-
-                    <div class="panel-body">
-                    <div class="tab-content">
-                    <div id="tab-1" class="tab-pane active">
-
-                    <table class="table table-striped table-bordered table-hover " id="editable" >
-                        <thead>
-                            <tr>
-                                <th class="text-center">组名</th>
-                                <th class="text-center">命令</th>
-                                <th class="text-center">部门</th>
-                                <th class="text-center">备注</th>
-                                <th class="text-center">操作</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                        {% for group in contacts.object_list %}
-                            <tr class="gradeX">
-                                <td class="text-center"> {{ group.name }} </td>
-                                <td class="text-center" title="{{ group.cmd }}"> {{ group.cmd | string_length:50 }} </td>
-                                <td class="text-center"> {{ group.dept.name }} </td>
-                                <td class="text-center"> {{ group.comment }} </td>
-                                <td class="text-center">
-                                    <a value="../cmd_detail/?id={{ group.id }}" class="btn btn-xs btn-primary iframe">详情</a>
-                                    <a href="../cmd_edit/?id={{ group.id }}" class="btn btn-xs btn-info">编辑</a>
-                                    <a href="../cmd_del/?id={{ group.id }}" class="btn btn-xs btn-danger">删除</a>
-                                </td>
-                            </tr>
-                        {% endfor %}
-                        </tbody>
-                    </table>
-                    </div>
-                    </div>
-                    </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-sm-6">
-                            <div class="dataTables_info" id="editable_info" role="status" aria-live="polite">
-                                Showing {{ contacts.start_index }} to {{ contacts.end_index }} of {{ p.count }} entries
-                            </div>
-                        </div>
-                        <div class="col-sm-6">
-                            <div class="dataTables_paginate paging_simple_numbers" id="editable_paginate">
-                                <ul class="pagination" style="margin-top: 0; float: right">
-                                    {% if contacts.has_previous %}
-                                        <li class="paginate_button previous" aria-controls="editable" tabindex="0" id="editable_previous">
-                                            <a href="?page={{ contacts.previous_page_number }}">Previous</a>
-                                        </li>
-                                    {% else %}
-                                        <li class="paginate_button previous disabled" aria-controls="editable" tabindex="0" id="editable_previous">
-                                             <a href="#">Previous</a>
-                                        </li>
-                                    {% endif %}
-                                    {% for page in p.page_range %}
-                                        {% ifequal offset1 page %}
-                                            <li class="paginate_button active"  aria-controls="editable" tabindex="0"><a href="?page={{ page }}"  title="第{{ page }}页">{{ page }}</a></li>
-                                        {% else %}
-                                            <li class="paginate_button" aria-controls="editable" tabindex="0"><a href="?page={{ page }}"  title="第{{ page }}页">{{ page }}</a></li>
-                                        {% endifequal %}
-                                    {% endfor %}
-                                    {% if contacts.has_next %}
-                                        <li class="paginate_button next" aria-controls="editable" tabindex="0" id="editable_next">
-                                            <a href="?page={{ contacts.next_page_number }}">Next</a>
-                                        </li>
-                                    {% else %}
-                                        <li class="paginate_button next disabled" aria-controls="editable" tabindex="0" id="editable_next">
-                                            <a href="#">Next</a>
-                                        </li>
-                                    {% endif %}
-                                </ul>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script>
-    $(document).ready(function() {
-        $(".iframe").on('click', function () {
-            var url = $(this).attr("value");
-            $.layer({
-                type: 2,
-                title: '命令详情',
-                maxmin: true,
-                shift: 'top',
-                border: [2, 0.3, '#1AB394'],
-                shade: [0.5, '#000000'],
-                shadeClose: true,
-                area: ['800px', '600px'],
-                iframe: {src: url}
-            });
-        });
-    });
-</script>
-
-{% endblock %}

templates/jperm/sudo_detail.html

@@ -1,170 +0,0 @@
-{% extends 'base.html' %}
-{% load mytags %}
-
-{% block content %}
-    {% include 'nav_cat_bar.html' %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-lg-4">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>授权主机/组</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="#">Config option 1</a>
-                                </li>
-                                <li><a href="#">Config option 2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content ibox-heading">
-                        <h3>用户</h3>
-                        <small><i class="fa fa-map-marker"></i> 组下用户.</small>
-                    </div>
-                    <div class="ibox-content inspinia-timeline">
-                        <div class="timeline-item">
-                            <div class="row">
-                                <div class="col-xs-3 date">
-                                    <i class="fa fa-users"></i>
-                                    <b>{{ user_group.name }}</b>
-                                    <br>
-                                    <small class="text-navy">共: {{ group_user_num }} 用户</small>
-                                </div>
-                                <div class="col-xs-7 content no-top-border">
-                                    <p class="m-b-xs"><strong>{{ user_group.comment }}</strong></p>
-                                    <p>
-                                        {% for user in users %}
-                                            {{ user.name }}<br>
-                                        {% endfor %}
-                                    </p>
-                                    <p></p>
-                                </div>
-                            </div>
-                        </div>
-                        {% if not users %}
-                            (暂无)
-                        {% endif %}
-                    </div>
-                </div>
-            </div>
-
-            <div class="col-lg-4">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>授权主机/组</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="#">Config option 1</a>
-                                </li>
-                                <li><a href="#">Config option 2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content ibox-heading">
-                        <h3>授权主机/组</h3>
-                        <small><i class="fa fa-map-marker"></i> 这里包含了sudo授权所有的主机组和组下的主机.</small>
-                    </div>
-                    <div class="ibox-content inspinia-timeline">
-                        {% for group in asset_groups %}
-                            <div class="timeline-item">
-                                <div class="row">
-                                    <div class="col-xs-3 date">
-                                        <i class="fa fa-repeat"></i>
-                                        <b>{{ group.name }}</b>
-                                        <br>
-                                        <small class="text-navy">共: {{ group | group_asset_list_count }}台</small>
-                                    </div>
-                                    <div class="col-xs-7 content no-top-border">
-                                        <p class="m-b-xs"><strong>{{ group.comment }}</strong></p>
-                                        <p>
-                                            {% for asset in group|group_asset_list %}
-                                                {{ asset.ip }}<br>
-                                            {% endfor %}
-                                        </p>
-                                        <p></p>
-                                    </div>
-                                </div>
-                            </div>
-                        {% endfor %}
-                        {% if not asset_groups %}
-                            (暂无)
-                        {% endif %}
-                    </div>
-                </div>
-            </div>
-
-            <div class="col-lg-4">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>授权命令/组</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="#">Config option 1</a>
-                                </li>
-                                <li><a href="#">Config option 2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content inspinia-timeline">
-                        {% for cmd_group in cmd_groups %}
-                            <div class="timeline-item">
-                                <div class="row">
-                                    <div class="col-xs-3 date">
-                                        <i class="fa fa-linux"></i>
-                                        <b>{{ cmd_group.name }}</b>
-                                        <br>
-                                        <small class="text-navy">共: {{ cmd_group.id|sudo_cmd_count }} 个</small>
-                                    </div>
-                                    <div class="col-xs-7 content no-top-border">
-                                        <p class="m-b-xs"><strong>{{ group.comment }}</strong></p>
-                                        <p>
-                                            {% for cmd in cmd_group|cmd_group_split %}
-                                                {{ cmd }}<br>
-                                            {% endfor %}
-                                        </p>
-                                        <p></p>
-                                    </div>
-                                </div>
-                            </div>
-                        {% endfor %}
-                        {% if not cmd_groups %}
-                            (暂无)
-                        {% endif %}
-                    </div>
-                </div>
-            </div>
-
-        </div>
-    </div>
-
-{% endblock %}

templates/jperm/sudo_edit.html

@@ -1,155 +0,0 @@
-{% extends 'base.html' %}
-{% load mytags %}
-{% block content %}
-{% include 'nav_cat_bar.html' %}
-
-<div class="wrapper wrapper-content animated fadeInRight">
-    <div class="row">
-        <div class="col-lg-10">
-            <div class="ibox float-e-margins">
-                <div class="ibox-title">
-                    <h5> Sudo授权编辑 </h5>
-                    <div class="ibox-tools">
-                        <a class="collapse-link">
-                            <i class="fa fa-chevron-up"></i>
-                        </a>
-                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                            <i class="fa fa-wrench"></i>
-                        </a>
-                        <ul class="dropdown-menu dropdown-user">
-                            <li><a href="#">未启用 1</a>
-                            </li>
-                            <li><a href="#">未启用 2</a>
-                            </li>
-                        </ul>
-                        <a class="close-link">
-                            <i class="fa fa-times"></i>
-                        </a>
-                    </div>
-                </div>
-
-                <div class="ibox-content">
-                    <div class="panel blank-panel">
-                        <div class="panel-heading">
-                            <div class="panel-options">
-                                <ul class="nav nav-tabs">
-                                    <li id="tab1" class="active"><a href="/jperm/sudo_list/">编辑Sudo授权</a></li>
-                                    <li id="tab2" class=""><a href="/jperm/cmd_list/">查看命令组</a></li>
-                                    <li id="tab3" class=""><a href="/jperm/cmd_add/">添加命令组</a></li>
-                                </ul>
-                            </div>
-                        </div>
-
-                    <div class="panel-body">
-                    <form id="sudoPerm" method="post" class="form-horizontal" action="">
-                        {% if error %}
-                            <div class="alert alert-warning text-center">{{ error }}</div>
-                        {% endif %}
-                        {% if msg %}
-                            <div class="alert alert-success text-center">{{ msg }}</div>
-                        {% endif %}
-                        <div class="row">
-                            <div class="form-group">
-                                <label for="runas" class="col-sm-2 control-label">RunAsUser<span class="red-fonts">*</span></label>
-                                <div class="col-sm-8">
-                                    <input id="runas" name="runas" placeholder="RunAsUser" type="text" class="form-control" value="{{ user_runas }}">
-                                    <input id="user_group_id" name="user_group_id" type="text" value="{{ user_group.id }}" style="display: none">
-                                    <span class="help-block m-b-none">
-                                        允许以哪个用户进行sudo,逗号分隔，如: root或者 ALL 等
-                                    </span>
-                                </div>
-                            </div>
-
-                            <div class="hr-line-dashed"></div>
-
-                            <div class="form-group">
-                                <label for="" class="col-sm-2 control-label">主机组<span class="red-fonts">*</span></label>
-                                <div class="col-sm-4">
-                                    <div>
-                                        <select id="asset_groups" name="asset_groups" class="form-control m-b" size="10" multiple>
-                                            {% for asset_group in asset_groups %}
-                                            <option value="{{ asset_group.id }}">{{ asset_group.name }}</option>
-                                            {% endfor %}
-                                        </select>
-                                    </div>
-                                </div>
-
-                                <div class="col-sm-1">
-                                    <div class="btn-group" style="margin-top: 12px;">
-                                        <button type="button" class="btn btn-white" onclick="move('asset_groups', 'asset_groups_select')"><i class="fa fa-chevron-right"></i></button>
-                                        <button type="button" class="btn btn-white" onclick="move('asset_groups_select', 'asset_groups')"><i class="fa fa-chevron-left"></i> </button>
-                                    </div>
-                                </div>
-
-                                <div class="col-sm-3">
-                                    <div>
-                                        <select id="asset_groups_select" name="asset_groups_select" class="form-control m-b" size="10"  multiple>
-                                            {% for asset_group in asset_group_permed %}
-                                            <option value="{{ asset_group.id }}">{{ asset_group.name }}</option>
-                                            {% endfor %}
-                                        </select>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="hr-line-dashed"></div>
-
-                            <div class="form-group">
-                                <label for="" class="col-sm-2 control-label">命令组<span class="red-fonts">*</span></label>
-                                <div class="col-sm-4">
-                                    <div>
-                                        <select id="cmd_groups" name="cmd_groups" class="form-control m-b" size="10" multiple>
-                                            {% for cmd_group in cmd_groups %}
-                                            <option value="{{ cmd_group.id }}">{{ cmd_group.name }}</option>
-                                            {% endfor %}
-                                        </select>
-                                    </div>
-                                </div>
-
-                                <div class="col-sm-1">
-                                    <div class="btn-group" style="margin-top: 12px;">
-                                        <button type="button" class="btn btn-white" onclick="move('cmd_groups', 'cmd_groups_select')"><i class="fa fa-chevron-right"></i></button>
-                                        <button type="button" class="btn btn-white" onclick="move('cmd_groups_select', 'cmd_groups')"><i class="fa fa-chevron-left"></i> </button>
-                                    </div>
-                                </div>
-
-                                <div class="col-sm-3">
-                                    <div>
-                                        <select id="cmd_groups_select" name="cmd_groups_select" class="form-control m-b" size="10"  multiple>
-                                            {% for cmd_group in cmd_group_permed %}
-                                            <option value="{{ cmd_group.id }}">{{ cmd_group.name }}</option>
-                                            {% endfor %}
-                                        </select>
-                                    </div>
-                                </div>
-                            </div>
-
-
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label for="group_name" class="col-sm-2 control-label">备注</label>
-                                <div class="col-sm-8">
-                                    <input id="comment" name="comment" placeholder="备注说明" type="text" class="form-control" value="{{ comment }}">
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                        </div>
-
-                        <div class="row">
-                            <div class="form-group">
-                                <div class="col-sm-4 col-sm-offset-2">
-                                    <button class="btn btn-white" type="reset">取消</button>
-                                    <button class="btn btn-primary" type="submit" onclick="javascript: (function(){$('#sudoPerm option').each(function(){$(this).prop('selected', true)})})()">确认保存</button>
-                                </div>
-                            </div>
-                        </div>
-                    </form>
-                    </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-{% endblock %}
-

templates/jperm/sudo_list.html

@@ -1,129 +0,0 @@
-{% extends 'base.html' %}
-{% load mytags %}
-{% block content %}
-{% include 'nav_cat_bar.html' %}
-
-<div class="wrapper wrapper-content animated fadeInRight">
-    <div class="row">
-        <div class="col-lg-10">
-            <div class="ibox float-e-margins">
-                <div class="ibox-title">
-                    <h5> Sudo授权列表 </h5>
-                    <div class="ibox-tools">
-                        <a class="collapse-link">
-                            <i class="fa fa-chevron-up"></i>
-                        </a>
-                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                            <i class="fa fa-wrench"></i>
-                        </a>
-                        <ul class="dropdown-menu dropdown-user">
-                            <li><a href="#">未启用 1</a>
-                            </li>
-                            <li><a href="#">未启用 2</a>
-                            </li>
-                        </ul>
-                        <a class="close-link">
-                            <i class="fa fa-times"></i>
-                        </a>
-                    </div>
-                </div>
-
-                <div class="ibox-content">
-
-                    <div class="panel blank-panel">
-                        <div class="panel-heading">
-                            <div class="panel-options">
-                                <ul class="nav nav-tabs">
-                                    <li id="tab1" class="active"><a href="/jperm/sudo_list/">查看Sudo授权</a></li>
-                                    <li id="tab2" class=""><a href="/jperm/cmd_list/">查看命令组</a></li>
-                                    <li id="tab3" class=""><a href="/jperm/cmd_add/">添加命令组</a></li>
-                                    <button id="refresh" class="btn btn-primary btn-sm pull-right" style="margin-right: 20px;" data-toggle="tooltip" data-placement="left" title="" data-original-title="Refresh inbox">
-                                        <i class="fa fa-refresh"></i> 刷新
-                                    </button>
-                                </ul>
-                            </div>
-                        </div>
-
-                        <div class="panel-body">
-                            <div class="tab-content">
-                                <div id="tab-1" class="tab-pane active">
-                                    <table class="table table-striped table-bordered table-hover " id="editable" >
-                                        <thead>
-                                            <tr>
-                                                <th class="text-center">组名</th>
-                                                <th class="text-center">所属部门</th>
-                                                <th class="text-center">成员数目</th>
-                                                <th class="text-center">授权主机组数目</th>
-                                                <th class="text-center">授权主机数目</th>
-                                                <th class="text-center">sudo命令</th>
-                                                <th class="text-center">备注</th>
-                                                <th class="text-center">操作</th>
-                                            </tr>
-                                        </thead>
-                                        <tbody>
-                                        {% for group in contacts.object_list %}
-                                            <tr class="gradeX">
-                                                <td class="text-center"> {{ group.name }} </td>
-                                                <td class="text-center"> {{ group.dept.name }} </td>
-                                                <td class="text-center"><a href="/juser/user_list/?gid={{ group.id }}">{{ group.id | member_count }} </a> </td>
-                                                <td class="text-center"><a href="/jasset/group_list/?sid={{ group.id }}">{{ group.id | ugrp_sudo_agrp_count }} </a> </td>
-                                                <td class="text-center"><a href="/jasset/host_list/?sid={{ group.id }}"> {{ group.id | ugrp_sudo_asset_count }} </a> </td>
-                                                <td class="text-center"><a value="/jperm/cmd_detail/?id={{ group.id | sudo_cmd_ids }}"  class="iframe">{{ group.id | sudo_cmd_count }}</a> </td>
-                                                <td class="text-center"> {{ group.comment }} </td>
-                                                <td class="text-center">
-                                                    <a href="../sudo_detail/?id={{ group.id }}" class="btn btn-xs btn-primary">详情</a>
-                                                    <a href="../sudo_edit/?id={{ group.id }}" class="btn btn-xs btn-danger">sudo授权</a>
-                                                </td>
-                                            </tr>
-                                        {% endfor %}
-                                        </tbody>
-                                    </table>
-                                    <div class="row">
-                                        <div class="col-sm-6">
-                                            <div class="dataTables_info" id="editable_info" role="status" aria-live="polite">
-                                                Showing {{ contacts.start_index }} to {{ contacts.end_index }} of {{ p.count }} entries
-                                            </div>
-                                        </div>
-                                        {% include 'paginator.html' %}
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script>
-    $(document).ready(function(){
-        $(".iframe").on('click', function(){
-        var url= $(this).attr("value");
-        $.layer({
-            type: 2,
-            title: '命令详情',
-            maxmin: true,
-            shift: 'top',
-            border: [2, 0.3, '#1AB394'],
-            shade: [0.5, '#000000'],
-            shadeClose: true,
-            area : ['800px' , '600px'],
-            iframe: {src: url}
-        });
-    });
-        $("#refresh").click(function(){
-            $.get('/jperm/sudo_refresh/',
-                    {'test':''},
-                    function(data){
-                        alert(data)
-                    }
-            )
-        })
-
-    });
-
-
-</script>
-
-{% endblock %}

templates/jperm/sys_user_add.html

@@ -0,0 +1,130 @@
+{% extends 'base.html' %}
+{% load mytags %}
+{% block content %}
+    {% include 'nav_cat_bar.html' %}
+    <div class="wrapper wrapper-content animated fadeInRight">
+        <div class="row">
+            <div class="col-lg-10">
+                <div class="ibox float-e-margins">
+                    <div class="panel blank-panel">
+                        <div class="panel-heading">
+                            <div class="panel-options">
+                                <ul class="nav nav-tabs">
+                                    <li id="tab1" class=""><a href="/jperm/sys_user_list/" >查看系统用户</a></li>
+                                    <li id="tab2" class="active"><a href="/jperm/sys_user_add/">添加系统用户</a></li>
+                                </ul>
+                            </div>
+                        </div>
+
+                        <div class="panel-body">
+                            <div class="tab-content">
+                                <div id="tab-default" class="tab-pane active">
+                                    <form method="post" id="userForm" class="form-horizontal" action="">
+                                        {% if error %}
+                                            <div class="alert alert-warning text-center">{{ error }}</div>
+                                        {% endif %}
+                                        {% if msg %}
+                                            <div class="alert alert-success text-center">{{ msg }}</div>
+                                        {% endif %}
+                                        <div class="form-group">
+                                            <label for="username" class="col-sm-2 control-label">用户名<span class="red-fonts">*</span></label>
+                                            <div class="col-sm-8">
+                                                <input id="username" name="username" placeholder="Username" type="text" class="form-control" {% if error %}value="{{ username }}" {% endif %}>
+                                            </div>
+                                        </div>
+                                        <div class="hr-line-dashed"></div>
+                                        <div class="form-group">
+                                            <label for="password" class="col-sm-2 control-label">密码<span class="red-fonts">*</span></label>
+                                            <div class="col-sm-8">
+                                                <input id="password" name="password" placeholder="Password" type="password" class="form-control" {% if error %}value="{{ password }}" {% endif %} >
+                                                <span class="help-block m-b-none">通常在其它硬件上使用，服务器会使用自动生成的key</span>
+                                            </div>
+
+                                        </div>
+                                        <div class="hr-line-dashed"></div>
+                                        <div class="form-group">
+                                            <label for="" class="col-sm-2 control-label">推送资产组<span class="red-fonts">*</span></label>
+                                            <div class="col-sm-4">
+                                                <div>
+                                                    <select id="asset_groups" name="asset_groups" class="form-control" size="12" multiple>
+                                                        {% for asset_group in asset_group_all %}
+                                                        <option value="{{ asset_group.id }}">{{ asset_group.name }}</option>
+                                                        {% endfor %}
+                                                    </select>
+                                                    <span class="help-block m-b-none">将在以上资产组服务器新建系统用户</span>
+                                                </div>
+                                            </div>
+
+                                            <div class="col-sm-1">
+                                                <div class="btn-group" style="margin-top: 42px;">
+                                                    <button type="button" class="btn btn-white" onclick="move('asset_groups', 'asset_groups_select')"><i class="fa fa-chevron-right"></i></button>
+                                                    <button type="button" class="btn btn-white" onclick="move('asset_groups_select', 'asset_groups')"><i class="fa fa-chevron-left"></i> </button>
+                                                </div>
+                                            </div>
+
+                                            <div class="col-sm-3">
+                                                <div>
+                                                    <select id="asset_groups_select" name="asset_groups_select" class="form-control m-b" size="12"  multiple>
+
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="hr-line-dashed"></div>
+                                        <div class="form-group">
+                                            <label for="comment" class="col-sm-2 control-label">备注<span class="red-fonts">*</span></label>
+                                            <div class="col-sm-8">
+                                                <input id="comment" name="comment" placeholder="Comment" type="text" class="form-control" {% if error %}value="{{ comment }}" {% endif %} >
+                                            </div>
+                                        </div>
+                                        <div class="hr-line-dashed"></div>
+                                        <div class="form-group">
+                                            <div class="col-sm-4 col-sm-offset-2">
+                                                <button class="btn btn-white" type="reset">取消</button>
+                                                <button id="submit_button" class="btn btn-primary" type="submit">确认保存</button>
+                                            </div>
+                                        </div>
+                                    </form>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
+{% block self_footer_js %}
+
+<script>
+$('#userForm').validator({
+    timely: 2,
+    theme: "yellow_right_effect",
+    rules: {
+        check_username: [/^\w{3,20}$/, '大小写字母数字和下划线'],
+        type_m: function(element){
+                    return  $("#M").is(":checked");
+            }
+    },
+    fields: {
+        "username": {
+            rule: "required;check_username",
+            tip: "输入用户名",
+            ok: "",
+            msg: {required: "必须填写!"}
+        },
+        "password": {
+            rule: "required;length[6~50]",
+            tip: "输入密码",
+            ok: "",
+            msg: {required: "必须填写!"}
+        }
+    },
+    valid: function(form) {
+        form.submit();
+    }
+});
+
+
+</script>
+{% endblock %}

templates/jperm/sys_user_list.html

@@ -0,0 +1,102 @@
+{% extends 'base.html' %}
+{% load mytags %}
+{% block content %}
+{% include 'nav_cat_bar.html' %}
+
+<div class="wrapper wrapper-content animated fadeInRight">
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="ibox float-e-margins">
+                <div class="panel blank-panel">
+                    <div class="panel-heading">
+                        <div class="panel-options">
+                            <ul class="nav nav-tabs">
+                                <li id="tab1" class="active"><a href="/jperm/sys_user_list/" >查看系统用户</a></li>
+                                <li id="tab2" class=""><a href="/jperm/sys_user_add/">添加系统用户</a></li>
+                            </ul>
+                        </div>
+                    </div>
+
+                    <div class="panel-body">
+                        <div class="tab-content">
+                            <div id="tab-default" class="tab-pane active">
+                                <div class="ibox-content">
+                                    <table class="table table-striped table-bordered table-hover " id="editable" >
+                                        <thead>
+                                            <tr>
+                                                <th class="text-center">
+                                                    <input type="checkbox"  name="select_all" onclick="selectAll()">
+                                                </th>
+                                                <th class="text-center">用户名</th>
+                                                <th class="text-center">操作</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                        {% for user in users.object_list %}
+                                            <tr class="gradeX">
+                                                <td class="text-center">
+                                                    <input type="checkbox"  name="selected" value="{{ user.id }}">
+                                                </td>
+                                                <td class="text-center"> {{ user.username }} </td>
+                                                <td class="text-center">
+                                                    <a href="../user_detail/?id={{ user.id }}" class="btn btn-xs btn-primary">详情</a>
+                                                    <a href="../user_edit/?id={{ user.id }}" class="btn btn-xs btn-info">编辑</a>
+                                                    <a value="../user_del/?id={{ user.id }}" class="btn btn-xs btn-danger del {% if user.username == 'admin' %} disabled {% endif %}">删除</a>
+                                                </td>
+                                            </tr>
+                                        {% endfor %}
+                                        </tbody>
+                                    </table>
+                                    <div class="row">
+                                        <div class="col-sm-6">
+                                            <div class="dataTables_info" id="editable_info" role="status" aria-live="polite">
+                                                Showing {{ users.start_index }} to {{ users.end_index }} of {{ p.count }} entries
+                                            </div>
+                                        </div>
+                                        {% include 'paginator.html' %}
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+{% endblock %}
+{% block self_head_css_js %}
+<script>
+    $(document).ready(function(){
+        $('.del').click(function(){
+            var row = $(this).closest('tr');
+            $.get(
+                    $(this).attr('value'),
+                    {},
+                    function(data){
+                        row.remove();
+                        alert(data);
+                    }
+            )
+        });
+
+        $('#del_btn').click(function(){
+            var check_array = [];
+            if (confirm("确定删除")) {
+                $(".gradeX input:checked").each(function() {
+                    check_array.push($(this).attr("value"))
+                });
+                $.post("/juser/user_del/",
+                        {id: check_array.join(",")},
+                        function(data){
+                            $(".gradeX input:checked").closest("tr").remove();
+                            alert(data);
+                        }
+                )
+            }
+
+        });
+    });
+</script>
+{% endblock %}

templates/juser/user_list.html

@@ -61,7 +61,7 @@
                                 </td>
                                 <td class="text-center"> {{ user.username }} </td>
                                 <td class="text-center"> {{ user.name }} </td>
-                                <td class="text-center" title="{% for user_group in user.group.all %} {{ user_group.name }} {% endfor %}"> {{ user.group.all | group_str2  }} </td>
+                                <td class="text-center" title="{% for user_group in user.group.all %} {{ user_group.name }} {% endfor %}"> {{ user.group.all | groups2str  }} </td>
                                 <td class="text-center"> {{ user.id | get_role }}</td>
                                 <td class="text-center">{{ user.is_active | bool2str }}</td>
                                 <td class="text-center"><a href="/juser/down_key/?id={{ user.id }}">下载</a></td>

templates/log_watch.html

@@ -0,0 +1,138 @@
+<html>
+<head>  
+<link href="http://cdn.bootcss.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
+<link href="http://cdn.bootcss.com/bootstrap/3.2.0/css/bootstrap-theme.min.css" rel="stylesheet">
+<script src="http://cdn.bootcss.com/jquery/2.1.1/jquery.min.js"></script>
+<script src="http://cdn.bootcss.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
+<script>
+    var wsUri = "ws://j:8080/send";
+    var ws;
+    function connect(){
+        ws = new WebSocket(wsUri);
+        ws.onopen = function(evt){ console.log(evt.data) };
+        ws.onclose = function(evt){ console.log(evt.data) };
+        ws.onmessage = function(evt){ console.log(evt.data) };
+        ws.onerror = function(evt){ console.log(evt.data) };
+
+        return ws;
+    }
+
+    function send() {
+        var data = {
+            input:$("#input_data").val()
+        };
+
+        console.log('hello');
+        ws.send(JSON.stringify(data));
+
+        $("#message").empty();
+        ws.onopen = function() {
+            ws.send(JSON.stringify(data));
+        };
+
+        $("#message").append('<div class="panel-body"><p>');
+        ws.onmessage = function(event) {
+            $("#message").append(JSON.parse(event.data).input + "<br>");
+        };
+
+        ws.onclose = function(event) {
+            $("#message").append('</p></div>');
+        };
+    }
+
+{#    function send() {#}
+{#        var ws = new WebSocket("ws://j:8080/send");#}
+{##}
+{#        var data = {#}
+{#            input:$("#input_data").val(),#}
+{#        };#}
+{##}
+{#        $("#message").empty();#}
+{#        ws.onopen = function() {#}
+{#            ws.send(JSON.stringify(data));#}
+{#        };#}
+{##}
+{#        $("#message").append('<div class="panel-body"><p>');#}
+{#        ws.onmessage = function(event) {#}
+{#            $("#message").append(JSON.parse(event.data).input + "<br>");#}
+{#        };#}
+{##}
+{#        ws.onclose = function(event) {#}
+{#            $("#message").append('</p></div>');#}
+{#        };#}
+{#    }#}
+
+    function disconnect(){
+        ws.close();
+    }
+
+</script>
+</head>
+<body>
+{#  <div id="test">#}
+{#  <form class="form-horizontal" role="form">#}
+{#    <div class="panel panel-default">#}
+{#      <div class="panel-heading">#}
+{#        <h5 class="panel-title">>>输入</h5>#}
+{#      </div>#}
+{#      <div class="panel-body">#}
+{#        <div class="form-group">#}
+{#          <div class="col-md-8">#}
+{#            <input type="text" class="form-control" id="input_data" value="">#}
+{#          </div>#}
+{#        </div>#}
+{#        <div class="form-group">#}
+{#          <div class="col-md-8">#}
+{#            <input type="button" class="btn btn-success" id="input_1_btn" onclick="connect();" value="连接" />#}
+{#            <input type="button" class="btn btn-success" id="input_btn" onclick="send();" value="查看" />#}
+{#            <input type="button" class="btn btn-success" id="input_2_btn" onclick="close();" value="关闭" />#}
+{#          </div>#}
+{#        </div>#}
+{#      </div>#}
+{#    </div>#}
+{#  </form>#}
+{#  <div class="panel panel-default">#}
+{#    <div class="panel-heading">#}
+{#      <h5 class="panel-title">>> 输出</h5>#}
+{#    </div>#}
+{#    <div class="panel-body">#}
+{#      <div id="message"></div>#}
+{#    </div>#}
+{#  </div>#}
+<div class="col-lg-12">
+    <div class="ibox float-e-margins">
+        <div class="ibox-title" style="border: solid">
+            <h5> 实时监控 </h5>
+            <div class="ibox-tools">
+                <a class="collapise-link">
+                    <i class="fa fa-chevron-up"></i>
+                </a>
+                <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+                    <i class="fa fa-wrench"></i>
+                </a>
+                <a class="close-link">
+                    <i class="fa fa-times"></i>
+                </a>
+            </div>
+        </div>
+
+        <div class="ibox-content blank-panel" style="background-color: #0b0b0b; color: #006621; height: 500px; padding: 20px;">
+            你好<br>
+            你好<br>
+            你好<br>
+            你好你好你好<br>
+            你好<br>
+            你好<br>
+            你好<br>
+            你好<br>
+            你好<br>
+            你好<br>
+
+
+
+        </div>
+    </div>
+</div>
+</body>
+</html>
+</html>

templates/nav.html

@@ -32,18 +32,22 @@
                     </li>
 
                     <li class="perm_list perm_edit perm_detail">
-                        <a href="/jperm/perm_list/">用户组授权</a>
+                        <a href="/jperm/group/">用户组授权</a>
                     </li>
 
                     <li class="sudo_list sudo_edit sudo_add cmd_list cmd_edit cmd_add sudo_detail">
-                        <a href="/jperm/sudo_list/">命令授权</a>
+                        <a href="/jperm/sys_user_list/">系统用户</a>
                     </li>
                     <li class="apply_show online"><a href="/jperm/apply_show/online/">权限审批</a></li>
+                    <li class="apply_show online"><a href="/jperm/log/">授权记录</a></li>
                 </ul>
             </li>
             <li id="jlog">
                <a href="/jlog/log_list/online/"><i class="fa fa-files-o"></i> <span class="nav-label">日志审计</span><span class="label label-info pull-right"></span></a>
             </li>
+            <li id="setting">
+                   <a href="/setting/"><i class="fa fa-files-o"></i> <span class="nav-label">设置</span><span class="label label-info pull-right"></span></a>
+            </li>
             <li class="special_link">
                 <a href="http://www.jumpserver.org" target="_blank"><i class="fa fa-database"></i> <span class="nav-label">访问官网</span></a>
             </li>

templates/setting.html

@@ -0,0 +1,94 @@
+{% extends 'base.html' %}
+{% load mytags %}
+
+
+{% block content %}
+    {% include 'nav_cat_bar.html' %}
+    <div class="wrapper wrapper-content animated fadeInRight">
+        <div class="row">
+            <div class="col-lg-10">
+                <div class="ibox float-e-margins">
+                    <div class="ibox-title">
+                        <h5> 项目设置 </h5>
+                        <div class="ibox-tools">
+                            <a class="collapse-link">
+                                <i class="fa fa-chevron-up"></i>
+                            </a>
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+                                <i class="fa fa-wrench"></i>
+                            </a>
+                            <a class="close-link">
+                                <i class="fa fa-times"></i>
+                            </a>
+                        </div>
+                    </div>
+
+                    <div class="ibox-content">
+                        <div class="panel blank-panel">
+                            <div class="panel-heading">
+                                <div class="panel-options">
+                                    <ul class="nav nav-tabs">
+                                        <li id="tab1" class="active"><a data-toggle="tab" href="#tab-default" aria-expanded="true">默认设置</a></li>
+                                        <li id="tab2" class=""><a data-toggle="tab" href="#tab-email" aria-expanded="true">邮箱设置</a></li>
+                                    </ul>
+                                </div>
+                            </div>
+
+                            <div class="panel-body">
+                                <div class="tab-content">
+                                    <div id="tab-default" class="tab-pane active">
+                                        <form method="post" id="userForm" class="form-horizontal" action="">
+                                            {% if error %}
+                                                <div class="alert alert-warning text-center">{{ error }}</div>
+                                            {% endif %}
+                                            {% if msg %}
+                                                <div class="alert alert-success text-center">{{ msg }}</div>
+                                            {% endif %}
+                                            <div class="form-group">
+                                                <label for="username" class="col-sm-2 control-label">默认用户名<span class="red-fonts">*</span></label>
+                                                <div class="col-sm-8">
+                                                    <input id="username" name="username" placeholder="Username" type="text" value="{{ setting_r.default_user }}" class="form-control">
+                                                </div>
+                                            </div>
+                                            <div class="hr-line-dashed"></div>
+                                            <div class="form-group">
+                                                <label for="port" class="col-sm-2 control-label">默认ssh端口<span class="red-fonts">*</span></label>
+                                                <div class="col-sm-8">
+                                                    <input id="port" name="port" placeholder="Port" type="text" value="{{ setting_r.default_port }}" class="form-control">
+                                                </div>
+                                            </div>
+                                            <div class="hr-line-dashed"></div>
+                                            <div class="form-group">
+                                                <label for="key" class="col-sm-2 control-label">默认密钥<span class="red-fonts">*</span></label>
+                                                <div class="col-sm-8">
+                                                    <textarea class="form-control" name="key" placeholder="请复制粘贴私钥(原来的因为安全原因不被显示)" rows="10" style="font-size: 9px;"></textarea>
+                                                </div>
+                                            </div>
+                                            <div class="hr-line-dashed"></div>
+                                            <div class="form-group">
+                                                <div class="col-sm-4 col-sm-offset-2">
+                                                    <button class="btn btn-white" type="reset">取消</button>
+                                                    <button id="submit_button" class="btn btn-primary" type="submit">确认保存</button>
+                                                </div>
+                                            </div>
+                                        </form>
+                                    </div>
+
+                                    <div id="tab-email" class="tab-pane">
+                                        <table class="table table-striped table-bordered table-hover " id="editable" >
+                                            <thead>
+                                                <tr>
+                                                    <th class="text-center">组名</th>
+                                                </tr>
+                                            </thead>
+                                        </table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}

templates/test.html

@@ -1,74 +0,0 @@
-
-<html>
-<head>
-	<meta charset='utf8'>
-<script src="http://cdn.bootcss.com/jquery/1.11.2/jquery.min.js"></script>
-<style type="text/css">
-
-	.blue
-	{
-		color: blue;
-	}
-</style>
-{#<script>#}
-{#$('html').ajaxSend(function(event, xhr, settings) {#}
-{#    function getCookie(name) {#}
-{#        var cookieValue = null;#}
-{#        if (document.cookie && document.cookie != '') {#}
-{#            var cookies = document.cookie.split(';');#}
-{#            for (var i = 0; i < cookies.length; i++) {#}
-{#                var cookie = jQuery.trim(cookies[i]);#}
-{#                // Does this cookie string begin with the name we want?#}
-{#                if (cookie.substring(0, name.length + 1) == (name + '=')) {#}
-{#                    cookieValue = decodeURIComponent(cookie.substring(name.length + 1));#}
-{#                    break;#}
-{#                }#}
-{#            }#}
-{#        }#}
-{#        return cookieValue;#}
-{#    }#}
-{#    if (!(/^http:.*/.test(settings.url) || /^https:.*/.test(settings.url))) {#}
-{#        // Only send the token to relative URLs i.e. locally.#}
-{#        xhr.setRequestHeader("X-CSRFToken", getCookie('csrftoken'));#}
-{#    }#}
-{#});#}
-{#</script>#}
-<script>
-$(document).ready(function(){
-  $("#btn1").click(function(){
-    $("#test").text(function(i,origText){
-    	return "Old text: " + origText + "New text: Hllo" + i
-    })
-  });
-
-  $("#btn2").click(function(){
-    $.post('/test_ajax/',
-          {'name': 'join', 'age': 10},
-          function(data, status){
-            $('#btn1').text(data)
-          })
-
-  });
-
-  $("#btn3").click(function(){
-  	$("p").toggleClass('blue')
-  	// $("p").addClass('blue')
-    // $("p").before("Some thine")
-  });
-})
-</script>
-</head>
-
-<body>
-<p id="test" class="blue">
-  这是段落中的<b>粗体</b>文本。
-  <p><span>hello</span></p>
-  
-</p>
-<!-- <input type="text" id="test2" name="nameaaaaaaaaaa" value="米老鼠"> -->
-<button id="btn1">显示文本</button>
-<button id="btn2">显示 HTML</button>
-<button id="btn3">显示 value</button>
-</body>
-
-</html>

templates/test2.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+    <head><title>Poem Maker Pro</title></head>
+    <body>
+        <h1>Your poem</h1>
+        <p>Two {{roads}} diverged in a {{wood}}, and I—<br>
+I took the one less travelled by,<br>
+And that has {{made}} all the {{difference}}.</p>
+    </body>
+</html>