Design: minor tweaks

hsk81 · May 16, 2014 · 0e1fa75 · 0e1fa75
1 parent 01c127b
commit 0e1fa75
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 21 deletions.
diff --git a/webed/static/webed-ext/app/statusbar/StatusBar.js b/webed/static/webed-ext/app/statusbar/StatusBar.js
@@ -18,7 +18,7 @@ Ext.define ('Webed.statusbar.StatusBar', {
         xtype: 'webed-statusbar-zoomslider'
     }],
 
-    defaultText: 'NoTex',
+    defaultText: 'NoTex.ch',
     hidden: true
 });
 

diff --git a/webed/templates/index-in.html b/webed/templates/index-in.html
@@ -10,7 +10,7 @@
 {% if title -%}
 <title>{{ title }}</title>
 {%- else -%}
-<title>NoTex - A browser based text editor</title>
+<title>NoTex.ch - An online text editor</title>
 {%- endif %}
 
 <link rel="shortcut icon"
@@ -26,7 +26,11 @@
 
 {% if debug -%}
 <link rel="stylesheet" type="text/css"
-      href="{{ url_for('static', filename='webed-ext/resources/theme/menu.css') }}" />
+      href="{{ url_for('static', filename='lib/bootstrap/css/bootstrap.css') }}" />
+<link rel="stylesheet" type="text/css"
+      href="{{ url_for('static', filename='lib/codemirror/lib/codemirror.css') }}" />
+<link rel="stylesheet" type="text/css"
+      href="{{ url_for('static', filename='lib/codemirror/addon/dialog/dialog.css') }}" />
 <link rel="stylesheet" type="text/css"
       href="{{ url_for('static', filename='webed-ext/resources/theme/webed.css') }}" />
 <link rel="stylesheet" type="text/css"
@@ -41,10 +45,6 @@
       href="{{ url_for('static', filename='webed-ext/resources/theme/sprite-tbar.css') }}" />
 <link rel="stylesheet" type="text/css"
       href="{{ url_for('static', filename='webed-ext/resources/theme/sprite-flag.css') }}" />
-<link rel="stylesheet" type="text/css"
-      href="{{ url_for('static', filename='lib/codemirror/lib/codemirror.css') }}" />
-<link rel="stylesheet" type="text/css"
-      href="{{ url_for('static', filename='lib/codemirror/addon/dialog/dialog.css') }}" />
 <link rel="stylesheet" type="text/css"
       href="{{ url_for('static', filename='webed-ext/resources/theme/app-%s.css' % theme) }}" />
 {% else -%}
@@ -65,6 +65,8 @@
 </div>
 
 {% if debug -%}
+<script type="text/javascript"
+        src="{{ url_for('static', filename='lib/bootstrap/js/bootstrap.js') }}"></script>
 <script type="text/javascript"
         src="{{ url_for('static', filename='lib/node-uuid/uuid.js') }}"></script>
 <script type="text/javascript"
@@ -122,7 +124,5 @@
 {%- endif %}
 
 <script type="text/javascript">{% include 'js/codemirror.js' %}</script>
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
 </body>
 </html>
diff --git a/webed/templates/index.html b/webed/templates/index.html
@@ -10,15 +10,13 @@
 {% if title -%}
 <title>{{ title }}</title>
 {%- else -%}
-<title>NoTex - A browser based text editor</title>
+<title>NoTex.ch - An online text editor</title>
 {%- endif %}
 
 <link rel="shortcut icon"
       href="{{ url_for('static', filename='ico/favicon.ico') }}">
 <link rel="canonical"
       href="{{ canonical }}">
-<link rel="stylesheet"
-      href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
 
 {% if debug -%}
 <script type="text/javascript">var _gaq = undefined;</script>
@@ -27,6 +25,12 @@
 {%- endif %}
 
 {% if debug -%}
+<link rel="stylesheet" type="text/css"
+      href="{{ url_for('static', filename='lib/bootstrap/css/bootstrap.css') }}" />
+<link rel="stylesheet" type="text/css"
+      href="{{ url_for('static', filename='lib/codemirror/lib/codemirror.css') }}" />
+<link rel="stylesheet" type="text/css"
+      href="{{ url_for('static', filename='lib/codemirror/addon/dialog/dialog.css') }}" />
 <link rel="stylesheet" type="text/css"
       href="{{ url_for('static', filename='webed-ext/resources/theme/webed.css') }}" />
 <link rel="stylesheet" type="text/css"
@@ -41,10 +45,6 @@
       href="{{ url_for('static', filename='webed-ext/resources/theme/sprite-tbar.css') }}" />
 <link rel="stylesheet" type="text/css"
       href="{{ url_for('static', filename='webed-ext/resources/theme/sprite-flag.css') }}" />
-<link rel="stylesheet" type="text/css"
-      href="{{ url_for('static', filename='lib/codemirror/lib/codemirror.css') }}" />
-<link rel="stylesheet" type="text/css"
-      href="{{ url_for('static', filename='lib/codemirror/addon/dialog/dialog.css') }}" />
 <link rel="stylesheet" type="text/css"
       href="{{ url_for('static', filename='webed-ext/resources/theme/app-%s.css' % theme) }}" />
 {% else -%}
@@ -65,6 +65,8 @@
 </div>
 
 {% if debug -%}
+<script type="text/javascript"
+        src="{{ url_for('static', filename='lib/bootstrap/js/bootstrap.js') }}"></script>
 <script type="text/javascript"
         src="{{ url_for('static', filename='lib/node-uuid/uuid.js') }}"></script>
 <script type="text/javascript"
@@ -116,6 +118,5 @@
 {%- endif %}
 
 <script type="text/javascript">{% include 'js/codemirror.js' %}</script>
-<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
 </body>
 </html>
diff --git a/webed/templates/page/page-home.html b/webed/templates/page/page-home.html
@@ -2,7 +2,7 @@
     <div class="jumbotron" style="width: 768px; margin: 0 auto;">
         <h1 class="title">NѻTeξ</h1>
         <p style="text-align: justify;">
-            An online text editor, v2.1: It supports reStructuredText, Markdown,
+            An online text editor, v2.2: It supports reStructuredText, Markdown,
             LaTex and more! Export projects as PDFs, HTML pages or LaTex scripts.
         </p>
 

diff --git a/webed/templates/page/page.html b/webed/templates/page/page.html
@@ -1,7 +1,7 @@
 <div id="page-wrap">
 <div id="page-wrap-content">
 
-    <div class="container" style="width: 90%; max-width: 896px;">
+    <div class="container" style="width: 90%; max-width: 896px; font-size: small;">
         <div class="navbar navbar-default" role="navigation" style="margin: 24px 0;">
             <div class="container-fluid">
                 <div class="navbar-header">

diff --git a/webed/views/page.py b/webed/views/page.py
@@ -134,8 +134,8 @@ def get_title (page):
     lookup = {
         'home':
             """
-            NoTex - An online text editor for reStructuredText, Markdown, LaTex
-            and more!
+            NoTex.ch - An online text editor for reStructuredText, Markdown,
+            LaTex and more!
             """,
         'overview':
             """