From a860a5e32923f0670b49d059a36a367566d42d73 Mon Sep 17 00:00:00 2001
From: Steeve Chailloux <steeve@chaahk.com>
Date: Wed, 18 Nov 2015 09:49:17 -0600
Subject: [PATCH 1/2] translate view from chinese to english

---
 views_en/easyui/public/header.tpl       |  13 +
 views_en/easyui/public/index.tpl        | 231 ++++++++++++++++++
 views_en/easyui/public/login.tpl        |  64 +++++
 views_en/easyui/rbac/accesstonode.tpl   | 103 ++++++++
 views_en/easyui/rbac/group.tpl          | 225 ++++++++++++++++++
 views_en/easyui/rbac/node.tpl           | 197 ++++++++++++++++
 views_en/easyui/rbac/role.tpl           | 185 +++++++++++++++
 views_en/easyui/rbac/roletouserlist.tpl |  77 ++++++
 views_en/easyui/rbac/user.tpl           | 300 ++++++++++++++++++++++++
 views_en/index.tpl                      |  82 +++++++
 10 files changed, 1477 insertions(+)
 create mode 100644 views_en/easyui/public/header.tpl
 create mode 100644 views_en/easyui/public/index.tpl
 create mode 100644 views_en/easyui/public/login.tpl
 create mode 100644 views_en/easyui/rbac/accesstonode.tpl
 create mode 100644 views_en/easyui/rbac/group.tpl
 create mode 100644 views_en/easyui/rbac/node.tpl
 create mode 100644 views_en/easyui/rbac/role.tpl
 create mode 100644 views_en/easyui/rbac/roletouserlist.tpl
 create mode 100644 views_en/easyui/rbac/user.tpl
 create mode 100644 views_en/index.tpl
diff --git a/views_en/easyui/public/header.tpl b/views_en/easyui/public/header.tpl
new file mode 100644
index 0000000..5961437
--- /dev/null
+++ b/views_en/easyui/public/header.tpl
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<title>Beego admin</title>
+    <link rel="stylesheet" type="text/css" href="/static/easyui/jquery-easyui/themes/default/easyui.css" />
+    <link rel="stylesheet" type="text/css" href="/static/easyui/jquery-easyui/themes/icon.css" />
+    <script type="text/javascript" src="/static/easyui/jquery-easyui/jquery.min.js"></script>
+    <script type="text/javascript" src="/static/easyui/jquery-easyui/jquery.easyui.min.js"></script>
+    <script type="text/javascript" src="/static/easyui/jquery-easyui/common.js"></script>
+    <script type="text/javascript" src="/static/easyui/jquery-easyui/easyui_expand.js"></script>
+    <script type="text/javascript" src="/static/easyui/jquery-easyui/phpjs-min.js"></script>
+</head>
diff --git a/views_en/easyui/public/index.tpl b/views_en/easyui/public/index.tpl
new file mode 100644
index 0000000..c7aac2d
--- /dev/null
+++ b/views_en/easyui/public/index.tpl
@@ -0,0 +1,231 @@
+{{template "../public/header.tpl"}}
+<script type="text/javascript">
+var URL="/public"
+    $( function() {
+        //生成树
+        $("#tree").tree({
+            url:URL+'/index',
+            onClick:function(node){
+                if(node.attributes.url == ""){
+                    $(this).tree("toggle",node.target);
+                    return false;
+                }
+                var href = node.attributes.url;
+                var tabs = $("#tabs");
+                if(href){
+                    var content = '<iframe scrolling="auto" frameborder="0"  src="'+href+'" style="width:100%;height:100%;"></iframe>';
+                }else{
+                    var content = 'Unrealized';
+                }
+                // Existing tabs then select it
+                if(tabs.tabs('exists',node.text)){
+                    // Selected
+                    tabs.tabs('select',node.text);
+                    //refreshTab(node.text);
+                }else{
+                    // Add to
+                    tabs.tabs('add',{
+                        title:node.text,
+                        content:content,
+                        closable:true,
+                        cache:false,
+                        fit:'true'
+                    });
+                }
+            }
+        });
+        $("#tabs").tabs({
+            width: $("#tabs").parent().width(),
+            height: "auto",
+            fit:true,
+            border:false,
+            onContextMenu : function(e, title) {
+                e.preventDefault();
+                $("#mm").menu('show', {
+                    left : e.pageX,
+                    top : e.pageY
+                }).data('tabTitle', title);
+            }
+        });
+        $('#mm').menu({
+            onClick : function(item) {
+                var curTabTitle = $(this).data('tabTitle');
+                var type = $(item.target).attr('type');
+
+                if (type === 'refresh') {
+                    refreshTab(curTabTitle);
+                    return;
+                }
+
+                if (type === 'close') {
+                    var t = $("#tabs").tabs('getTab', curTabTitle);
+                    if (t.panel('options').closable) {
+                        $("#tabs").tabs('close', curTabTitle);
+                    }
+                    return;
+                }
+
+                var allTabs = $("#tabs").tabs('tabs');
+                var closeTabsTitle = [];
+
+                $.each(allTabs, function() {
+                    var opt = $(this).panel('options');
+                    if (opt.closable && opt.title != curTabTitle && type === 'closeOther') {
+                        closeTabsTitle.push(opt.title);
+                    } else if (opt.closable && type === 'closeAll') {
+                        closeTabsTitle.push(opt.title);
+                    }
+                });
+                for ( var i = 0; i < closeTabsTitle.length; i++) {
+                    $("#tabs").tabs('close', closeTabsTitle[i]);
+                }
+            }
+        });
+        // Modify the color scheme
+        $("#changetheme").change(function(){
+            var theme = $(this).val();
+            $.cookie("theme",theme); // New cookie
+            location.reload();
+        });
+        // Set the theme of the selected value
+//        var themed = $.cookie('theme');
+//        if(themed){
+//            $("#changetheme").val(themed);
+//        }
+    });
+    function refreshTab(title) {
+        var tab = $("#tabs").tabs("getTab", title);
+        $("#tabs").tabs("update", {tab: tab, options: tab.panel("options")});
+    }
+    function undo(){
+        $('#tree').tree('expandAll');
+    }
+    function redo(){
+        $('#tree').tree('collapseAll');
+    }
+    function modifypassword(){
+        $("#dialog").dialog({
+            modal:true,
+            title:"Change Password",
+            width:400,
+            height:250,
+            buttons:[{
+                text:'Save',
+                iconCls:'icon-save',
+                handler:function(){
+                    $("#form1").form('submit',{
+                        url:URL+'/changepwd',
+                        onSubmit:function(){
+                            return $("#form1").form('validate');
+                        },
+                        success:function(r){
+                            var r = $.parseJSON( r );
+                            if(r.status){
+                                $.messager.alert("Prompt", r.info,'info',function(){
+                                    location.href = URL+"/logout";
+                                });
+                            }else{
+                                vac.alert(r.info);
+                            }
+                        }
+                    });
+                }
+            },{
+                text:'Cancel',
+                iconCls:'icon-cancel',
+                handler:function(){
+                    $("#dialog").dialog("close");
+                }
+            }]
+        });
+    }
+    // Select Packet
+    function selectgroup(group_id){
+        $(this).addClass("current");
+        vac.ajax(URL+'/index', {group_id:group_id}, 'GET', function(data){
+            $("#tree").tree("loadData",data)
+        })
+
+    }
+</script>
+
+<style>
+.ht_nav {
+    float: left;
+    overflow: hidden;
+    padding: 0 0 0 10px;
+    margin: 0;
+}
+.ht_nav li{
+    font:700 16px/2.5 'microsoft yahei';
+    float: left;
+    list-style-type: none;
+    margin-right: 10px;
+
+}
+.ht_nav li a{
+    text-decoration: none;
+    color:#333;
+}
+.ht_nav li a.current, .ht_nav li a:hover{
+    color:#F20;
+
+}
+</style>
+<body class="easyui-layout" style="text-align:left">
+<div region="north" border="false" style="overflow: hidden; width: 100%; height:82px; background:#D9E5FD;">
+    <div style="overflow: hidden; width:200px; padding:2px 0 0 5px;">
+        <h2>BeegoAdmin</h2>
+    </div>
+    <ul class="ht_nav">
+        {{range .groups}}
+            <li><span><a class="current"  href="#" onClick="selectgroup({{.Id}});$('.ht_nav li a').removeClass('current');$(this).addClass('current')">{{.Title}}</a></span></li>
+        {{end}}
+    </ul>
+    <div id="header-inner" style="float:right; overflow:hidden; height:80px; width:300px; line-height:25px; text-align:right; padding-right:20px;margin-top:-50px; ">
+        Welcome! {{.userinfo.Nickname}} <a href="javascript:void(0);" onclick="modifypassword()">Change Password</a>
+        <a href="/public/logout" target="_parent">Log Out</a>
+    </div>
+</div>
+<div id="dialog" >
+    <div style="padding:20px 20px 40px 80px;" >
+        <form id="form1" method="post">
+            <table>
+                <tr>
+                    <td>Old Password</td>
+                    <td><input type="password"  name="oldpassword" class="easyui-validatebox"  required="true" validType="password[5,20]" missingMessage="Please fill in the password currently in use"/></td>
+                </tr>
+                <tr>
+                    <td>New Password:</td>
+                    <td><input type="password"  name="newpassword" class="easyui-validatebox" required="true" validType="password[5,20]" missingMessage="Please fill in the need to modify the password"  /></td>
+                </tr>
+                <tr>
+                    <td>Repeat Password</td>
+                    <td><input type="password"  name="repeatpassword"  class="easyui-validatebox" required="true" validType="password[5,20]" missingMessage="Please fill in the need to modify the password, repeat" /></td>
+                </tr>
+            </table>
+        </form>
+    </div>
+</div>
+</div>
+<div region="west" border="false" split="true" title="Menu"  tools="#toolbar" style="width:200px;padding:5px;">
+    <ul id="tree"></ul>
+</div>
+<div region="center" border="false" >
+    <div id="tabs" >
+    </div>
+</div>
+<div id="toolbar">
+    <a href="#" class="icon-undo" title="Expand All"  onclick="undo()"></a>
+    <a href="#" class="icon-redo" title="All Off"  onclick="redo()"></a>
+</div>
+<!--Right Menu-->
+<div id="mm" style="width: 120px;display:none;">
+    <div iconCls='icon-reload' type="refresh">Refresh</div>
+    <div class="menu-sep"></div>
+    <div  type="close">Close</div>
+    <div type="closeOther">Close Other</div>
+    <div type="closeAll">Close All</div>
+</div>
+</body>
+</html>
diff --git a/views_en/easyui/public/login.tpl b/views_en/easyui/public/login.tpl
new file mode 100644
index 0000000..49b0217
--- /dev/null
+++ b/views_en/easyui/public/login.tpl
@@ -0,0 +1,64 @@
+{{template "../public/header.tpl"}}
+<script type="text/javascript">
+var URL="/public"
+    $(function(){
+        $("#dialog").dialog({
+            closable:false,
+            buttons:[{
+            text:'Log In',
+            iconCls:'icon-save',
+            handler:function(){
+                fromsubmit();
+            }
+        },{
+            text:'Reset',
+            iconCls:'icon-cancel',
+            handler:function(){
+                $("#form").from("reset");
+            }
+        }]
+        });
+    });
+function fromsubmit(){
+    $("#form").form('submit',{
+        url:URL+'/login?isajax=1',
+        onSubmit:function(){
+            return $("#form").form('validate');
+        },
+        success:function(r){
+            var r = $.parseJSON( r );
+            if(r.status){
+                location.href = URL+"/index"
+            }else{
+                vac.alert(r.info);
+            }
+        }
+    });
+}
+    // This is the keyboard trigger function
+var SubmitOrHidden = function(evt){
+    evt = window.event || evt;
+    if(evt.keyCode==13){// If the key is to take a carriage return
+          fromsubmit();       
+     }
+                
+}
+window.document.onkeydown=SubmitOrHidden;// Executive function when a key is pressed
+</script>
+<body>
+<div style="text-align:center;margin:0 auto;width:350px;height:250px;" id="dialog" title="Log In">
+<div style="padding:20px 20px 20px 40px;" >
+<form id="form" method="post">
+<table >
+    <tr>
+        <td>Username:</td><td><input type="text" class="easyui-validatebox" required="true" name="username" missingMessage="Please enter account name"/></td>
+    </tr>
+    <tr>
+        <td>Password:</td><td><input type="password" class="easyui-validatebox" required="true" name="password" missingMessage="Please enter your password"/></td>
+    </tr>
+</table>
+</form>
+</div>
+</div>
+</body>
+</html>
diff --git a/views_en/easyui/rbac/accesstonode.tpl b/views_en/easyui/rbac/accesstonode.tpl
new file mode 100644
index 0000000..d95cd60
--- /dev/null
+++ b/views_en/easyui/rbac/accesstonode.tpl
@@ -0,0 +1,103 @@
+{{template "../public/header.tpl"}}
+<script type="text/javascript">
+    var roleid = {{.roleid}};
+    var grouplist=$.parseJSON({{.grouplist | stringsToJson}});
+    var URL="/rbac/role"
+$(function(){
+    // Authorization list
+    $("#combobox1").combobox({
+        url:URL+'/Getlist',
+        valueField:'Id',
+        textField:'Name',
+        value:roleid,
+        onSelect:function(record){
+            var group_id = $("#group").combobox("getValue");
+            vac.ajax(URL+"/AccessToNode",{Id:record.Id,group_id:group_id},"POST",function(data){
+                        $("#treegrid").treegrid("loadData",data)
+                    }
+            )
+        }
+    });
+    // Loading Tree
+    $("#treegrid").treegrid({
+        'url':URL+'/AccessToNode?group_id=1&Id='+roleid,
+        'idField':'Id',
+        'treeField':'Title',
+        'fitColumns':true,
+        'singleSelect':false,
+        columns:[[
+            {field:'Id',title:'ID',hidden:true},
+            {field:'Title',title:'Display name',width:150},
+            {field:'Name',title:'Application Name',width:150}
+        ]],
+        onLoadSuccess:function(node,data){
+            // Correspondence between the selected default already exists
+            for(var i=0;i<data.rows.length;i++){
+                if(data.rows[i].checked == 1){
+                    $(this).treegrid('select',data.rows[i].Id);
+                }
+            }
+        },
+        onSelect:function(row){
+            $(this).treegrid('expandAll',row.Id);
+            if(row._parentId != 0){
+                $(this).treegrid('select',row._parentId);
+            }
+            
+        },
+        onUnselect:function(row){
+            //选中level=2的节点
+            if(row.children != undefined){
+                for(var i=0;i<row.children.length;i++){
+                    $(this).treegrid('unselect',row.children[i].Id);
+                    //选中level=3的节点
+                    if(row.children[i].children != undefined){
+                        for(var j=0;j<row.children[i].children.length;j++){
+                            $(this).treegrid('unselect',row.children[i].children[j].Id);
+                        }
+                    }
+                }
+            }
+        }
+    });
+    $("#group").combobox({
+        "valueField":'Id',
+        "textField":'Title',
+        data:grouplist,
+        value:1,
+        onSelect:function(record){
+            var roleid = $("#combobox1").combobox("getValue");
+            vac.ajax(URL+"/AccessToNode",{group_id:record.Id,Id:roleid},"POST",function(data){
+                        $("#treegrid").treegrid("loadData",data)
+                    }
+            )
+        }
+    });
+});
+    //保存授权
+    function saveaccess(){
+        $.messager.progress();
+        var tdata = $("#treegrid").treegrid('getSelections');
+        var data=new Array(tdata.length);
+        for(var i=0;i<tdata.length;i++){
+            data[i] = tdata[i].Id;
+        }
+        var roleid = $("#combobox1").combobox("getValue");
+        var group_id = $("#group").combobox("getValue");
+        vac.ajax(URL+'/AddAccess', {roleid:roleid,group_id:group_id,ids:data.join(",")}, 'POST', function(r){
+            $.messager.alert('提示',r.info,'info');
+            $.messager.progress('close');
+        })
+    }
+</script>
+<body>
+<table id="treegrid" toolbar="#tbr"></table>
+<div id="tbr" style="padding:5px;height:auto">
+    <div style="margin-bottom:5px">
+        Group: <input id="group" name="name" >
+        Current Group: <input id="combobox1" name="name" >
+        <a href="#"  class="easyui-linkbutton" iconCls="icon-save" title="保存" plain="true" onclick="saveaccess()">Save</a>
+    </div>
+</div>
+</body>
+</html>
diff --git a/views_en/easyui/rbac/group.tpl b/views_en/easyui/rbac/group.tpl
new file mode 100644
index 0000000..eaddc20
--- /dev/null
+++ b/views_en/easyui/rbac/group.tpl
@@ -0,0 +1,225 @@
+{{template "../public/header.tpl"}}
+
+<script type="text/javascript">
+var statuslist = [
+    {id:'1',text:'Disable'},
+    {id:'2',text:'Enable'}
+];
+var URL="/rbac/group";
+$(function(){
+    //用户列表
+    $("#datagrid").datagrid({
+        title:'Group List',
+        url:URL+'/index',
+        method:'POST',
+        pagination:true,
+        fitColumns:true,
+        striped:true,
+        rownumbers:true,
+        singleSelect:true,
+        idField:'id',
+        pagination:true,
+        pageSize:20,
+        pageList:[10,20,30,50,100],
+        columns:[[
+            {field:'Id',title:'ID',width:50},
+            {field:'Name',title:'Group Name',width:100,align:'center',editor:'text'},
+            {field:'Title',title:'Display Name',width:100,align:'center',editor:'text'},
+
+            {field:'Sort',title:'Sort',width:50,align:'center',editor:'numberbox'},
+            {field:'Status',title:'Status',width:50,align:'center',
+                formatter:function(value){
+                    for(var i=0; i<statuslist.length; i++){
+                        if (statuslist[i].id == value) return statuslist[i].text;
+                    }
+                    return value;
+                },
+                editor:{
+                    type:'combobox',
+                    options:{
+                        valueField:'id',
+                        textField:'text',
+                        data:statuslist,
+                        required:true
+                    }
+                }
+            }
+        ]],
+        onAfterEdit:function(index, data, changes){
+            if(vac.isEmpty(changes)){
+                return;
+            }
+            changes.Id = data.Id;
+            vac.ajax(URL+'/UpdateGroup', changes, 'POST', function(r){
+                if(!r.status){
+                    vac.alert(r.info);
+                }else{
+                    $("#datagrid").datagrid("reload");
+                }
+            })
+        },
+        onDblClickRow:function(index,row){
+            editrow();
+        },
+        onRowContextMenu:function(e, index, row){
+            e.preventDefault();
+            $(this).datagrid("selectRow",index);
+            $('#mm').menu('show',{
+                left: e.clientX,
+                top: e.clientY
+            });
+        },
+        onHeaderContextMenu:function(e, field){
+            e.preventDefault();
+            $('#mm1').menu('show',{
+                left: e.clientX,
+                top: e.clientY
+            });
+        }
+    });
+    //创建添加分组窗口
+    $("#dialog").dialog({
+        modal:true,
+        resizable:true,
+        top:150,
+        closed:true,
+        buttons:[{
+            text:'Save',
+            iconCls:'icon-save',
+            handler:function(){
+                $("#form1").form('submit',{
+                    url:URL+'/AddGroup',
+                    onSubmit:function(){
+                        return $("#form1").form('validate');
+                    },
+                    success:function(r){
+                        var r = $.parseJSON( r );
+                        if(r.status){
+                            $("#dialog").dialog("close");
+                            $("#datagrid").datagrid('reload');
+                        }else{
+                            vac.alert(r.info);
+                        }
+                    }
+                });
+            }
+        },{
+            text:'Cancel',
+            iconCls:'icon-cancel',
+            handler:function(){
+                $("#dialog").dialog("close");
+            }
+        }]
+    });
+
+})
+
+function editrow(){
+    if(!$("#datagrid").datagrid("getSelected")){
+        vac.alert("Please select the row you want to edit");
+        return;
+    }
+    $('#datagrid').datagrid('beginEdit', vac.getindex("datagrid"));
+}
+function saverow(index){
+    if(!$("#datagrid").datagrid("getSelected")){
+        vac.alert("Please select the row you want to save");
+        return;
+    }
+    $('#datagrid').datagrid('endEdit', vac.getindex("datagrid"));
+}
+//取消
+function cancelrow(){
+    if(! $("#datagrid").datagrid("getSelected")){
+        vac.alert("Please select the row you want to cancel");
+        return;
+    }
+    $("#datagrid").datagrid("cancelEdit",vac.getindex("datagrid"));
+}
+//刷新
+function reloadrow(){
+    $("#datagrid").datagrid("reload");
+}
+
+//添加用户弹窗
+function addrow(){
+    $("#dialog").dialog('open');
+    $("#form1").form('clear');
+}
+
+//删除
+function delrow(){
+    $.messager.confirm('Confirm','Are you sure you want to delete?',function(r){
+        if (r){
+            var row = $("#datagrid").datagrid("getSelected");
+            if(!row){
+                vac.alert("Please select the rows to be deleted");
+                return;
+            }
+            vac.ajax(URL+'/DelGroup', {Id:row.Id}, 'POST', function(r){
+                if(r.status){
+                    $("#datagrid").datagrid('reload');
+                }else{
+                    vac.alert(r.info);
+                }
+            })
+        }
+    });
+}
+</script>
+<body>
+<table id="datagrid" toolbar="#tb"></table>
+<div id="tb" style="padding:5px;height:auto">
+    <a href="#" icon='icon-add' plain="true" onclick="addrow()" class="easyui-linkbutton" >Add</a>
+    <a href="#" icon='icon-edit' plain="true" onclick="editrow()" class="easyui-linkbutton" >Edit</a>
+    <a href="#" icon='icon-save' plain="true" onclick="saverow()" class="easyui-linkbutton" >Save</a>
+    <a href="#" icon='icon-cancel' plain="true" onclick="delrow()" class="easyui-linkbutton" >Delete</a>
+    <a href="#" icon='icon-reload' plain="true" onclick="reloadrow()" class="easyui-linkbutton" >Reload</a>
+</div>
+<!--Right menu within the table-->
+<div id="mm" class="easyui-menu" style="width:120px;display: none" >
+    <div iconCls='icon-add' onclick="addrow()">Add</div>
+    <div iconCls="icon-edit" onclick="editrow()">Edit</div>
+    <div iconCls='icon-save' onclick="saverow()">Save</div>
+    <div iconCls='icon-cancel' onclick="cancelrow()">Cancel</div>
+    <div class="menu-sep"></div>
+    <div iconCls='icon-cancel' onclick="delrow()">Delete</div>
+    <div iconCls='icon-reload' onclick="reloadrow()">Reload</div>
+    <div class="menu-sep"></div>
+    <div>Exit</div>
+</div>
+<!--Header right menu-->
+<div id="mm1" class="easyui-menu" style="width:120px;display: none"  >
+    <div icon='icon-add' onclick="addrow()">Add</div>
+</div>
+<div id="dialog" title="Add Group" style="width:400px;height:300px;">
+    <div style="padding:20px 20px 40px 80px;" >
+        <form id="form1" method="post">
+            <table>
+                <tr>
+                    <td>Group Name:</td>
+                    <td><input name="Name" class="easyui-validatebox" required="true"/></td>
+                </tr>
+                <tr>
+                    <td>Display Name:</td>
+                    <td><input name="Title" class="easyui-validatebox" required="true"  /></td>
+                </tr>
+                <tr>
+                    <td>Sort:</td>
+                    <td><input name="Sort" class="easyui-numberbox" required="true"  /></td>
+                </tr>
+                <tr>
+                    <td>Status:</td>
+                    <td>
+                        <select name="Status"  style="width:153px;" class="easyui-combobox " data-options="value:2" editable="false" required="true"  >
+                            <option value="2" >Enable</option>
+                            <option value="1">Disable</option>
+                        </select>
+                    </td>
+                </tr>
+            </table>
+        </form>
+    </div>
+</div>
+</body>
+</html>
diff --git a/views_en/easyui/rbac/node.tpl b/views_en/easyui/rbac/node.tpl
new file mode 100644
index 0000000..68246cf
--- /dev/null
+++ b/views_en/easyui/rbac/node.tpl
@@ -0,0 +1,197 @@
+{{template "../public/header.tpl"}}
+<script type="text/javascript">
+    var grouplist=$.parseJSON({{.grouplist | stringsToJson}});
+    var products = [
+        {productid:'1',name:'Disable'},
+        {productid:'2',name:'Enable'}
+    ];
+    var URL="/rbac/node";
+    $(function(){
+        $("#treegrid").treegrid({
+            url:URL+"/index",
+            idField:"Id",
+            treeField:"Title",
+            fitColumns:"true",
+            columns:[[
+                {field:'Title',title:'Display Name',width:150,editor:'text'},
+                {field:'Id',title:'ID',width:50},
+                {field:'Name',title:'Application Name',width:100,editor:'text'},
+                {field:'Group__Id',title:'Group',width:80,
+                    formatter:function(value){
+                        for(var i=0; i<grouplist.length; i++){
+                            if (grouplist[i].Id == value) return grouplist[i].Title;
+                        }
+                        return value;
+                    }
+                },
+                {field:'Status',title:'Status',width:50,align:'center',
+                    formatter:function(value){
+                        for(var i=0; i<products.length; i++){
+                            if (products[i].productid == value) return products[i].name;
+                        }
+                        return value;
+                    },
+                    editor:{
+                        type:'combobox',
+                        options:{
+                            valueField:'productid',
+                            textField:'name',
+                            data:products,
+                            required:true
+                        }
+                    }
+                },
+                {field:'Remark',title:'Description',width:150,editor:'text'}
+            ]],
+            onAfterEdit:function(c){
+                if(vac.isEmpty(c)){
+                    return;
+                }
+                vac.ajax(URL+'/AddAndEdit', c, 'POST', function(r){
+                    if(!r.status){
+                        vac.alert(r.info);
+                    }else{
+                        var group_id = $("#group").combobox("getValue");
+                        vac.ajax(URL+"/index",{group_id:group_id},"POST",function(data){
+                                    $("#treegrid").treegrid("loadData",data)
+                                }
+                        );
+                    }
+                })
+            },
+            onDblClickRow:function(index,row){
+                editrow();
+            },
+            onContextMenu:function(e, row){
+                e.preventDefault();
+                $(this).treegrid('select', row.Id);
+                $('#mm').menu('show',{
+                    left: e.clientX,
+                    top: e.clientY
+                });
+            },
+            onHeaderContextMenu:function(e, field){
+                e.preventDefault();
+                $('#mm1').menu('show',{
+                    left: e.clientX,
+                    top: e.clientY
+                });
+            }
+
+        });
+    $("#group").combobox({
+        "valueField":'Id',
+        "textField":'Title',
+        data:grouplist,
+        value:1,
+        onSelect:function(record){
+            vac.ajax(URL+"/index",{group_id:record.Id},"POST",function(data){
+                        $("#treegrid").treegrid("loadData",data)
+                    }
+            )
+        }
+    });
+});
+    //新增行
+    function addrow(){
+        var Row = $("#treegrid").treegrid("getSelected");
+        var _group = $("#group").combobox("getValue");
+        var data = [];
+        data[0] = {Id:0,Title:'',Name:'',Remark:'',Status:'1',Pid:0,Group_id:_group};
+        if(!vac.isEmpty(Row)){
+            data[0].Pid =Row.Id;
+            $("#treegrid").treegrid("expand",Row.Id);//展开节点
+            if($("#treegrid").treegrid("getLevel",Row.Id) >2){
+                vac.alert("Not allowed to add");
+                return false;
+            }
+        }
+        //如果没有数据，则从0行开始新增
+        $("#treegrid").treegrid("append",{
+            parent: (Row?Row.Id:null),
+            data:data
+        });
+        $("#treegrid").treegrid("select",0);//选中
+        $("#treegrid").treegrid("beginEdit",0);//编辑输入
+    }
+    //编辑
+    function editrow(){
+        var row = $("#treegrid").treegrid("getSelected");
+        if(!row){
+            vac.alert("Please select the row you want to edit");
+            return;
+        }
+        $("#treegrid").treegrid("beginEdit",row.Id);
+    }
+    //保存
+    function saverow(){
+        var row = $("#treegrid").treegrid("getSelected");
+        if(!row){
+            vac.alert("Please select the row you want to save");
+            return;
+        }
+        $("#treegrid").treegrid("endEdit",row.Id);
+    }
+    //取消
+    function cancelrow(){
+        var row = $("#treegrid").treegrid("getSelected");
+        if(!row){
+            vac.alert("Please select the row you want to cancel");
+            return;
+        }
+        $("#treegrid").treegrid("cancelEdit",row.Id);
+    }
+    //删除
+    function delrow(){
+        $.messager.confirm('Confirm','Are you sure you want to delete?',function(r){
+            if (r){
+                var row = $("#treegrid").treegrid("getSelected");
+                if(!row){
+                    vac.alert("Please select the rows to be deleted");
+                    return;
+                }
+                vac.ajax(URL+'/DelNode', {Id:row.Id}, 'POST', function(r){
+                    if(!r.status){
+                        vac.alert(r.info);
+                    }else{
+                        $("#treegrid").treegrid("reload");
+                    }
+                })
+            }
+        });
+    }
+    //刷新
+    function reloadrow(){
+        $("#treegrid").treegrid("reload");
+    }
+
+</script>
+<body>
+<table id="treegrid" title="Node Manager" class="easyui-treegrid" toolbar="#tb"></table>
+<div id="tb" style="padding:5px;height:auto">
+    <input id="group"/>
+    <a href="#" icon='icon-add' plain="true" onclick="addrow()" class="easyui-linkbutton" >Add</a>
+    <a href="#" icon='icon-edit' plain="true" onclick="editrow()" class="easyui-linkbutton" >Edit</a>
+    <a href="#" icon='icon-save' plain="true" onclick="saverow()" class="easyui-linkbutton" >Save</a>
+    <a href="#" icon='icon-cancel' plain="true" onclick="cancelrow()" class="easyui-linkbutton" >Cancel</a>
+    <a href="#" icon='icon-cancel' plain="true" onclick="delrow()" class="easyui-linkbutton" >Delete</a>
+    <a href="#" icon='icon-reload' plain="true" onclick="reloadrow()" class="easyui-linkbutton" >Reload</a>
+</div>
+<!--表格内的右键菜单-->
+<div id="mm" class="easyui-menu" style="width:120px;display: none" >
+    <div iconCls='icon-add' onclick="addrow()">Add</div>
+    <div iconCls="icon-edit" onclick="editrow()">Edit</div>
+    <div iconCls='icon-save' onclick="saverow()">Save</div>
+    <div iconCls='icon-cancel' onclick="cancelrow()">Cancel</div>
+    <div class="menu-sep"></div>
+    <div iconCls='icon-cancel' onclick="delrow()">Delete</div>
+    <div iconCls='icon-reload' onclick="reloadrow()">Reload</div>
+    <div class="menu-sep"></div>
+    <div>Exit</div>
+</div>
+<!--表头的右键菜单-->
+<div id="mm1" class="easyui-menu" style="width:120px;display: none"  >
+    <div icon='icon-add' onclick="addrow()">Add</div>
+</div>
+</body>
+</html>
diff --git a/views_en/easyui/rbac/role.tpl b/views_en/easyui/rbac/role.tpl
new file mode 100644
index 0000000..506dd65
--- /dev/null
+++ b/views_en/easyui/rbac/role.tpl
@@ -0,0 +1,185 @@
+{{template "../public/header.tpl"}}
+<script type="text/javascript">
+var statuslist = [
+    {statusid:'1',name:'Disable'},
+    {statusid:'2',name:'Enable'}
+];
+var URL="/rbac/role";
+$(function(){
+    //角色列表
+    $("#datagrid").datagrid({
+        title:'Role Management',
+        url:URL+"/index",
+        method:'POST',
+        pagination:true,
+        fitColumns:true,
+        striped:true,
+        rownumbers:true,
+        singleSelect:true,
+        idField:'Id',
+        columns:[[
+            {field:'Id',title:'ID',width:50,align:'center'},
+            {field:'Name',title:'Role Name',width:150,align:'center',editor:'text'},
+            {field:'Remark',title:'Descriptjion',width:250,align:'center',editor:'text'},
+            // {field:'create_time',title:'添加时间',width:150,align:'center',
+            //     formatter:function(value,row,index){
+            //         if(value) return phpjs.date("Y-m-d H:i:s",value);
+            //         return value;
+            //     }
+            // },
+            // {field:'update_time',title:'更新时间',width:150,align:'center',
+            //     formatter:function(value,row,index){
+            //         if(value) return phpjs.date("Y-m-d H:i:s",value);
+            //         return value;
+            //     }
+            // },
+            {field:'Status',title:'Status',width:100,align:'center',
+                formatter:function(value){
+                    for(var i=0; i<statuslist.length; i++){
+                        if (statuslist[i].statusid == value) return statuslist[i].name;
+                    }
+                    return value;
+                },
+                editor:{
+                    type:'combobox',
+                    options:{
+                        valueField:'statusid',
+                        textField:'name',
+                        data:statuslist,
+                        required:true
+                    }
+                }
+            },
+            {field:'action',title:'Operating',width:200,align:'center',
+                formatter:function(value,row,index){
+                    var c = '<a href="'+URL+'/AccessToNode?Id='+row.Id+'" target="_blank">Authorize</a> ';
+                    var d = '<a href="'+URL+'/RoleToUserList?Id='+row.Id+'" target="_blank">User List</a> ';
+                    return c+d;
+                }
+            }
+        ]],
+        onAfterEdit:function(index, data, changes){
+            if(vac.isEmpty(changes)){
+                return;
+            }
+            if(data.Id == undefined){
+                changes.Id = 0;
+            }else{
+                changes.Id = data.Id;
+            }
+            vac.ajax(URL+'/AddAndEdit', changes, 'POST', function(r){
+                if(!r.status){
+                    vac.alert(r.info);
+                }else{
+                    $("#datagrid").datagrid("reload");
+                }
+            })
+        },
+        onDblClickRow:function(index,row){
+            editrow();
+        },
+        onRowContextMenu:function(e, index, row){
+            e.preventDefault();
+            $(this).datagrid("selectRow",index);
+            $('#mm').menu('show',{
+                left: e.clientX,
+                top: e.clientY
+            });
+        },
+        onHeaderContextMenu:function(e, field){
+            e.preventDefault();
+            $('#mm1').menu('show',{
+                left: e.clientX,
+                top: e.clientY
+            });
+        }
+    });
+})
+//新增行
+function addrow(){
+    var getRows = $("#datagrid").datagrid("getRows");
+
+    //如果没有数据，则从0行开始新增
+    if(vac.isEmpty(getRows)){
+        var lenght = 0;
+    }else{
+        var lenght = getRows.length;
+    }
+    $("#datagrid").datagrid("appendRow",{Status:2});//插入
+    $("#datagrid").datagrid("selectRow",lenght);//选中
+    $("#datagrid").datagrid("beginEdit",lenght);//编辑输入
+}
+function editrow(){
+    if(!$("#datagrid").datagrid("getSelected")){
+        vac.alert("Please select the row you want to edit");
+        return;
+    }
+    $('#datagrid').datagrid('beginEdit', vac.getindex("datagrid"));
+}
+function saverow(index){
+    if(!$("#datagrid").datagrid("getSelected")){
+        vac.alert("Please select the row you want to save");
+        return;
+    }
+    $('#datagrid').datagrid('endEdit', vac.getindex("datagrid"));
+}
+//取消
+function cancelrow(){
+    if(! $("#datagrid").datagrid("getSelected")){
+        vac.alert("Please select the row you want to cancel");
+        return;
+    }
+    $("#datagrid").datagrid("cancelEdit",vac.getindex("datagrid"));
+}
+//刷新
+function reloadrow(){
+    $("#datagrid").datagrid("reload");
+}
+
+//删除
+function delrow(){
+    $.messager.confirm('Confirm','Are you sure you want to delete?',function(r){
+        if (r){
+            var row = $("#datagrid").datagrid("getSelected");
+            if(! row){
+                vac.alert("Please select the rows to be deleted");
+                return;
+            }
+            vac.ajax(URL+'/DelRole', {Id:row.Id}, 'POST', function(r){
+                if(r.status){
+                    $("#datagrid").datagrid('reload');
+                }else{
+                    vac.alert(r.info);
+                }
+            })
+        }
+    });
+}
+</script>
+<body>
+<table id="datagrid" toolbar="#tb"></table>
+<div id="tb" style="padding:5px;height:auto">
+    <a href="#" icon='icon-add' plain="true" onclick="addrow()" class="easyui-linkbutton" >Add</a>
+    <a href="#" icon='icon-edit' plain="true" onclick="editrow()" class="easyui-linkbutton" >Edit</a>
+    <a href="#" icon='icon-save' plain="true" onclick="saverow()" class="easyui-linkbutton" >Save</a>
+    <a href="#" icon='icon-cancel' plain="true" onclick="delrow()" class="easyui-linkbutton" >Delete</a>
+    <a href="#" icon='icon-reload' plain="true" onclick="reloadrow()" class="easyui-linkbutton" >Reload</a>
+</div>
+<!--表格内的右键菜单-->
+<div id="mm" class="easyui-menu" style="width:120px;display: none" >
+    <div iconCls='icon-add' onclick="addrow()">Add</div>
+    <div iconCls="icon-edit" onclick="editrow()">Edit</div>
+    <div iconCls='icon-save' onclick="saverow()">Save</div>
+    <div iconCls='icon-cancel' onclick="cancelrow()">Cancel</div>
+    <div class="menu-sep"></div>
+    <div iconCls='icon-cancel' onclick="delrow()">Delete</div>
+    <div iconCls='icon-reload' onclick="reloadrow()">Reload</div>
+    <div class="menu-sep"></div>
+    <div>Exit</div>
+</div>
+<!--表头的右键菜单-->
+<div id="mm1" class="easyui-menu" style="width:120px;display: none"  >
+    <div icon='icon-add' onclick="addrow()">Add</div>
+</div>
+</body>
+</html>
diff --git a/views_en/easyui/rbac/roletouserlist.tpl b/views_en/easyui/rbac/roletouserlist.tpl
new file mode 100644
index 0000000..455bf00
--- /dev/null
+++ b/views_en/easyui/rbac/roletouserlist.tpl
@@ -0,0 +1,77 @@
+{{template "../public/header.tpl"}}
+<script type="text/javascript">
+    var roleid = {{.roleid}};
+    var URL="/rbac/role"
+$(function(){
+    //用户列表
+    $("#combobox").combobox({
+        url:URL+'/Getlist',
+        valueField:'Id',
+        textField:'Name',
+        value:roleid,
+        onSelect:function(record){
+            $("#datagrid2").datagrid("reload",{Id:record.Id});
+        }
+    });
+    //组用户列表
+    $("#datagrid2").datagrid({
+        url:URL+'/RoleToUserList?Id='+roleid,
+        method:'get',
+        fitColumns:false,
+        striped:true,
+        rownumbers:true,
+        idField:'Id',
+        columns:[[
+            {field:'Id',title:'ID',width:50,align:'center'},
+            {field:'Username',title:'Username',width:140,align:'center'},
+            {field:'Nickname',title:'Nickname',width:140,align:'center'}
+        ]],
+        onLoadSuccess:function(data){
+            $("#datagrid2").datagrid('unselectAll');
+            //默认选中已存在的对应关系
+            for(var i=0;i<data.rows.length;i++){
+                if(data.rows[i].checked == 1){
+                    $(this).datagrid('selectRecord',data.rows[i].Id);
+                }
+            }
+        }
+    });
+});
+    //全选
+    function selectall(){
+        $("#datagrid2").datagrid('selectAll');
+    }
+    //全否
+    function unselectall(){
+        $("#datagrid2").datagrid('unselectAll');
+    }
+    //保存选择
+    function saveselect(){
+        var rows = $("#datagrid2").datagrid('getSelections');
+        if(rows == null){
+            vac.alert("Select a minimum of one row");
+        }
+        var ids = [];
+        for(var i=0; i<rows.length; i++){
+            ids.push(rows[i].Id);
+        }
+        var id = $("#combobox").combobox('getValue');
+        vac.ajax(URL+'/AddRoleToUser', {Id:id,ids:ids.join(',')}, 'POST', function(r){
+            $.messager.alert('Prompt',r.info,'info');
+        })
+    }
+</script>
+<body>
+<table id="datagrid2" toolbar="#tb2"></table>
+<div id="tb2" style="padding:5px;height:auto">
+    <div style="margin-bottom:5px">
+        Current Group:<input id="combobox" name="name" >
+        <a href="#"  class="easyui-linkbutton" iconCls="icon-save" plain="true" onclick="saveselect()">Save</a>
+    </div>
+    <div style="margin-bottom:5px">
+        <a href="#"  class="easyui-linkbutton" iconCls="icon-ok" plain="true" onclick="selectall()">Select All</a>
+        <a href="#"  class="easyui-linkbutton" iconCls="icon-no" plain="true" onclick="unselectall()">UnSelect All</a>
+    </div>
+</div>
+</body>
+</html>
diff --git a/views_en/easyui/rbac/user.tpl b/views_en/easyui/rbac/user.tpl
new file mode 100644
index 0000000..27b9bdd
--- /dev/null
+++ b/views_en/easyui/rbac/user.tpl
@@ -0,0 +1,300 @@
+{{template "../public/header.tpl"}}
+<script type="text/javascript">
+var statuslist = [
+    {statusid:'1',name:'Disable'},
+    {statusid:'2',name:'Enable'}
+];
+var URL="/rbac/user";
+$(function(){
+    //用户列表
+    $("#datagrid").datagrid({
+        title:'User List',
+        url:URL+'/index',
+        method:'POST',
+        pagination:true,
+        fitColumns:true,
+        striped:true,
+        rownumbers:true,
+        singleSelect:true,
+        idField:'Id',
+        pagination:true,
+        pageSize:20,
+        pageList:[10,20,30,50,100],
+        columns:[[
+            {field:'Id',title:'ID',width:50,sortable:true},
+            {field:'Username',title:'Username',width:100,sortable:true},
+            {field:'Nickname',title:'Nickname',width:100,align:'center',editor:'text'},
+            {field:'Email',title:'Email',width:100,align:'center',editor:'text'},
+            {field:'Remark',title:'Description',width:150,align:'center',editor:'text'},
+            {field:'Lastlogintime',title:'Last Login Time',width:100,align:'center',
+                formatter:function(value,row,index){
+                    if(value) return phpjs.date("Y-m-d H:i:s",phpjs.strtotime(value));
+                    return value;
+                }
+            },
+            {field:'Createtime',title:'Add Time',width:100,align:'center',
+                formatter:function(value,row,index){
+                    if(value) return phpjs.date("Y-m-d H:i:s",phpjs.strtotime(value));
+                    return value;
+                }
+            },
+            {field:'Status',title:'Status',width:50,align:'center',
+                formatter:function(value){
+                    for(var i=0; i<statuslist.length; i++){
+                        if (statuslist[i].statusid == value) return statuslist[i].name;
+                    }
+                    return value;
+                },
+                editor:{
+                    type:'combobox',
+                    options:{
+                        valueField:'statusid',
+                        textField:'name',
+                        data:statuslist,
+                        required:true
+                    }
+                }
+            }
+        ]],
+        onAfterEdit:function(index, data, changes){
+            if(vac.isEmpty(changes)){
+                return;
+            }
+            changes.Id = data.Id;
+            vac.ajax(URL+'/UpdateUser', changes, 'POST', function(r){
+                if(!r.status){
+                    vac.alert(r.info);
+                }else{
+                    $("#datagrid").datagrid("reload");
+                }
+            })
+        },
+        onDblClickRow:function(index,row){
+            editrow();
+        },
+        onRowContextMenu:function(e, index, row){
+            e.preventDefault();
+            $(this).datagrid("selectRow",index);
+            $('#mm').menu('show',{
+                left: e.clientX,
+                top: e.clientY
+            });
+        },
+        onHeaderContextMenu:function(e, field){
+            e.preventDefault();
+            $('#mm1').menu('show',{
+                left: e.clientX,
+                top: e.clientY
+            });
+        }
+    });
+    //创建添加用户窗口
+    $("#dialog").dialog({
+        modal:true,
+        resizable:true,
+        top:150,
+        closed:true,
+        buttons:[{
+            text:'Save',
+            iconCls:'icon-save',
+            handler:function(){
+                $("#form1").form('submit',{
+                    url:URL+'/AddUser',
+                    onSubmit:function(){
+                        return $("#form1").form('validate');
+                    },
+                    success:function(r){
+                        var r = $.parseJSON( r );
+                        if(r.status){
+                            $("#dialog").dialog("close");
+                            $("#datagrid").datagrid('reload');
+                        }else{
+                            vac.alert(r.info);
+                        }
+                    }
+                });
+            }
+        },{
+            text:'Cancel',
+            iconCls:'icon-cancel',
+            handler:function(){
+                $("#dialog").dialog("close");
+            }
+        }]
+    });
+    //创建修改密码窗口
+    $("#dialog2").dialog({
+        modal:true,
+        resizable:true,
+        top:150,
+        closed:true,
+        buttons:[{
+            text:'Save',
+            iconCls:'icon-save',
+            handler:function(){
+                var selectedRow = $("#datagrid").datagrid('getSelected');
+                var password = $('#password').val();
+                vac.ajax(URL+'/UpdateUser', {Id:selectedRow.Id,Password:password}, 'post', function(r){
+                    if(r.status){
+                        $("#dialog2").dialog("close");
+                    }else{
+                        vac.alert(r.info);
+                    }
+                })
+            }
+        },{
+            text:'Cancel',
+            iconCls:'icon-cancel',
+            handler:function(){
+                $("#dialog2").dialog("close");
+            }
+        }]
+    });
+
+})
+
+function editrow(){
+    if(!$("#datagrid").datagrid("getSelected")){
+        vac.alert("Please select the row you want to edit");
+        return;
+    }
+    $('#datagrid').datagrid('beginEdit', vac.getindex("datagrid"));
+}
+function saverow(index){
+    if(!$("#datagrid").datagrid("getSelected")){
+        vac.alert("Please select the row you want to save");
+        return;
+    }
+    $('#datagrid').datagrid('endEdit', vac.getindex("datagrid"));
+}
+//取消
+function cancelrow(){
+    if(! $("#datagrid").datagrid("getSelected")){
+        vac.alert("Please select the row you want to cancel");
+        return;
+    }
+    $("#datagrid").datagrid("cancelEdit",vac.getindex("datagrid"));
+}
+//刷新
+function reloadrow(){
+    $("#datagrid").datagrid("reload");
+}
+
+//添加用户弹窗
+function addrow(){
+    $("#dialog").dialog('open');
+    $("#form1").form('clear');
+}
+
+//编辑用户密码
+function updateuserpassword(){
+    var dg = $("#datagrid")
+    var selectedRow = dg.datagrid('getSelected');
+    if(selectedRow == null){
+        vac.alert("Choose a User");
+        return;
+    }
+    $("#dialog2").dialog('open');
+    $("form2").form('load',{password:''});
+}
+
+//删除
+function delrow(){
+    $.messager.confirm('Confirm','Are you sure you want to delete?',function(r){
+        if (r){
+            var row = $("#datagrid").datagrid("getSelected");
+            if(!row){
+                vac.alert("Please select the rows to be deleted");
+                return;
+            }
+            vac.ajax(URL+'/DelUser', {Id:row.Id}, 'POST', function(r){
+                if(r.status){
+                    $("#datagrid").datagrid('reload');
+                }else{
+                    vac.alert(r.info);
+                }
+            })
+        }
+    });
+}
+</script>
+<body>
+<table id="datagrid" toolbar="#tb"></table>
+<div id="tb" style="padding:5px;height:auto">
+    <a href="#" icon='icon-add' plain="true" onclick="addrow()" class="easyui-linkbutton" >Add</a>
+    <a href="#" icon='icon-edit' plain="true" onclick="editrow()" class="easyui-linkbutton" >Edit</a>
+    <a href="#" icon='icon-save' plain="true" onclick="saverow()" class="easyui-linkbutton" >Save</a>
+    <a href="#" icon='icon-cancel' plain="true" onclick="delrow()" class="easyui-linkbutton" >Delete</a>
+    <a href="#" icon='icon-reload' plain="true" onclick="reloadrow()" class="easyui-linkbutton" >Reload</a>
+    <a href="#" icon='icon-edit' plain="true" onclick="updateuserpassword()" class="easyui-linkbutton" >Change Password</a>
+</div>
+<!--表格内的右键菜单-->
+<div id="mm" class="easyui-menu" style="width:120px;display: none" >
+    <div iconCls='icon-add' onclick="addrow()">Add</div>
+    <div iconCls="icon-edit" onclick="editrow()">Edit</div>
+    <div iconCls='icon-save' onclick="saverow()">Save</div>
+    <div iconCls='icon-cancel' onclick="cancelrow()">Cancel</div>
+    <div iconCls='icon-edit' onclick="updateuserpassword()">Change Password</div>
+    <div class="menu-sep"></div>
+    <div iconCls='icon-cancel' onclick="delrow()">Delete</div>
+    <div iconCls='icon-reload' onclick="reloadrow()">Reload</div>
+    <div class="menu-sep"></div>
+    <div>Exit</div>
+</div>
+<!--表头的右键菜单-->
+<div id="mm1" class="easyui-menu" style="width:120px;display: none"  >
+    <div icon='icon-add' onclick="addrow()">Add</div>
+</div>
+<div id="dialog" title="添加用户" style="width:400px;height:400px;">
+    <div style="padding:20px 20px 40px 80px;" >
+        <form id="form1" method="post">
+            <table>
+                <tr>
+                    <td>Username:</td>
+                    <td><input name="Username" class="easyui-validatebox" required="true"/></td>
+                </tr>
+                <tr>
+                    <td>Nickname:</td>
+                    <td><input name="Nickname" class="easyui-validatebox" required="true"  /></td>
+                </tr>
+                <tr>
+                    <td>Password</td>
+                    <td><input name="Password" type="password" class="easyui-validatebox" required="true"   validType="password[4,20]" /></td>
+                </tr>
+                <tr>
+                    <td>Retype Password</td>
+                    <td><input name="Repassword" type="password" class="easyui-validatebox" required="true"   validType="password[4,20]" /></td>
+                </tr>
+                <tr>
+                    <td>Email:</td>
+                    <td><input name="Email" class="easyui-validatebox" validType="email"  /></td>
+                </tr>
+                <tr>
+                    <td>Status:</td>
+                    <td>
+                        <select name="Status"  style="width:153px;" class="easyui-combobox " editable="false" required="true"  >
+                            <option value="2" >Enable</option>
+                            <option value="1">Disable</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>Description:</td>
+                    <td><textarea name="Remark" class="easyui-validatebox" validType="length[0,200]"></textarea></td>
+                </tr>
+            </table>
+        </form>
+    </div>
+</div>
+<div id="dialog2" title="Change Password" style="width:400px;height:200px;">
+    <div style="padding:20px 20px 40px 80px;" >
+        <table>
+            <tr>
+                <td>Password:</td>
+                <td><input name="Password" type="password" id="password" class="easyui-validatebox" required="true"   validType="password[4,20]" /></td>
+            </tr>
+        </table>
+    </div>
+</div>
+</body>
+</html>
diff --git a/views_en/index.tpl b/views_en/index.tpl
new file mode 100644
index 0000000..167ad4f
--- /dev/null
+++ b/views_en/index.tpl
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+
+<html>
+  	<head>
+    	<title>Beego</title>
+    	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	
+		<style type="text/css">
+			body {
+				margin: 0px;
+				font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+				font-size: 14px;
+				line-height: 20px;
+				color: rgb(51, 51, 51);
+				background-color: rgb(255, 255, 255);
+			}
+
+			.hero-unit {
+				padding: 60px;
+				margin-bottom: 30px;
+				border-radius: 6px 6px 6px 6px;
+			}
+
+			.container {
+				width: 940px;
+				margin-right: auto;
+				margin-left: auto;
+			}
+
+			.row {
+				margin-left: -20px;
+			}
+
+			h1 {
+				margin: 10px 0px;
+				font-family: inherit;
+				font-weight: bold;
+				text-rendering: optimizelegibility;
+			}
+
+			.hero-unit h1 {
+				margin-bottom: 0px;
+				font-size: 60px;
+				line-height: 1;
+				letter-spacing: -1px;
+				color: inherit;
+			}
+
+			.description {
+				padding-top: 5px;
+				padding-left: 5px;
+				font-size: 18px;
+				font-weight: 200;
+				line-height: 30px;
+				color: inherit;
+			}
+
+			p {
+				margin: 0px 0px 10px;
+			}
+		</style>
+	</head>
+  	
+  	<body>
+  		<header class="hero-unit" style="background-color:#A9F16C">
+			<div class="container">
+			<div class="row">
+			  <div class="hero-text">
+			    <h1>Welcome to Beego!</h1>
+			    <p class="description">
+			    	Beego is a simple & powerful Go web framework which is inspired by tornado and sinatra.
+			    <br />
+			    	Official website: <a href="http://{{.Website}}">{{.Website}}</a>
+			    <br />
+			    	Contact me: {{.Email}}
+			    </p>
+			  </div>
+			</div>
+			</div>
+		</header>
+	</body>
+</html>

From 99963fe1817e0c321b02db94462daf51d82d2898 Mon Sep 17 00:00:00 2001
From: Steeve Chailloux <steeve@chaahk.com>
Date: Wed, 18 Nov 2015 10:18:25 -0600
Subject: [PATCH 2/2] fix error group/role

---
 views_en/easyui/rbac/accesstonode.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views_en/easyui/rbac/accesstonode.tpl b/views_en/easyui/rbac/accesstonode.tpl
index d95cd60..248a651 100644
--- a/views_en/easyui/rbac/accesstonode.tpl
+++ b/views_en/easyui/rbac/accesstonode.tpl
@@ -95,7 +95,7 @@ $(function(){
 <div id="tbr" style="padding:5px;height:auto">
     <div style="margin-bottom:5px">
         Group: <input id="group" name="name" >
-        Current Group: <input id="combobox1" name="name" >
+        Current Role: <input id="combobox1" name="name" >
         <a href="#"  class="easyui-linkbutton" iconCls="icon-save" title="保存" plain="true" onclick="saveaccess()">Save</a>
     </div>
 </div>

Username:
Nickname:
Password
Retype Password
Email:
Status:	+ +
Description: