Kaynağa Gözat

Include static file in main ui

oz123 10 yıl önce
ebeveyn
işleme
6a0bc20fbb

+ 3 - 1
MANIFEST.in

@@ -2,5 +2,7 @@ include ChangeLog
 include documentation/*
 include documentation/man_page/*
 include pwman/ui/templates/*
-include pwman/ui/templates/static/*
+include pwman/ui/templates/static/css/*
+include pwman/ui/templates/static/js/*
+include pwman/ui/templates/static/js/modernizr/*
 include requirements.txt

+ 15 - 7
pwman/ui/templates/base.tpl

@@ -1,11 +1,19 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 
-"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html>
-<head>
-  <title>Pwman Web</title>
-  </head>
+<!DOCTYPE html>
+<!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
+<!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
+<!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>Pwman3 Web</title>
+        <meta name="description" content="">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="stylesheet" href="static/css/normalize.min.css">
+        <link rel="stylesheet" href="static/css/main.css">
+        <script src="static/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js"></script>
+    </head>
 <body>
   {{!base}}
-
 </body>
 </html>

+ 2 - 3
pwman/ui/templates/static/index.html

@@ -9,9 +9,8 @@
         <title></title>
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <link rel="stylesheet" href="css/normalize.min.css">
-        <link rel="stylesheet" href="css/main.css">
+        <link rel="stylesheet" href="static/css/normalize.min.css">
+        <link rel="stylesheet" href="static/css/main.css">
 
         <script src="js/vendor/modernizr-2.6.2-respond-1.1.0.min.js"></script>
     </head>

+ 2 - 0
scripts/webui.py

@@ -144,10 +144,12 @@ def listnodes(apply=['require_login']):
                                                              'ui/templates')])
     return html_nodes
 
+
 @route('/static/<filepath:path>')
 def server_static(filepath):
     return static_file(filepath, root=statics)
 
+
 if __name__ == '__main__':
     OSX = False
     args = parser_options().parse_args()