From cfef74c16938c5f861d94137bd058e7422c17fe6 Mon Sep 17 00:00:00 2001 From: Mirco Nasuti <mirco.nasuti@chuv.ch> Date: Wed, 3 Feb 2016 14:44:45 +0100 Subject: [PATCH] isNewVisitor bahavior added back --- README.md | 4 +--- src/main/resources/static/frontend/app/index.html | 14 +++++++------- .../static/frontend/app/scripts/app/home/home.html | 8 ++++---- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 9fcbbda36..9fee0fd42 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,8 @@ The API documentation is available at `<BASE URL>/swagger-ui.html`. A JSON versi * Fix bugs; * Externalize configuration (DB parameters, security enabled/disabled, ...); -* Decide if an update on a model should affect the articles including it; * Add author's view if needed; -* Implement delete methods if needed; +* Implement delete methods if needed; * Implement logout; * Add introduction page; * Update front-end behavior when not logged in; @@ -28,7 +27,6 @@ The API documentation is available at `<BASE URL>/swagger-ui.html`. A JSON versi ## BUGS * In the profile view, we shouldn't see the '+' between firstname and lastname; -* In the profile view links to own articles and so on, are not implemented; * Export PDF; diff --git a/src/main/resources/static/frontend/app/index.html b/src/main/resources/static/frontend/app/index.html index 2c923ae20..5bdf2a2ca 100644 --- a/src/main/resources/static/frontend/app/index.html +++ b/src/main/resources/static/frontend/app/index.html @@ -48,17 +48,17 @@ <body ng-app="chuvApp" class="ng-cloak" ng-cloak to-top-on-load> <!-- Add your site or application content here --> -<!--<header id="topnav" class="navbar navbar-default navbar-fixed-top fixed" change-on-scroll role="banner" - ng-include="'scripts/app/header/header.html'" ng-controller="HeaderController" ng-show="!isNewVisitor()"></header>--> <header id="topnav" class="navbar navbar-default navbar-fixed-top fixed" change-on-scroll role="banner" - ng-include="'scripts/app/header/header.html'" ng-controller="HeaderController"></header> + ng-include="'scripts/app/header/header.html'" ng-controller="HeaderController" ng-show="!isNewVisitor()"></header> +<!--<header id="topnav" class="navbar navbar-default navbar-fixed-top fixed" change-on-scroll role="banner" + ng-include="'scripts/app/header/header.html'" ng-controller="HeaderController"></header>--> <div id="wrapper"> <div id="layout-static"> <div class="static-content-wrapper"> <div class="static-content"> <div class="page-content" ui-view class="mainview-animation animated"></div> </div> - <footer id="footer" role="contentinfo" ng-cloak> + <!--<footer id="footer" role="contentinfo" ng-cloak> <div class="clearfix container-fluid"> <div class="row"> <ul class="list-unstyled list-inline col-md-6"> @@ -69,8 +69,8 @@ </div> </div> </div> - </footer> - <!--<footer id="footer" role="contentinfo" ng-cloak ng-show="!isNewVisitor()"> + </footer>--> + <footer id="footer" role="contentinfo" ng-cloak ng-show="!isNewVisitor()"> <div class="clearfix container-fluid"> <div class="row"> <ul class="list-unstyled list-inline col-md-6"> @@ -81,7 +81,7 @@ </div> </div> </div> - </footer>--> + </footer> </div> </div> </div> diff --git a/src/main/resources/static/frontend/app/scripts/app/home/home.html b/src/main/resources/static/frontend/app/scripts/app/home/home.html index fa5e9d285..b670df080 100644 --- a/src/main/resources/static/frontend/app/scripts/app/home/home.html +++ b/src/main/resources/static/frontend/app/scripts/app/home/home.html @@ -1,4 +1,4 @@ -<!--<div class="container-fluid intro-container" ng-show="isNewVisitor()"> +<div class="container-fluid intro-container" ng-show="isNewVisitor()"> <a href="" ng-click="closePanel($event)" class="trigger-close-intro"> <i class="ti ti-close"></i> </a> @@ -23,10 +23,10 @@ <a class="trigger-intro" ng-click="animateIntro()"> <i class="ti ti-arrow-down"></i> </a> -</div>--> +</div> -<!--<div class="container-fluid mt" ng-show="!isNewVisitor()">--> -<div class="container-fluid mt"> +<div class="container-fluid mt" ng-show="!isNewVisitor()"> +<!--<div class="container-fluid mt">--> <div class="row"> <div class="col-md-3"> <div class="info-tile tile-orange"> -- GitLab