diff --git a/route.go b/route.go index 4802794e..53e9676b 100644 --- a/route.go +++ b/route.go @@ -60,11 +60,11 @@ func Register(w http.ResponseWriter, r *http.Request) { func Base(w http.ResponseWriter, r *http.Request) { //w.Header().Set("Content-Type", "application/json") - renderTemplate(w, "index") + renderTemplate(w, "dashboard") } func Base_Campaigns(w http.ResponseWriter, r *http.Request) { - renderTemplate(w, "index") + renderTemplate(w, "dashboard") } func Login(w http.ResponseWriter, r *http.Request) { @@ -72,6 +72,6 @@ func Login(w http.ResponseWriter, r *http.Request) { } func renderTemplate(w http.ResponseWriter, tmpl string) { - t, _ := template.ParseFiles("static/templates/" + tmpl + ".html") - t.Execute(w, "T") + t := template.Must(template.New("template").ParseFiles("templates/base.html", "templates/nav.html", "templates/"+tmpl+".html")) + t.ExecuteTemplate(w, "base", "T") } diff --git a/static/css/bootstrap.css b/static/css/bootstrap.css index 22a930b2..5ff467e2 100644 --- a/static/css/bootstrap.css +++ b/static/css/bootstrap.css @@ -4798,6 +4798,7 @@ textarea.input-group-sm > .input-group-btn > .btn { .navbar-inverse { background-color: #201e1c; border-color: #080808; + box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.1) } .navbar-inverse .navbar-brand { diff --git a/static/css/main.css b/static/css/main.css index 8f3381ff..9dbb8813 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -1,4 +1,63 @@ .navbar-logo { margin: 4px 0px; float: left; - } \ No newline at end of file + } + #navbar-login { + padding-top:8px; + padding-bottom:0px; + } + +.sans { + font-family: 'Open Sans', sans-serif; +} + +.form-signin { + max-width: 330px; + padding: 15px; + margin: 0 auto; +} + +.form-signin-heading { + text-align:center; +} + +.form-signin .form-signin-heading, +.form-signin .checkbox { + margin-bottom: 10px; +} +.form-signin .checkbox { + font-weight: normal; +} +.form-signin .form-control { + font-family: 'Open Sans', sans-serif; + position: relative; + font-size: 16px; + height: auto; + padding: 10px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.form-signin .form-control:focus { + z-index: 2; +} +.form-signin input[type="text"] { + margin-bottom: -1px; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; +} +.form-signin input[type="password"] { + margin-bottom: 10px; + border-top-left-radius: 0; + border-top-right-radius: 0; +} + +#logo { + display: block; + margin-left: auto; + margin-right: auto; +} +footer > p { + color:#444444; + font-family: 'Open Sans', sans-serif; +} \ No newline at end of file diff --git a/static/templates/index.html b/static/templates/index.html deleted file mode 100644 index 9e8acf25..00000000 --- a/static/templates/index.html +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - Gophish - Dashboard - - - - - - - - - - - -
-
-
- - -  gophish -
-
- -
-
-
- -
-
-

- Dashboard -

-
-
- -
-
-
-
-

Coming soon...

-
-
-
- -
- - - - - - - - - - diff --git a/static/templates/login.html b/static/templates/login.html deleted file mode 100644 index 919653cb..00000000 --- a/static/templates/login.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - Gophish - Login - - - - - - - - -
-
- - - - - - -
-
- - diff --git a/templates/base.html b/templates/base.html new file mode 100644 index 00000000..c8c76207 --- /dev/null +++ b/templates/base.html @@ -0,0 +1,34 @@ +{{define "base"}} + + + + + + + + + + + + Gophish - Dashboard + + + + + + + + + + + + {{template "content"}} + + + + + + + +{{end}} diff --git a/templates/dashboard.html b/templates/dashboard.html new file mode 100644 index 00000000..0545eaf6 --- /dev/null +++ b/templates/dashboard.html @@ -0,0 +1,15 @@ +{{define "content"}} {{template "nav"}} +
+
+

+ Dashboard +

+
+
+
+
+ +
+{{end}} diff --git a/templates/login.html b/templates/login.html new file mode 100644 index 00000000..c51374f1 --- /dev/null +++ b/templates/login.html @@ -0,0 +1,14 @@ +{{define "content"}} +
+
+ + + + + + +
+
+{{end}} diff --git a/templates/nav.html b/templates/nav.html new file mode 100644 index 00000000..16dbc708 --- /dev/null +++ b/templates/nav.html @@ -0,0 +1,24 @@ +{{define "nav"}} +
+
+
+ + +  gophish +
+
+ +
+
+
+{{end}} \ No newline at end of file