move all resources to common dir. this replaces server.dir.adminifier and server.dir.static with server.dir.resource. closes #75

Author: cooper

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "adminifier/adminifier-static/ext/pikaday"]
-	path = adminifier/adminifier-static/ext/pikaday
+	path = resources/adminifier/static/ext/pikaday
 	url = https://github.com/pikaday/pikaday.git
 [submodule "adminifier/adminifier-static/ext/ace"]
-	path = adminifier/adminifier-static/ext/ace
+	path = resources/adminifier/static/ext/ace
 	url = https://github.com/ajaxorg/ace-builds

adminifier/adminifier-static/ext/ace

@@ -19,7 +19,7 @@ var tmpl *template.Template
 var mux *http.ServeMux
 var conf *wikifier.Page
 var sessMgr *scs.SessionManager
-var host, root, dirAdminifier string
+var host, root, dirResource, dirAdminifier string
 
 // Configure sets up adminifier on webserver.ServeMux using webserver.Conf.
 func Configure() {
@@ -33,9 +33,9 @@ func Configure() {
 
 	// extract strings
 	for key, ptr := range map[string]*string{
-		"server.dir.adminifier": &dirAdminifier,
-		"adminifier.host":       &host,
-		"adminifier.root":       &root,
+		"server.dir.resource": &dirResource,
+		"adminifier.host":     &host,
+		"adminifier.root":     &root,
 	} {
 		str, err := conf.GetStr(key)
 		if err != nil {
@@ -44,7 +44,8 @@ func Configure() {
 		*ptr = str
 	}
 
-	dirAdminifier = filepath.FromSlash(dirAdminifier)
+	dirResource = filepath.FromSlash(dirResource)
+	dirAdminifier = filepath.Join(dirResource, "adminifier")
 	root += "/"
 
 	// configure session manager
@@ -53,8 +54,8 @@ func Configure() {
 	sessMgr.Cookie.Path = root
 
 	// setup static files server
-	if err := setupStatic(filepath.Join(dirAdminifier, "adminifier-static")); err != nil {
-		log.Fatal(errors.Wrap(err, "setup adminifier-static"))
+	if err := setupStatic(filepath.Join(dirAdminifier, "static")); err != nil {
+		log.Fatal(errors.Wrap(err, "setup adminifier static"))
 	}
 
 	// create template
@@ -81,7 +82,7 @@ func Configure() {
 }
 
 func setupStatic(staticPath string) error {
-	staticRoot := root + "adminifier-static/"
+	staticRoot := root + "static/"
 	if stat, err := os.Stat(staticPath); err != nil || !stat.IsDir() {
 		if err == nil {
 			err = errors.New("not a directory")

adminifier/adminifier-static/ext/pikaday

@@ -42,7 +42,7 @@ type wikiTemplate struct {
 	Shortcode         string              // wiki shortcode
 	WikiTitle         string              // wiki title
 	Branch            string              // selected branch
-	Static            string              // adminifier-static root
+	Static            string              // static root
 	AdminRoot         string              // adminifier root
 	Root              string              // wiki root
 }
@@ -465,7 +465,7 @@ func getGenericTemplate(wr *wikiRequest) wikiTemplate {
 		Shortcode:         wr.shortcode,
 		WikiTitle:         wr.wi.Title,
 		AdminRoot:         strings.TrimRight(root, "/"),
-		Static:            root + "adminifier-static",
+		Static:            root + "static",
 		Root:              root + wr.shortcode,
 	}
 }

adminifier/adminifier.go

@@ -4,11 +4,9 @@
 /* directories-- */
 
 @repo: .;   /* set this variable to the absolute path of the quiki repository */
-@server.dir.static:     [@repo]/webserver/static;     /* static files that ship with quiki */
-@server.dir.template:   [@repo]/webserver/templates;  /* comma-separated template search paths */
-@server.dir.adminifier: [@repo]/adminifier;           /* static files for adminifier */
-@server.dir.wiki:       [@repo]/wikis;                /* where your site directories are located */
-
+@server.dir.resource:   [@repo]/resources;      /* resource files that ship with quiki */
+@server.dir.template:   [@repo]/resources/webserver/templates; /* comma-separated template search paths */
+@server.dir.wiki:       [@repo]/wikis;          /* where your site directories are located */
 
 /* HTTP server bindings-- */
 

adminifier/wiki.go

@@ -65,12 +65,12 @@ func Configure(confFile string) {
 	}
 
 	// extract strings
-	var dirStatic string
+	var dirResource string
 	for key, ptr := range map[string]*string{
 		"server.http.port":    &Port,
 		"server.http.bind":    &Bind,
 		"server.dir.template": &templateDirs,
-		"server.dir.static":   &dirStatic,
+		"server.dir.resource": &dirResource,
 	} {
 		str, err := Conf.GetStr(key)
 		if err != nil {
@@ -81,7 +81,8 @@ func Configure(confFile string) {
 
 	// normalize paths
 	templateDirs = filepath.FromSlash(templateDirs)
-	dirStatic = filepath.FromSlash(dirStatic)
+	dirResource = filepath.FromSlash(dirResource)
+	dirStatic := filepath.Join(dirResource, "webserver", "static")
 
 	// set up wikis
 	if err = initWikis(); err != nil {