')
- .append(i.clone())
- .remove()
- .html()
- .replace(/type="password"/i, 'type="text"')
- .replace(/type=password/i, 'type=text')
- );
-
- if (i.attr('id') != '')
- x.attr('id', i.attr('id') + '-polyfill-field');
-
- if (i.attr('name') != '')
- x.attr('name', i.attr('name') + '-polyfill-field');
-
- x.addClass('polyfill-placeholder')
- .val(x.attr('placeholder')).insertAfter(i);
-
- if (i.val() == '')
- i.hide();
- else
- x.hide();
-
- i
- .on('blur', function(event) {
-
- event.preventDefault();
-
- var x = i.parent().find('input[name=' + i.attr('name') + '-polyfill-field]');
-
- if (i.val() == '') {
-
- i.hide();
- x.show();
-
- }
-
- });
-
- x
- .on('focus', function(event) {
-
- event.preventDefault();
-
- var i = x.parent().find('input[name=' + x.attr('name').replace('-polyfill-field', '') + ']');
-
- x.hide();
-
- i
- .show()
- .focus();
-
- })
- .on('keypress', function(event) {
-
- event.preventDefault();
- x.val('');
-
- });
-
- });
-
- // Events.
- $this
- .on('submit', function() {
-
- $this.find('input[type=text],input[type=password],textarea')
- .each(function(event) {
-
- var i = $(this);
-
- if (i.attr('name').match(/-polyfill-field$/))
- i.attr('name', '');
-
- if (i.val() == i.attr('placeholder')) {
-
- i.removeClass('polyfill-placeholder');
- i.val('');
-
- }
-
- });
-
- })
- .on('reset', function(event) {
-
- event.preventDefault();
-
- $this.find('select')
- .val($('option:first').val());
-
- $this.find('input,textarea')
- .each(function() {
-
- var i = $(this),
- x;
-
- i.removeClass('polyfill-placeholder');
-
- switch (this.type) {
-
- case 'submit':
- case 'reset':
- break;
-
- case 'password':
- i.val(i.attr('defaultValue'));
-
- x = i.parent().find('input[name=' + i.attr('name') + '-polyfill-field]');
-
- if (i.val() == '') {
- i.hide();
- x.show();
- }
- else {
- i.show();
- x.hide();
- }
-
- break;
-
- case 'checkbox':
- case 'radio':
- i.attr('checked', i.attr('defaultValue'));
- break;
-
- case 'text':
- case 'textarea':
- i.val(i.attr('defaultValue'));
-
- if (i.val() == '') {
- i.addClass('polyfill-placeholder');
- i.val(i.attr('placeholder'));
- }
-
- break;
-
- default:
- i.val(i.attr('defaultValue'));
- break;
-
- }
- });
-
- });
-
- return $this;
-
- };
-
- /**
- * Moves elements to/from the first positions of their respective parents.
- * @param {jQuery} $elements Elements (or selector) to move.
- * @param {bool} condition If true, moves elements to the top. Otherwise, moves elements back to their original locations.
- */
- $.prioritize = function($elements, condition) {
-
- var key = '__prioritize';
-
- // Expand $elements if it's not already a jQuery object.
- if (typeof $elements != 'jQuery')
- $elements = $($elements);
-
- // Step through elements.
- $elements.each(function() {
-
- var $e = $(this), $p,
- $parent = $e.parent();
-
- // No parent? Bail.
- if ($parent.length == 0)
- return;
-
- // Not moved? Move it.
- if (!$e.data(key)) {
-
- // Condition is false? Bail.
- if (!condition)
- return;
-
- // Get placeholder (which will serve as our point of reference for when this element needs to move back).
- $p = $e.prev();
-
- // Couldn't find anything? Means this element's already at the top, so bail.
- if ($p.length == 0)
- return;
-
- // Move element to top of parent.
- $e.prependTo($parent);
-
- // Mark element as moved.
- $e.data(key, $p);
-
- }
-
- // Moved already?
- else {
-
- // Condition is true? Bail.
- if (condition)
- return;
-
- $p = $e.data(key);
-
- // Move element back to its original location (using our placeholder).
- $e.insertAfter($p);
-
- // Unmark element as moved.
- $e.removeData(key);
-
- }
-
- });
-
- };
-
-})(jQuery);
\ No newline at end of file
diff --git a/main.go b/main.go
index de06344..2176280 100644
--- a/main.go
+++ b/main.go
@@ -15,7 +15,9 @@ import (
"golang.org/x/crypto/ssh/terminal"
"github.com/gorilla/handlers"
+ "github.com/gorilla/mux"
"github.com/gorilla/sessions"
+ "github.com/justinas/alice"
)
const AppName = "gosscms"
@@ -57,6 +59,7 @@ type Routes map[string]http.HandlerFunc
var sessionSecret = "JCOP5e8ohkTcOzcSMe74"
var sessionStore = sessions.NewCookieStore([]byte(sessionSecret))
var site *siteData
+var r *mux.Router
func main() {
loadConfig()
@@ -67,36 +70,26 @@ func main() {
fmt.Println("Operating in Development Mode")
}
- routes := Routes{
- "/": PublicHandler,
- "/admin": AdminHandler,
- "/admin/assets": AdminAssetHandler,
- }
- mux := http.DefaultServeMux
- loggingHandler := NewApacheLoggingHandler(mux, os.Stderr)
- for route, fn := range routes {
- mux.Handle(route, fn)
- }
+ r = mux.NewRouter()
+ r.StrictSlash(true)
- // Admin Subrouter
- /*
- admin := r.PathPrefix("/admin").Subrouter()
- admin.Handle("/assets", http.FileServer(FS(site.DevMode)))
- admin.HandleFunc("/", handleAdmin)
- admin.HandleFunc("/dologin", handleAdminDoLogin)
- admin.HandleFunc("/dologout", handleAdminDoLogout)
- admin.HandleFunc("/{category}", handleAdmin)
- admin.HandleFunc("/{category}/{id}", handleAdmin)
- admin.HandleFunc("/{category}/{id}/{function}", handleAdmin)
- admin.HandleFunc("/{category}/{id}/{function}/{subid}", handleAdmin)
+ r.PathPrefix("/admin/assets").Handler(http.StripPrefix("/admin/", http.FileServer(FS(site.DevMode))))
+ admin := r.PathPrefix("/admin").Subrouter()
+ admin.HandleFunc("/", handleAdmin)
+ admin.HandleFunc("/dologin", handleAdminDoLogin)
+ admin.HandleFunc("/dologout", handleAdminDoLogout)
+ admin.HandleFunc("/{category}", handleAdmin)
+ admin.HandleFunc("/{category}/{id}", handleAdmin)
+ admin.HandleFunc("/{category}/{id}/{function}", handleAdmin)
- http.Handle("/", r)
+ r.PathPrefix("/").Handler(http.FileServer(http.Dir("public")))
- */
- server := &http.Server{Addr: "127.0.0.1:" + strconv.Itoa(site.Port), Handler: loggingHandler}
+ http.Handle("/", r)
+
+ chain := alice.New(loggingHandler).Then(r)
fmt.Printf("Listening on port %d\n", site.Port)
- log.Fatal(server.ListenAndServe())
+ log.Fatal(http.ListenAndServe("127.0.0.1:"+strconv.Itoa(site.Port), chain))
}
func PublicHandler(w http.ResponseWriter, r *http.Request) {
@@ -240,7 +233,6 @@ func redirect(url string, w http.ResponseWriter, req *http.Request) {
// outputTemplate
// Spit out a template
func outputTemplate(tmplName string, tmplData interface{}, w http.ResponseWriter) error {
- fmt.Println(tmplName)
n := "/templates/" + tmplName
l := template.Must(template.New("layout").Parse(FSMustString(site.DevMode, n)))
t := template.Must(l.Parse(FSMustString(site.DevMode, n)))
diff --git a/templates/admin-adduser.html b/templates/admin-adduser.html
new file mode 100644
index 0000000..7b996f2
--- /dev/null
+++ b/templates/admin-adduser.html
@@ -0,0 +1,24 @@
+
diff --git a/templates/admin-edituser.html b/templates/admin-edituser.html
index 13fcdd1..edc66cb 100644
--- a/templates/admin-edituser.html
+++ b/templates/admin-edituser.html
@@ -1,24 +1,29 @@
-
+
+ {{ end }}
-