Fix up generation of URLs with prefix.

paradoxxxzero · Aug 23, 2018 · db3d37f · db3d37f
1 parent 611f2e3
commit db3d37f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/butterfly/__init__.py b/butterfly/__init__.py
@@ -32,7 +32,7 @@ def __init__(self, url):
 
     def __call__(self, cls):
         if tornado.options.options.uri_root_path:
-            url = tornado.options.options.uri_root_path.rstrip('/') + self.url
+            url = '/' + tornado.options.options.uri_root_path.strip('/') + self.url
         else:
             url = self.url
         application.add_handlers(
@@ -78,7 +78,7 @@ def get_theme_dir(self, theme):
         template_path=os.path.join(os.path.dirname(__file__), "templates"),
         debug=tornado.options.options.debug,
         static_url_prefix='%s/static/' % (
-            '/%s' % tornado.options.options.uri_root_path
+            '/%s' % tornado.options.options.uri_root_path.strip('/')
             if tornado.options.options.uri_root_path else '')
     )
 

diff --git a/butterfly/static/main.css b/butterfly/static/main.css
@@ -70,37 +70,37 @@
 /* along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 @font-face {
   font-family: "SourceCodePro";
-  src: url("/static/fonts/SourceCodePro-ExtraLight.otf") format("woff");
+  src: url("fonts/SourceCodePro-ExtraLight.otf") format("woff");
   font-weight: 100; }
 
 @font-face {
   font-family: "SourceCodePro";
-  src: url("/static/fonts/SourceCodePro-Light.otf") format("woff");
+  src: url("fonts/SourceCodePro-Light.otf") format("woff");
   font-weight: 300; }
 
 @font-face {
   font-family: "SourceCodePro";
-  src: url("/static/fonts/SourceCodePro-Regular.otf") format("woff");
+  src: url("fonts/SourceCodePro-Regular.otf") format("woff");
   font-weight: 400; }
 
 @font-face {
   font-family: "SourceCodePro";
-  src: url("/static/fonts/SourceCodePro-Medium.otf") format("woff");
+  src: url("fonts/SourceCodePro-Medium.otf") format("woff");
   font-weight: 500; }
 
 @font-face {
   font-family: "SourceCodePro";
-  src: url("/static/fonts/SourceCodePro-Semibold.otf") format("woff");
+  src: url("fonts/SourceCodePro-Semibold.otf") format("woff");
   font-weight: 600; }
 
 @font-face {
   font-family: "SourceCodePro";
-  src: url("/static/fonts/SourceCodePro-Bold.otf") format("woff");
+  src: url("fonts/SourceCodePro-Bold.otf") format("woff");
   font-weight: 700; }
 
 @font-face {
   font-family: "SourceCodePro";
-  src: url("/static/fonts/SourceCodePro-Black.otf") format("woff");
+  src: url("fonts/SourceCodePro-Black.otf") format("woff");
   font-weight: 900; }
 
 body {

diff --git a/butterfly/static/main.js b/butterfly/static/main.js
diff --git a/butterfly/static/main.min.js b/butterfly/static/main.min.js