UI enhancements

* Better color scheme for Airship classic. * Fix jQuery UI * Remove SETTINGS.link_prefix in favor of cabin_url() * Use Google Web Fonts (downloaded locally because we're cautious about third-party resources and IP address leaks)
paragonie · Apr 5, 2016 · 7e564b6 · 7e564b6
1 parent b0fccb3
commit 7e564b6
Show file tree

Hide file tree

Showing 93 changed files with 885 additions and 329 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,8 @@
 /.idea/
 /nbproject/
 /files/*
+/src/public/static/Bridge
+/src/public/static/Hull
 /src/public/launch.php
 /src/config/cabins.json
 /src/config/gears.json

diff --git a/composer.lock b/composer.lock
diff --git a/src/Cabin/Bridge/Lens/base.twig b/src/Cabin/Bridge/Lens/base.twig
@@ -4,7 +4,7 @@
         {% include cargo("base_head") %}
         {% block page_css %}{% endblock %}
     {% endblock %}</head>
-    <body>{% block body %}
+    <body cabin="Bridge">{% block body %}
         <div id="site-wrapper">
             <header>{% block header %}
                 {% include cargo("header") %}
@@ -16,21 +16,21 @@
                     {% endblock %}</div>
                     <div id="rightside">
             {% endif %}
-                        <div id="content">{% block content %}
+                        <div id="content">{% block content %}<div id="bridge_content">
                             <div id="bridge_table">
                                 {% if announcement %}<div id="announcement">{{ announcement }}</div>{% endif %}
                                 <div id="bridge_left">
                                     {% include cargo("bridge_menu") %}
                                 </div>
                                 <div id="bridge_main">{% block main %}{% endblock %}</div>
                             </div>
-                        {% endblock %}</div>
+                        </div>{% endblock %}</div>
             {% if showmenu %}
                     </div>
                 </div>
             {% endif %}
         </div>
-        <footer>{% block footer %}
+        <footer id="bridge_footer">{% block footer %}
             {% include cargo("footer") %}
         {% endblock %}</footer>
     {% endblock %}

diff --git a/src/Cabin/Bridge/Lens/cargo/base_head.twig b/src/Cabin/Bridge/Lens/cargo/base_head.twig
@@ -5,7 +5,7 @@
         </title>
         <link rel="stylesheet" href="{{ "/css/font-awesome.min.css"|cachebust }}" type="text/css" />
         <link rel="stylesheet" href="{{ "/css/pure-0.6.0.css"|cachebust }}" type="text/css" />
-        <link rel="stylesheet" href="{{ "/static/Hull/base.css"|cachebust }}" type="text/css" />
+        <link rel="stylesheet" href="{{ "/fonts/fonts.css"|cachebust }}" type="text/css" />
         <link rel="stylesheet" href="{{ "/static/Bridge/base.css"|cachebust }}" type="text/css" />
         {#      #}{% set motifs = user_motif() %}{#
         #}{% for css in motifs.config.css %}

diff --git a/src/Cabin/Bridge/Lens/cargo/bridge_admin_home.twig b/src/Cabin/Bridge/Lens/cargo/bridge_admin_home.twig
@@ -8,29 +8,29 @@
 
 <ul>
     <li>
-        <a href="{{ SETTINGS.link_prefix }}/crew">
+        <a href="{{ cabin_url() }}crew">
             {{ __("Crew") }}
         </a>
         <ul>
             <li>
-                <a href="{{ SETTINGS.link_prefix }}/crew/groups">
+                <a href="{{ cabin_url() }}crew/groups">
                     {{ __("Groups") }}
                 </a>
             </li>
             <li>
-                <a href="{{ SETTINGS.link_prefix }}/crew/permissions">
+                <a href="{{ cabin_url() }}crew/permissions">
                     {{ __("Permissions") }}
                 </a>
             </li>
             <li>
-                <a href="{{ SETTINGS.link_prefix }}/crew/users">
+                <a href="{{ cabin_url() }}crew/users">
                     {{ __("Users") }}
                 </a>
             </li>
         </ul>
     </li>
     <li>
-        <a href="{{ SETTINGS.link_prefix }}/admin/settings">
+        <a href="{{ cabin_url() }}admin/settings">
             {{ __("Airship Settings") }}
         </a>
     </li>

diff --git a/src/Cabin/Bridge/Lens/cargo/bridge_authors_list.twig b/src/Cabin/Bridge/Lens/cargo/bridge_authors_list.twig
@@ -1,10 +1,10 @@
 <div id="bridge_author_header">
-    <a class="pure-button pure-button-secondary" href="{{ SETTINGS.link_prefix }}/author/new">
+    <a class="pure-button pure-button-secondary" href="{{ cabin_url() }}author/new">
         <i class="fa fa-user-plus"></i>
         {{ __("Create a New Author Profile") }}
     </a>
 </div>
-{% set author_base = SETTINGS.link_prefix ~ "/author" %}
+{% set author_base = cabin_url() ~ "/author" %}
 <div class="table" id="bridge_author_list">
     <div class="table-row table-header">
         <div class="table-cell">
@@ -81,22 +81,22 @@
         <div class="table-row">
             <div class="table-cell table-btn-left">
                 <a{#
-                    #} href="{{ SETTINGS.link_prefix }}/author/edit/{{ auth.authorid|e('html_attr') }}"{#
+                    #} href="{{ cabin_url() }}author/edit/{{ auth.authorid|e('html_attr') }}"{#
                     #} class="pure-button pure-button-secondary"{#
                     #} title="{{ __("Edit Author Profile")|e('html_attr') }}"{#
                 #}><i class="fa fa-pencil"></i></a>{#
                 #}<a{#
-                    #} href="{{ SETTINGS.link_prefix }}/author/users/{{ auth.authorid|e('html_attr') }}"{#
+                    #} href="{{ cabin_url() }}author/users/{{ auth.authorid|e('html_attr') }}"{#
                     #} class="pure-button pure-button-primary"{#
                     #} title="{{ __("Manage Members")|e('html_attr') }}"{#
                 #}><i class="fa fa-users"></i></a>{#
                 #}<a{#
-                    #} href="{{ SETTINGS.link_prefix }}/author/photos/{{ auth.authorid|e('html_attr') }}"{#
+                    #} href="{{ cabin_url() }}author/photos/{{ auth.authorid|e('html_attr') }}"{#
                     #} class="pure-button pure-button-secondary"{#
                     #} title="{{ __("Author Photos")|e('html_attr') }}"{#
                 #}><i class="fa fa-photo"></i></a>{#
                 #}<a{#
-                    #} href="{{ SETTINGS.link_prefix }}/author/files/{{ auth.authorid|e('html_attr') }}"{#
+                    #} href="{{ cabin_url() }}author/files/{{ auth.authorid|e('html_attr') }}"{#
                     #} class="pure-button pure-button-primary"{#
                     #} title="{{ __("Author Files")|e('html_attr') }}"{#
                 #}><i class="fa fa-folder-open-o"></i></a>

diff --git a/src/Cabin/Bridge/Lens/cargo/bridge_blog_categories.twig b/src/Cabin/Bridge/Lens/cargo/bridge_blog_categories.twig
@@ -15,7 +15,7 @@
 </div>
 {% if can_create() %}
     <fieldset id="new-category-form">
-        <a class="pure-button pure-button-secondary" href="{{ SETTINGS.link_prefix }}/blog/category/new">
+        <a class="pure-button pure-button-secondary" href="{{ cabin_url() }}blog/category/new">
             <i class="fa fa-folder-open-o"></i>{{ __("New Category") }}
         </a>
     </fieldset>

diff --git a/src/Cabin/Bridge/Lens/cargo/bridge_blog_category_tree.twig b/src/Cabin/Bridge/Lens/cargo/bridge_blog_category_tree.twig
@@ -1,3 +1,3 @@
-{% if can_edit %}<a class="blog_icon" href="{{ SETTINGS.link_prefix }}/blog/category/edit/{{ catdata.categoryid|e('url') }}">{#
+{% if can_edit %}<a class="blog_icon" href="{{ cabin_url() }}blog/category/edit/{{ catdata.categoryid|e('url') }}">{#
     #}<i class="fa fa-pencil" title="Edit Details for {{ catdata.name|e }}"></i>{#
 #}</a>{% endif %}{{ catdata.name|e('html') }}
diff --git a/src/Cabin/Bridge/Lens/cargo/bridge_blog_comments.twig b/src/Cabin/Bridge/Lens/cargo/bridge_blog_comments.twig
@@ -21,7 +21,7 @@
             <div class="table-cell icons-1">
                 <a{#
                 #} title="{{ __("View Comment")|e('html_attr') }}"{#
-                #} href="{{ SETTINGS.link_prefix }}/blog/comments/view/{{ comment.commentid|e('html_attr') }}"{#
+                #} href="{{ cabin_url() }}blog/comments/view/{{ comment.commentid|e('html_attr') }}"{#
             #}>{#
                 #}<i class="fa fa-search"></i>{#
             #}</a>
@@ -34,7 +34,7 @@
                 {% if comment.replyto %}
                     <a{#
                         #} title="{{ __("View Comment")|e('html_attr') }}"{#
-                        #} href="{{ SETTINGS.link_prefix }}/blog/comments/view/{{ comment.replyto|e('html_attr') }}"{#
+                        #} href="{{ cabin_url() }}blog/comments/view/{{ comment.replyto|e('html_attr') }}"{#
                     #}>{#
                         #}#{{ comment.replyto|e('html') }}{#
                     #}</a>

diff --git a/src/Cabin/Bridge/Lens/cargo/bridge_blog_comments_view.twig b/src/Cabin/Bridge/Lens/cargo/bridge_blog_comments_view.twig
@@ -5,7 +5,7 @@
         {% if comment.author %}
             <div class="table-cell">Author:</div>
             <div class="table-cell">{#
-                #}<a href="{{ SETTINGS.link_prefix }}/author/edit/{{ comment.author }}">{#
+                #}<a href="{{ cabin_url() }}author/edit/{{ comment.author }}">{#
                     #}{{ comment.authorname|e('html_attr') }}{#
                 #}</a>{#
             #}</div>
@@ -51,16 +51,16 @@
     <div class="table-row">
         <div class="table-cell">Blog Post:</div>
         <div class="table-cell">
-            <a href="{{ SETTINGS.link_prefix }}/blog/post/edit/{{ comment.blogpost|e('html_attr') }}">{{ comment.blog.title|e('html') }}</a>
+            <a href="{{ cabin_url() }}blog/post/edit/{{ comment.blogpost|e('html_attr') }}">{{ comment.blog.title|e('html') }}</a>
         </div>
     </div>
     {% if comment.replyto %}
         <div class="table-row">
             <div class="table-cell">Reply to:</div>
             <div class="table-cell">
-                <a href="{{ SETTINGS.link_prefix }}/blog/comments/view/{{ comment.replyto|e('html_attr') }}">Comment #{{ comment.replyto|number_format }}</a>
+                <a href="{{ cabin_url() }}blog/comments/view/{{ comment.replyto|e('html_attr') }}">Comment #{{ comment.replyto|number_format }}</a>
                 {% if comment.parent.author %}{#
-                    #}by <a href="{{ SETTINGS.link_prefix }}/author/edit/{{ comment.parent.author }}">{#
+                    #}by <a href="{{ cabin_url() }}author/edit/{{ comment.parent.author }}">{#
                         #}{{ comment.parent.authorname|e('html_attr') }}{#
                     #}</a>{#
                 #}{% elseif comment.parent.metadata.name %}{#
@@ -77,7 +77,7 @@
 </div>
 
 {% if can('publish') %}
-<form method="post">{{ form_token(SETTINGS.link_prefix ~ "/blog/comments/view/" ~ comment.commentid) }}
+<form method="post">{{ form_token(cabin_url() ~ "/blog/comments/view/" ~ comment.commentid) }}
 
     <fieldset class="form-button-group">
         <legend>Administrative Actions</legend>

diff --git a/src/Cabin/Bridge/Lens/cargo/bridge_blog_header.twig b/src/Cabin/Bridge/Lens/cargo/bridge_blog_header.twig
@@ -1,5 +1,5 @@
 {% if can_create() %}
-<a class="pure-button pure-button-secondary" href="{{ SETTINGS.link_prefix }}/blog/post/new">
+<a class="pure-button pure-button-secondary" href="{{ cabin_url() }}blog/post/new">
     <i class="fa fa-pencil-square-o"></i>
     {{ __("Draft a New Blog Post") }}
 </a>

diff --git a/src/Cabin/Bridge/Lens/cargo/bridge_blog_posts.twig b/src/Cabin/Bridge/Lens/cargo/bridge_blog_posts.twig
@@ -25,14 +25,14 @@
             {% if can_edit or post.author in my_author_ids %}
             <a{#
                 #} title="{{ __("Edit Blog Post")|e('html_attr') }}"{#
-                #} href="{{ SETTINGS.link_prefix }}/blog/post/edit/{{ post.postid|e('html_attr') }}"{#
+                #} href="{{ cabin_url() }}blog/post/edit/{{ post.postid|e('html_attr') }}"{#
             #}>{#
                 #}<i class="fa fa-pencil"></i>{#
             #}</a>
             {% endif %}
             <a{#
                 #} title="{{ __("Blog Post Revision History")|e('html_attr') }}"{#
-                #} href="{{ SETTINGS.link_prefix }}/blog/post/history/{{ post.postid|e('html_attr') }}"{#
+                #} href="{{ cabin_url() }}blog/post/history/{{ post.postid|e('html_attr') }}"{#
             #}>{#
                 #}<i class="fa fa-history"></i>{#
             #}</a>
@@ -42,7 +42,7 @@
         </div>
         <div class="table-cell">
             {% if can_update("blog/authors") or post.author in my_author_ids %}
-            <a href="{{ SETTINGS.link_prefix }}/author/edit/{{ post.author|e('html_attr') }}">{{
+            <a href="{{ cabin_url() }}author/edit/{{ post.author|e('html_attr') }}">{{
                 post.authorname|e('html')
             }}</a>
             {% else %}
@@ -51,7 +51,7 @@
         </div>
         <div class="table-cell">
             {% if post.categoryid %}
-            <a href="{{ SETTINGS.link_prefix }}/blog/category/edit/{{ post.categoryid|e('html_attr') }}">{{
+            <a href="{{ cabin_url() }}blog/category/edit/{{ post.categoryid|e('html_attr') }}">{{
                 post.categoryname|e('html')
             }}</a>
             {% else %}

diff --git a/src/Cabin/Bridge/Lens/cargo/bridge_blog_posts_edit.twig b/src/Cabin/Bridge/Lens/cargo/bridge_blog_posts_edit.twig
@@ -1,5 +1,5 @@
 <h3>{{ __("Edit Blog Post") }}</h3>
-<form method="post">{{ form_token( SETTINGS.link_prefix ~ "/blog/post/edit/" ~ blogpost.postid) }}
+<form method="post">{{ form_token( cabin_url() ~ "/blog/post/edit/" ~ blogpost.postid) }}
     <div class="table">
 
         <div class="table-row">

diff --git a/src/Cabin/Bridge/Lens/cargo/bridge_blog_posts_new.twig b/src/Cabin/Bridge/Lens/cargo/bridge_blog_posts_new.twig
@@ -1,5 +1,5 @@
 <h3>{{ __("New Blog Post") }}</h3>
-<form method="post">{{ form_token( SETTINGS.link_prefix ~ "/blog/post/new") }}
+<form method="post">{{ form_token( cabin_url() ~ "/blog/post/new") }}
     <div class="table">
 
         <div class="table-row">
@@ -38,7 +38,7 @@
                             #}{% endif %}>{{ auth.name|e('html') }}</option>
                     {% endfor %}
                 </select>
-                <a href="{{ SETTINGS.link_prefix }}/author/new" target="_blank" title="{{ __("Create an Author Profile")|e('html_attr') }}">{#
+                <a href="{{ cabin_url() }}author/new" target="_blank" title="{{ __("Create an Author Profile")|e('html_attr') }}">{#
                     #}<i class="fa fa-user-plus"></i>{% if not authors %}Create an Author Profile Now{% endif %}{#
                 #}</a>
             </div>

diff --git a/src/Cabin/Bridge/Lens/cargo/bridge_blog_series.twig b/src/Cabin/Bridge/Lens/cargo/bridge_blog_series.twig
@@ -1,5 +1,5 @@
 {% if can_create() %}
-<a href="{{ SETTINGS.link_prefix }}/blog/series/new" class="pure-button pure-button-secondary">
+<a href="{{ cabin_url() }}blog/series/new" class="pure-button pure-button-secondary">
     <i class="fa fa-list-alt"></i>
     {{ __("New Series") }}
 </a>
@@ -22,15 +22,15 @@
     {% for ser in series %}
         <div class="table-row">
             <div class="table-cell table-1-btn-left">
-                <a class="pure-button pure-button-primary" href="{{ SETTINGS.link_prefix }}/blog/series/edit/{{ ser.seriesid }}">{#
+                <a class="pure-button pure-button-primary" href="{{ cabin_url() }}blog/series/edit/{{ ser.seriesid }}">{#
                     #}<i class="fa fa-pencil"></i>{#
                 #}</a>
             </div>
             <div class="table-cell">
                 {{ ser.name|e('html') }}
             </div>
             <div class="table-cell">
-                <a href="{{ SETTINGS.link_prefix }}/author/edit/{{ ser.author_data.authorid|e('html_attr') }}">{#
+                <a href="{{ cabin_url() }}author/edit/{{ ser.author_data.authorid|e('html_attr') }}">{#
                     #}{{ ser.author_data.name|e('html') }}{#
                 #}</a>
             </div>