CenterForOpenScience · chrisseto · Aug 14, 2017 · Aug 18, 2017 · Aug 21, 2017 · Aug 24, 2017
diff --git a/addon/adapters/review-log.js b/addon/adapters/review-log.js
@@ -0,0 +1,6 @@
+import OsfAdapter from './osf-adapter';
+import config from 'ember-get-config';
+
+export default OsfAdapter.extend({
+    namespace: `${config.OSF.apiNamespace}/reviews`,
+});
diff --git a/addon/components/file-widget/style.css b/addon/components/file-widget/style.css
diff --git a/addon/components/file-widget/style.scss b/addon/components/file-widget/style.scss
@@ -0,0 +1,17 @@
+.eosf-file-widget-box {
+  border: 2px solid dark-grey;
+  border-radius: 5px;
+  background-color: #EEE;
+  padding: 20px;
+
+  .dropzone-box {
+    margin: 5px;
+  }
+
+  .login-button, .select-project-button {
+    width: 100%;
+    height: 150px;
+    margin: 5px;
+    text-align: center;
+  }
+}
diff --git a/addon/components/new-navbar-auth-dropdown/template.hbs b/addon/components/new-navbar-auth-dropdown/template.hbs
@@ -1,29 +1,37 @@
 {{# if session.isAuthenticated }}
     {{! TODO: Replace display name functionality if possible- for now truncate via CSS at end of label }}
-    <button class="dropdown-toggle nav-user-dropdown btn-link" data-toggle="dropdown" role="button" aria-expanded="false" aria-label={{t 'eosf.authDropdown.toggleAuthDropdown'}} {{action closeOtherNavigation}}>
-        <span class="osf-gravatar">
-            <img src="{{gravatarUrl}}" alt="User gravatar">
-        </span> {{get-display-name user.fullName}}
-        <span class="caret"></span>
-    </button>
-    <ul class="dropdown-menu auth-dropdown" role="menu">
-        {{#if headline}}
-            <li style="margin-left:10%;">{{headline}}</li>
-        {{/if}}
-        <li>
-            <a href="{{serviceLinks.profile}}" onclick={{action 'click' 'link' 'Navbar - MyProfile'}}><i class="fa fa-user fa-lg p-r-xs"></i> {{t 'eosf.authDropdown.myProfile'}}</a>
-        </li>
-        <li>
-            <a href="{{serviceLinks.osfSupport}}" onclick={{action 'click' 'link' 'Navbar - Support'}}><i class="fa fa-life-ring fa-lg p-r-xs"></i> {{t 'eosf.authDropdown.osfSupport'}}</a>
-        </li>
+    {{#bs-dropdown as |dd|}}
+        {{#dd.toggle tagName="button" classNames="nav-user-dropdown btn-link"}}
+            <span class="osf-gravatar">
+                <img src="{{gravatarUrl}}" alt="User gravatar">
+            </span> {{get-display-name user.fullName}}
+            <span class="caret"></span>
+        {{/dd.toggle}}
 
-        <li>
-            <a href="{{serviceLinks.settings}}" onclick={{action 'click' 'link' 'Navbar - Settings'}}><i class="fa fa-cog fa-lg p-r-xs"></i> {{t 'eosf.authDropdown.settings'}}</a>
-        </li>
-        <li>
-            <a class="logoutLink" {{action 'logout'}} onclick={{action 'click' 'link' 'Navbar - Logout'}} role="button"><i class="fa fa-sign-out fa-lg p-r-xs"></i> {{t 'eosf.authDropdown.logOut'}}</a>
-        </li>
-    </ul>
+        {{#dd.menu align="right" as |menu|}}
+            {{#if headline}}
+                {{#menu.item style="margin-left:10%;"}}
+                    {{headline}}
+                {{/menu.item}}
+            {{/if}}
+
+            {{#menu.item}}
+                <a href="{{serviceLinks.profile}}" onclick={{action 'click' 'link' 'Navbar - MyProfile'}}><i class="fa fa-user fa-lg p-r-xs"></i> {{t 'eosf.authDropdown.myProfile'}}</a>
+            {{/menu.item}}
+
+            {{#menu.item}}
+                <a href="{{serviceLinks.osfSupport}}" onclick={{action 'click' 'link' 'Navbar - Support'}}><i class="fa fa-life-ring fa-lg p-r-xs"></i> {{t 'eosf.authDropdown.osfSupport'}}</a>
+            {{/menu.item}}
+
+            {{#menu.item}}
+                <a href="{{serviceLinks.settings}}" onclick={{action 'click' 'link' 'Navbar - Settings'}}><i class="fa fa-cog fa-lg p-r-xs"></i> {{t 'eosf.authDropdown.settings'}}</a>
+            {{/menu.item}}
+
+            {{#menu.item}}
+                <a class="logoutLink" {{action 'logout'}} onclick={{action 'click' 'link' 'Navbar - Logout'}} role="button"><i class="fa fa-sign-out fa-lg p-r-xs"></i> {{t 'eosf.authDropdown.logOut'}}</a>
+            {{/menu.item}}
+        {{/dd.menu}}
+    {{/bs-dropdown}}
 {{else if allowLogin}}
     {{#if institution}}
         {{! TODO: How does the page know whether this is an institution view? Implement in the future }}

diff --git a/addon/components/new-osf-navbar/style.scss b/addon/components/new-osf-navbar/style.scss
@@ -0,0 +1,8 @@
+@import 'bootstrap/variables';
+
+
+@media (min-width: $screen-md-min) {
+  .navbar-right-md {
+    float: right;
+  }
+}
diff --git a/addon/components/new-osf-navbar/template.hbs b/addon/components/new-osf-navbar/template.hbs
@@ -1,81 +1,79 @@
 <div class="osf-nav-wrapper">
-    <nav class="navbar navbar-inverse navbar-fixed-top" id="navbarScope" role="navigation">
-        <div class="container">
-            <div class="navbar-header">
-                {{!TOGGLE NAVIGATION BUTTON - XS SCREEN}}
-                <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#secondary-navigation" {{action 'closeSearch'}} aria-label={{t 'eosf.navbar.toggleSecondary'}}>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                </button>
-                {{!OSF BRAND}}
-                <a class="navbar-brand" href="/" aria-label={{t 'eosf.navbar.goHome'}}>
-                    <span class="osf-navbar-logo"></span>
+    {{#bs-navbar id='navbarScope' type='inverse' position='fixed-top' fluid=false as |navbar|}}
+        <div class="navbar-header">
+            {{navbar.toggle type='inverse'}}
+            {{!OSF BRAND}}
+            <a class="navbar-brand" href="/" aria-label={{t 'eosf.navbar.goHome'}}>
+                <span class="osf-navbar-logo"></span>
+            </a>
+
+            {{!NAME OF CURRENT SERVICE - HOME, PREPRINTS, REGISTRIES, or MEETINGS}}
+            <div class="service-name">
+                <a href="{{currentServiceLink}}">
+                    <span class="hidden-xs"> OSF </span>
+                    <span class="current-service"><strong>{{currentService}}</strong></span>
                 </a>
+            </div>
 
-                {{!NAME OF CURRENT SERVICE - HOME, PREPRINTS, REGISTRIES, or MEETINGS}}
-                <div class="service-name">
-                    <a href="{{currentServiceLink}}">
-                        <span class="hidden-xs"> OSF </span>
-                        <span class="current-service"><strong>{{currentService}}</strong></span>
-                    </a>
-                </div>
+            {{!PRIMARY NAVIGATION - TOGGLE BETWEEN HOME, PREPRINTS, REGISTRIES, and MEETINGS}}
+            {{#bs-dropdown tagName="div" classNames="dropdown primary-nav" as |dd|}}
+                {{#dd.toggle tagName="button" classNames="btn-link"}}
+                    <span class="fa fa-caret-down fa-2x"></span>
+                {{/dd.toggle}}
 
-                {{!PRIMARY NAVIGATION - TOGGLE BETWEEN HOME, PREPRINTS, REGISTRIES, and MEETINGS}}
-                <div class="dropdown primary-nav">
-                    <button class="dropdown-toggle btn-link" data-toggle="dropdown" role="button" aria-expanded="false" aria-label={{t 'eosf.navbar.togglePrimary'}} {{action 'closeSecondaryAndSearch'}} {{action 'click' 'button' 'Navbar - Dropdown Arrow'}}>
-                        <span class="fa fa-caret-down fa-2x"></span>
-                    </button>
-                    <ul class="dropdown-menu service-dropdown" role="menu">
-                        {{#each osfServices as |service|}}
-                            <li><a href="{{service.url}}" onclick={{action 'click' 'link' (concat 'Navbar - ' service.name)}}>OSF<b>{{service.name}}</b></a></li>
-                        {{/each}}
-                    </ul>
-                </div>
-            </div>
-            <div class="navbar-collapse collapse navbar-right" id="secondary-navigation">
-                <ul class="nav navbar-nav">
-                    {{!SECONDARY NAVIGATION - displays corresponding links for selected service}}
-                    {{#each (build-secondary-nav-links currentService) as |navLink|}}
-                        {{#if (and (eq currentService 'HOME') (eq navLink.type "search"))}}
-                            <li>
-                                {{!TOGGLE SEARCH BUTTON FOR HOME SERVICE}}
-                                <button class="btn-link search-toggle" {{action 'toggleSearch'}} {{action 'click' 'button' (concat 'Navbar - ' currentService navLink.name)}}>
+                {{#dd.menu align="right" as |menu|}}
+                    {{#each osfServices as |service|}}
+                        {{#menu.item}}
+                            <a href="{{service.url}}" onclick={{action 'click' 'link' (concat 'Navbar - ' service.name)}}>OSF<b>{{service.name}}</b></a>
+                        {{/menu.item}}
+                    {{/each}}
+                {{/dd.menu}}
+            {{/bs-dropdown}}
+        </div>
+
+        {{#navbar.content classNames='navbar-right-md'}}
+            {{#navbar.nav as |nav|}}
+                {{#each (build-secondary-nav-links currentService) as |navLink|}}
+                    {{#if (and (eq currentService 'HOME') (eq navLink.type "search"))}}
+                        {{#nav.item}}
+                            {{!TOGGLE SEARCH BUTTON FOR HOME SERVICE}}
+                            <button class="btn-link search-toggle" {{action 'toggleSearch'}} {{action 'click' 'button' (concat 'Navbar - ' currentService navLink.name)}}>
+                                {{t navLink.name}}
+                            </button>
+                        {{/nav.item}}
+                    {{else}}
+                        {{!SERVICE LINK}}
+                        {{#if (eq navLink.type 'donateToCOS')}}
+                            {{#nav.item classNames="navbar-donate-button"}}
+                                <a href="{{navLink.href}}" onclick={{action 'click' 'link' (concat 'Navbar - ' navLink.name)}}>
                                     {{t navLink.name}}
-                                </button>
-                            </li>
+                                </a>
+                            {{/nav.item}}
                         {{else}}
-                            {{!SERVICE LINK}}
-                            {{#if (eq navLink.type 'donateToCOS')}}
-                                <li class="navbar-donate-button">
-                                    <a href="{{navLink.href}}" onclick={{action 'click' 'link' (concat 'Navbar - ' navLink.name)}}>
-                                        {{t navLink.name}}
-                                    </a>
-                                </li>
-                            {{else}}
-                                <li>
-                                    <a href="{{navLink.href}}" onclick={{action 'click' 'link' (concat 'Navbar - ' navlink.name)}}>
-                                        {{#if (eq navLink.type 'addAPreprint')}}
-                                            <span class="hidden-xs hidden-sm">
-                                                {{t navLink.name}}
-                                            </span>
-                                            <span class="hidden-md hidden-lg hidden-xl">
-                                                {{t 'eosf.navbar.add'}}
-                                            </span>
-                                        {{else}}
+                            {{#nav.item}}
+                                <a href="{{navLink.href}}" onclick={{action 'click' 'link' (concat 'Navbar - ' navlink.name)}}>
+                                    {{#if (eq navLink.type 'addAPreprint')}}
+                                        <span class="hidden-xs hidden-sm">
                                             {{t navLink.name}}
-                                        {{/if}}
-                                    </a>
-                                </li>
-                            {{/if}}
+                                        </span>
+                                        <span class="hidden-md hidden-lg hidden-xl">
+                                            {{t 'eosf.navbar.add'}}
+                                        </span>
+                                    {{else}}
+                                        {{t navLink.name}}
+                                    {{/if}}
+                                </a>
+                            {{/nav.item}}
                         {{/if}}
-                    {{/each}}
-                    {{!AUTH NAVBAR}}
+                    {{/if}}
+                {{/each}}
+                {{#nav.item}}
                     {{new-navbar-auth-dropdown signupUrl=signupUrl loginAction=loginAction closeOtherNavigation=(action 'closeSearch')}}
-                </ul>
-            </div>
-        </div>
-    </nav>
+                {{/nav.item}}
+            {{/navbar.nav}}
+        {{/navbar.content}}
+    {{/bs-navbar}}
+
     {{#if showSearch}}
         {{!SEARCH DROPDOWN (FOR HOME SERVICE) - redirects to /search/?q=search_query}}
         {{search-dropdown action='toggleSearch'}}

diff --git a/addon/components/search-dropdown/template.hbs b/addon/components/search-dropdown/template.hbs
@@ -21,11 +21,11 @@
 
 {{!Search help modal - appears after clicking question mark on green search dropdown}}
 <div id="ember-bootstrap-modal-container">
-    {{#bs-modal open=isOpen body=false header=false footer=false}}
-        {{#bs-modal-header}}
+    {{#bs-modal open=isOpen as |modal|}}
+        {{#modal.header}}
             <h3 class="modal-title">{{t 'eosf.searchHelpModal.searchHelp'}}</h3>
-        {{/bs-modal-header}}
-        {{#bs-modal-body}}
+        {{/modal.header}}
+        {{#modal.body}}
             <h4> {{t 'eosf.searchHelpModal.queries'}} </h4>
             <p>
                 {{t 'eosf.searchHelpModal.searchUsesThe'}} <a href="http://extensions.xwiki.org/xwiki/bin/view/Extension/Search+Application+Query+Syntax">Lucene {{t 'eosf.searchHelpModal.searchSyntax'}}</a>.
@@ -36,13 +36,9 @@
                 <li><a href="{{host}}search/?q=brian+AND+title%3Amany">brian AND title:many</a></li>
                 <li><a href="{{host}}search/?q=tags%3A%28psychology%29">tags:(psychology)</a></li>
             </ul>
-        {{/bs-modal-body}}
-
-        {{#bs-modal-footer}}
-            <div align="right">
-                <button {{action 'close'}} class="btn btn-default"> {{t 'eosf.searchHelpModal.close'}} </button>
-            </div>
-        {{/bs-modal-footer}}
+        {{/modal.body}}
+        {{#modal.footer}}
+            {{#bs-button onClick=(action modal.close)}}{{t 'eosf.searchHelpModal.close'}}{{/bs-button}}
+        {{/modal.footer}}
     {{/bs-modal}}
-
-</div>
+</div>
diff --git a/addon/components/search-help-modal/component.js b/addon/components/search-help-modal/component.js
@@ -19,9 +19,6 @@ export default Ember.Component.extend({
         this.set('currentPath', `${window.location.origin}${window.location.pathname}`);
     },
     actions: {
-        close() {
-            this.set('isOpen', false);
-        },
         toggleHelpModal() {
             this.toggleProperty('isOpen');
         },

diff --git a/addon/components/search-help-modal/template.hbs b/addon/components/search-help-modal/template.hbs
@@ -1,10 +1,10 @@
 {{!Lucene search help modal}}
 <div id="ember-bootstrap-modal-container">
-    {{#bs-modal open=isOpen body=false header=false footer=false}}
-        {{#bs-modal-header}}
+    {{#bs-modal open=isOpen as |modal|}}
+        {{#modal.header}}
             <h3 class="modal-title">{{t 'eosf.components.searchHelpModal.searchHelp'}}</h3>
-        {{/bs-modal-header}}
-        {{#bs-modal-body}}
+        {{/modal.header}}
+        {{#modal.body}}
             <h4> {{t 'eosf.components.searchHelpModal.queries'}} </h4>
             <p>
                 {{t 'eosf.components.searchHelpModal.searchUsesThe'}} <a href="http://extensions.xwiki.org/xwiki/bin/view/Extension/Search+Application+Query+Syntax">Lucene {{t 'eosf.components.searchHelpModal.searchSyntax'}}</a>.
@@ -15,11 +15,9 @@
                 <li><a href={{concat currentPath '?q=brian+AND+title%3Amany'}}>brian AND title:many</a></li>
                 <li><a href={{concat currentPath '?q=tags%3A%28psychology%29'}}>tags:(psychology)</a></li>
             </ul>
-        {{/bs-modal-body}}
-        {{#bs-modal-footer}}
-            <div align="right">
-                <button {{action 'close'}} class="btn btn-default"> {{t 'eosf.components.searchHelpModal.close'}} </button>
-            </div>
-        {{/bs-modal-footer}}
+        {{/modal.body}}
+        {{#modal.footer}}
+            {{#bs-button onClick=(action modal.close)}}{{t 'eosf.components.searchHelpModal.close'}}{{/bs-button}}
+        {{/modal.footer}}
     {{/bs-modal}}
-</div>
+</div>
diff --git a/addon/components/sign-up/style.css → addon/components/sign-up/style.scss b/addon/components/sign-up/style.css → addon/components/sign-up/style.scss