From 32bc4b0c698e331c3e16499d008bd2e353ebed4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim@ascribe.io>
Date: Tue, 8 Dec 2015 16:43:45 +0100
Subject: [PATCH] Add custom styling for PR

---
 js/components/header.js                       |  7 ---
 .../components/pr_routes/pr_proxy_handler.js  |  2 +-
 .../prize/portfolioreview/pr_app.js           |  2 +-
 .../whitelabel/prize/prize_routes.js          |  7 +--
 .../components/prize_piece_list.js            |  7 +--
 .../portfolioreview_custom_style.scss         | 55 ++++++++++++++++++-
 6 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/js/components/header.js b/js/components/header.js
index 6ca96433..285a1ed2 100644
--- a/js/components/header.js
+++ b/js/components/header.js
@@ -37,16 +37,9 @@ import { constructHead } from '../utils/dom_utils';
 
 let Header = React.createClass({
     propTypes: {
-        showAddWork: React.PropTypes.bool,
         routes: React.PropTypes.arrayOf(React.PropTypes.object)
     },
 
-    getDefaultProps() {
-        return {
-            showAddWork: true
-        };
-    },
-
     getInitialState() {
         return mergeOptions(
             WhitelabelStore.getState(),
diff --git a/js/components/whitelabel/prize/portfolioreview/components/pr_routes/pr_proxy_handler.js b/js/components/whitelabel/prize/portfolioreview/components/pr_routes/pr_proxy_handler.js
index edaa6663..af2283bb 100644
--- a/js/components/whitelabel/prize/portfolioreview/components/pr_routes/pr_proxy_handler.js
+++ b/js/components/whitelabel/prize/portfolioreview/components/pr_routes/pr_proxy_handler.js
@@ -13,7 +13,7 @@ export function AuthPrizeRoleRedirect({ to, when }) {
 
     return function(currentUser, query) {
         const exprToValidate = when
-            .map((role) => currentUser[role])
+            .map(role => currentUser[role])
             .reduce((a, b) => a || b);
 
         if(exprToValidate) {
diff --git a/js/components/whitelabel/prize/portfolioreview/pr_app.js b/js/components/whitelabel/prize/portfolioreview/pr_app.js
index cb40adb9..ef85bfd5 100644
--- a/js/components/whitelabel/prize/portfolioreview/pr_app.js
+++ b/js/components/whitelabel/prize/portfolioreview/pr_app.js
@@ -52,7 +52,7 @@ let PRApp = React.createClass({
             header = <Hero />;
             style = { paddingTop: '0 !important' };
         } else if(currentUser && (currentUser.is_admin || currentUser.is_jury || currentUser.is_judge)) {
-            header = <Header routes={routes} showAddWork={false} />;
+            header = <Header routes={routes} />;
         } else {
             style = { paddingTop: '0 !important' };
         }
diff --git a/js/components/whitelabel/prize/prize_routes.js b/js/components/whitelabel/prize/prize_routes.js
index 896939ee..2608d46e 100644
--- a/js/components/whitelabel/prize/prize_routes.js
+++ b/js/components/whitelabel/prize/prize_routes.js
@@ -61,15 +61,14 @@ const ROUTES = {
     ),
     portfolioreview: (
         <Route path='/' component={PRApp}>
-            <IndexRoute component={PRLanding} />
+        <IndexRoute component={ProxyHandler(AuthPrizeRoleRedirect({ to: '/collection', when: ['is_admin', 'is_judge', 'is_jury'] }))(PRLanding)} />
             <Route
                 path='register_piece'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(PRRegisterPiece)}
-                headerTitle='+ NEW WORK'/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(PRRegisterPiece)}/>
             <Route
                 path='collection'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPPieceList)}
-                headerTitle='COLLECTION'/>
+                headerTitle='SUBMISSIONS'/>
             <Route
                 path='login'
                 component={ProxyHandler(
diff --git a/js/components/whitelabel/prize/simple_prize/components/prize_piece_list.js b/js/components/whitelabel/prize/simple_prize/components/prize_piece_list.js
index 8e602012..972b3fac 100644
--- a/js/components/whitelabel/prize/simple_prize/components/prize_piece_list.js
+++ b/js/components/whitelabel/prize/simple_prize/components/prize_piece_list.js
@@ -48,7 +48,9 @@ let PrizePieceList = React.createClass({
     },
 
     getButtonSubmit() {
-        if (this.state.prize && this.state.prize.active && !this.state.currentUser.is_jury){
+        const { currentUser } = this.state;
+        if (this.state.prize && this.state.prize.active &&
+            !currentUser.is_jury && !currentUser.is_admin && !currentUser.is_judge){
             return (
                 <LinkContainer to="/register_piece">
                     <Button>
@@ -57,9 +59,6 @@ let PrizePieceList = React.createClass({
                 </LinkContainer>
             );
         }
-        else if (this.state.prize && this.state.currentUser.is_judge){
-            return null;
-        }
         return null;
     },
 
diff --git a/sass/whitelabel/prize/portfolioreview/portfolioreview_custom_style.scss b/sass/whitelabel/prize/portfolioreview/portfolioreview_custom_style.scss
index 5b4dd559..7e19cd71 100644
--- a/sass/whitelabel/prize/portfolioreview/portfolioreview_custom_style.scss
+++ b/sass/whitelabel/prize/portfolioreview/portfolioreview_custom_style.scss
@@ -22,10 +22,59 @@ $pr--button-color: $pr--nav-fg-prim-color;
         }
     }
 
+    .navbar-default {
+        .navbar-nav > .ascribe-powered-by, li > a {
+            color: $pr--button-color !important;
+        }
+
+        .active a {
+            border-bottom-color: $pr--button-color !important;
+            color: $pr--button-color !important;
+        }
+    }
+
+    .search-bar > .form-group > .input-group input {
+        &::-webkit-input-placeholder {
+            color: rgba($pr--button-color, 0.5);
+        }
+        &::-moz-placeholder {
+            color: rgba($pr--button-color, 0.5);
+        }
+        &:-ms-input-placeholder {
+            color: rgba($pr--button-color, 0.5);
+        }
+        &:-moz-placeholder {
+            color: rgba($pr--button-color, 0.5);
+        }
+    }
+
+    .icon-ascribe-search {
+        color: $pr--button-color;
+    }
+
+    // filter widget
+    .ascribe-piece-list-toolbar-filter-widget button {
+        background-color: transparent !important;
+        border-color: transparent !important;
+        color: $pr--button-color !important;
+
+        &:hover,
+        &:active {
+            background-color: $pr--button-color !important;
+            border-color: $pr--button-color !important;
+            color: white !important;
+        }
+    }
+
     .ascribe-property {
-        > p > span:not(> .span),
-        > textarea,
-        > input {
+        > div,
+        > input,
+        > pre,
+        > select,
+        > span:not(.glyphicon),
+        > p,
+        > p > span,
+        > textarea {
             color: $pr--nav-fg-prim-color;
         }
     }