From 1bff20d8368d02bda3931bc11d74c72ac3702857 Mon Sep 17 00:00:00 2001 From: Eike Cochu <eike@cochu.com> Date: Mon, 20 Jun 2016 16:58:52 +0200 Subject: [PATCH] updated child views, nginx configuration --- docker/nginx.conf | 2 +- vipra-ui/app/html/about.html | 4 ++-- vipra-ui/app/html/articles/index.html | 4 ++-- vipra-ui/app/html/articles/show.html | 4 ++-- vipra-ui/app/html/entities/articles.html | 4 ++-- vipra-ui/app/html/entities/index.html | 4 ++-- vipra-ui/app/html/entities/show.html | 4 ++-- vipra-ui/app/html/error.html | 1 + vipra-ui/app/html/index.html | 4 ++-- vipra-ui/app/html/network.html | 4 ++-- vipra-ui/app/html/topics/articles.html | 4 ++-- vipra-ui/app/html/topics/index.html | 4 ++-- vipra-ui/app/html/topics/sequences.html | 7 +++---- vipra-ui/app/html/topics/show.html | 5 ++--- vipra-ui/app/html/words/articles.html | 4 ++-- vipra-ui/app/html/words/index.html | 4 ++-- vipra-ui/app/html/words/show.html | 4 ++-- vipra-ui/app/html/words/topics.html | 4 ++-- 18 files changed, 35 insertions(+), 36 deletions(-) diff --git a/docker/nginx.conf b/docker/nginx.conf index 264192ae..7afda51d 100644 --- a/docker/nginx.conf +++ b/docker/nginx.conf @@ -26,7 +26,7 @@ http { gzip_proxied any; gzip_comp_level 6; gzip_buffers 16 8k; - gzip_http_version 1.1; + gzip_http_version 1.0; gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/rss+xml text/javascript image/svg+xml application/vnd.ms-fontobject application/x-font-ttf font/opentype; server { diff --git a/vipra-ui/app/html/about.html b/vipra-ui/app/html/about.html index 72c510d4..a9e793ec 100644 --- a/vipra-ui/app/html/about.html +++ b/vipra-ui/app/html/about.html @@ -1,3 +1,4 @@ +<div ng-cloak ui-view></div> <div class="container" ng-cloak ng-hide="state.name !== 'about'"> <div class="row"> <div class="col-md-12"> @@ -321,5 +322,4 @@ </table> </div> </div> -</div> -<div ng-cloak ui-view></div> +</div> \ No newline at end of file diff --git a/vipra-ui/app/html/articles/index.html b/vipra-ui/app/html/articles/index.html index 91193ff1..24518891 100644 --- a/vipra-ui/app/html/articles/index.html +++ b/vipra-ui/app/html/articles/index.html @@ -1,3 +1,4 @@ +<div ng-cloak ui-view></div> <div ng-cloak ng-hide="!rootModels.topicModel || state.name !== 'articles'"> <div class="container"> <div class="row"> @@ -90,5 +91,4 @@ </div> </div> </div> -</div> -<div ng-cloak ui-view></div> +</div> \ No newline at end of file diff --git a/vipra-ui/app/html/articles/show.html b/vipra-ui/app/html/articles/show.html index 7840ea92..c6173ced 100644 --- a/vipra-ui/app/html/articles/show.html +++ b/vipra-ui/app/html/articles/show.html @@ -1,3 +1,4 @@ +<div ng-cloak ui-view></div> <div class="container" ng-cloak ng-hide="!rootModels.topicModel || state.name !== 'articles.show'"> <div class="page-header no-border"> <span class="label label-default">Article</span> @@ -180,5 +181,4 @@ </div> <div class="loading" ng-hide="article">Loading...</div> </div> -</div> -<div ng-cloak ui-view></div> +</div> \ No newline at end of file diff --git a/vipra-ui/app/html/entities/articles.html b/vipra-ui/app/html/entities/articles.html index ad851271..5b872312 100644 --- a/vipra-ui/app/html/entities/articles.html +++ b/vipra-ui/app/html/entities/articles.html @@ -1,3 +1,4 @@ +<div ng-cloak ui-view></div> <div class="container" ng-cloak ng-hide="!rootModels.topicModel || state.name !== 'entities.show.articles'"> <div class="page-header no-border"> <span class="label label-default">Entity</span> @@ -63,5 +64,4 @@ </div> </div> </div> -</div> -<div ng-cloak ui-view></div> \ No newline at end of file +</div> \ No newline at end of file diff --git a/vipra-ui/app/html/entities/index.html b/vipra-ui/app/html/entities/index.html index d15346a1..8cc34a7f 100644 --- a/vipra-ui/app/html/entities/index.html +++ b/vipra-ui/app/html/entities/index.html @@ -1,3 +1,4 @@ +<div ng-cloak ui-view></div> <div ng-cloak ng-hide="!rootModels.topicModel || state.name !== 'entities'"> <div class="container"> <div class="row"> @@ -72,5 +73,4 @@ </div> </div> </div> -</div> -<div ng-cloak ui-view></div> +</div> \ No newline at end of file diff --git a/vipra-ui/app/html/entities/show.html b/vipra-ui/app/html/entities/show.html index f0b43c45..137258bd 100644 --- a/vipra-ui/app/html/entities/show.html +++ b/vipra-ui/app/html/entities/show.html @@ -1,3 +1,4 @@ +<div ng-cloak ui-view></div> <div class="container" ng-cloak ng-hide="!rootModels.topicModel || state.name !== 'entities.show'"> <div class="page-header no-border"> <span class="label label-default">Entity</span> @@ -46,5 +47,4 @@ </div> <div class="loading" ng-hide="entity">Loading...</div> </div> -</div> -<div ng-cloak ui-view></div> \ No newline at end of file +</div> \ No newline at end of file diff --git a/vipra-ui/app/html/error.html b/vipra-ui/app/html/error.html index 2e2c189d..430914b1 100644 --- a/vipra-ui/app/html/error.html +++ b/vipra-ui/app/html/error.html @@ -1,3 +1,4 @@ +<div ng-cloak ui-view></div> <div class="container" ng-cloak ng-hide="state.name !== 'error'"> <div class="row"> <div class="col-md-3"> diff --git a/vipra-ui/app/html/index.html b/vipra-ui/app/html/index.html index 136e6421..ba7ee29f 100644 --- a/vipra-ui/app/html/index.html +++ b/vipra-ui/app/html/index.html @@ -1,3 +1,4 @@ +<div ng-cloak ui-view></div> <div class="fullsize" ng-cloak ng-hide="!rootModels.topicModel || state.name !== 'index'"> <div class="title-band" ng-class="{slim:search}"> <div class="container"> @@ -92,5 +93,4 @@ </div> </div> </div> -</div> -<div ng-cloak ui-view></div> \ No newline at end of file +</div> \ No newline at end of file diff --git a/vipra-ui/app/html/network.html b/vipra-ui/app/html/network.html index c72ba8a4..dced0693 100644 --- a/vipra-ui/app/html/network.html +++ b/vipra-ui/app/html/network.html @@ -1,3 +1,4 @@ +<div ng-cloak ui-view></div> <div ng-cloak ng-hide="!rootModels.topicModel || state.name !== 'network'"> <div class="fullsize navpadding"> <div class="graph-item top-left small overlay" ng-class="{collapsed:legendCollapsed}"> @@ -74,5 +75,4 @@ </div> <div class="fullsize" id="visgraph"></div> </div> -</div> -<div ng-cloak ui-view></div> +</div> \ No newline at end of file diff --git a/vipra-ui/app/html/topics/articles.html b/vipra-ui/app/html/topics/articles.html index 26d722b9..24c8c059 100644 --- a/vipra-ui/app/html/topics/articles.html +++ b/vipra-ui/app/html/topics/articles.html @@ -1,3 +1,4 @@ +<div ng-cloak ui-view></div> <div class="container" ng-cloak ng-hide="!rootModels.topicModel || state.name !== 'topics.show.articles'"> <div class="page-header no-border"> <span class="label label-default">Topic</span> @@ -66,5 +67,4 @@ </div> </div> </div> -</div> -<div ng-cloak ui-view></div> \ No newline at end of file +</div> \ No newline at end of file diff --git a/vipra-ui/app/html/topics/index.html b/vipra-ui/app/html/topics/index.html index 4653d18e..aa50877e 100644 --- a/vipra-ui/app/html/topics/index.html +++ b/vipra-ui/app/html/topics/index.html @@ -1,3 +1,4 @@ +<div ng-cloak ui-view></div> <div ng-cloak ng-hide="!rootModels.topicModel || state.name !== 'topics'"> <div class="container"> <div class="row"> @@ -74,5 +75,4 @@ </div> </div> </div> -</div> -<div ng-cloak ui-view></div> +</div> \ No newline at end of file diff --git a/vipra-ui/app/html/topics/sequences.html b/vipra-ui/app/html/topics/sequences.html index 8a60b070..ab4a698b 100644 --- a/vipra-ui/app/html/topics/sequences.html +++ b/vipra-ui/app/html/topics/sequences.html @@ -1,4 +1,5 @@ -<div class="container topic-show" ng-cloak ng-hide="!rootModels.topicModel || state.name !== 'topics.show.sequences'"> +<div ng-cloak ui-view></div> +<div class="container" ng-cloak ng-hide="!rootModels.topicModel || state.name !== 'topics.show.sequences'"> <div class="page-header no-border"> <span class="label label-default">Topic</span> <h1 ng-bind="::topic.name"></h1> @@ -108,6 +109,4 @@ </div> <div class="loading" ng-hide="topic">Loading...</div> </div> -</div> - -<div ng-cloak ui-view></div> +</div> \ No newline at end of file diff --git a/vipra-ui/app/html/topics/show.html b/vipra-ui/app/html/topics/show.html index 8b2ed46b..55f475a7 100644 --- a/vipra-ui/app/html/topics/show.html +++ b/vipra-ui/app/html/topics/show.html @@ -1,3 +1,4 @@ +<div ng-cloak ui-view></div> <div class="container topic-show" ng-cloak ng-hide="!rootModels.topicModel || state.name !== 'topics.show'"> <div class="page-header no-border"> <span class="label label-default">Topic</span> @@ -71,6 +72,4 @@ </div> <div class="loading" ng-hide="topic">Loading...</div> </div> -</div> - -<div ng-cloak ui-view></div> +</div> \ No newline at end of file diff --git a/vipra-ui/app/html/words/articles.html b/vipra-ui/app/html/words/articles.html index fa3e7a21..23f7abef 100644 --- a/vipra-ui/app/html/words/articles.html +++ b/vipra-ui/app/html/words/articles.html @@ -1,3 +1,4 @@ +<div ng-cloak ui-view></div> <div class="container" ng-cloak ng-hide="!rootModels.topicModel || state.name !== 'words.show.articles'"> <div class="page-header no-border"> <span class="label label-default">Word</span> @@ -65,5 +66,4 @@ </div> </div> </div> -</div> -<div ng-cloak ui-view></div> \ No newline at end of file +</div> \ No newline at end of file diff --git a/vipra-ui/app/html/words/index.html b/vipra-ui/app/html/words/index.html index 0fbe33ed..8f3cb8d7 100644 --- a/vipra-ui/app/html/words/index.html +++ b/vipra-ui/app/html/words/index.html @@ -1,3 +1,4 @@ +<div ng-cloak ui-view></div> <div ng-cloak ng-hide="!rootModels.topicModel || state.name !== 'words'"> <div class="container"> <div class="row"> @@ -72,5 +73,4 @@ </div> </div> </div> -</div> -<div ng-cloak ui-view></div> +</div> \ No newline at end of file diff --git a/vipra-ui/app/html/words/show.html b/vipra-ui/app/html/words/show.html index 26f957f0..413315ed 100644 --- a/vipra-ui/app/html/words/show.html +++ b/vipra-ui/app/html/words/show.html @@ -1,3 +1,4 @@ +<div ng-cloak ui-view></div> <div class="container" ng-cloak ng-hide="!rootModels.topicModel || state.name !== 'words.show'"> <div class="page-header no-border"> <span class="label label-default">Word</span> @@ -34,5 +35,4 @@ </div> <div class="loading" ng-hide="word">Loading...</div> </div> -</div> -<div ng-cloak ui-view></div> \ No newline at end of file +</div> \ No newline at end of file diff --git a/vipra-ui/app/html/words/topics.html b/vipra-ui/app/html/words/topics.html index 69482210..26b6adf1 100644 --- a/vipra-ui/app/html/words/topics.html +++ b/vipra-ui/app/html/words/topics.html @@ -1,3 +1,4 @@ +<div ng-cloak ui-view></div> <div class="container" ng-cloak ng-hide="!rootModels.topicModel || state.name !== 'words.show.topics'"> <div class="page-header no-border"> <span class="label label-default">Word</span> @@ -64,5 +65,4 @@ </div> </div> </div> -</div> -<div ng-cloak ui-view></div> \ No newline at end of file +</div> \ No newline at end of file -- GitLab