Merge branch 'hotfix/0.108.2'

CenterForOpenScience · May 30, 2017 · f355f8a · f355f8a
2 parents 08d0974 + 79ab503
commit f355f8a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/app/templates/components/error-page.hbs b/app/templates/components/error-page.hbs
@@ -13,14 +13,11 @@
                     {{supportEmail}}
                 </a>
             </p>
-            {{#link-to
-                (route-prefix 'index')
-                slug=theme.id
-                class="btn btn-primary m-t-md"
-                invokeAction=(action "click" "link" (concat label " - Go to Index"))
-            }}
+            <a class="btn btn-primary m-t-md" href='{{theme.pathPrefix}}'
+               onclick={{action 'click' 'link' (concat label " - Go to Index")}}
+            >
                 {{t 'components.error-page.go_to' brand=(t (if theme.isProvider "global.provider_brand" "global.brand") name=theme.provider.name)}}
-            {{/link-to}}
+            </a>
         </div>
     </div>
 </div>
diff --git a/app/templates/components/preprint-navbar-branded.hbs b/app/templates/components/preprint-navbar-branded.hbs
@@ -5,18 +5,20 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
         </button>
-        {{#link-to (route-prefix 'index') slug=theme.id class="navbar-brand" invokeAction=(action "click" "link" "Navbar - Brand")~}}
+        <a class="navbar-brand" href='{{theme.pathPrefix}}'
+           onclick={{action "click" "link" "Navbar - Brand"}}
+        >
             <span class="navbar-image"></span>
             <span class="navbar-title">{{model.name}} {{t "global.preprints"}}</span>
-        {{~/link-to}}
+        </a>
     </div>
     <div id="preprint-navbar-links" class="navbar-collapse collapse navbar-right">
         <ul class="nav navbar-nav branded-nav">
             {{#if session.isAuthenticated}}
                 <li><a href="{{host}}myprojects/" class="" onbeforeclick={{action "click" "link" "Navbar - My OSF Projects"}}>{{t "components.preprint-navbar-branded.my_projects"}}</a></li>
             {{/if}}
             <li><a href={{concat theme.pathPrefix 'submit'}} onbeforeclick={{action "click" "link" "Navbar - Add preprint"}}>{{t "global.add_preprint"}}</a></li>
-            <li>{{#link-to (route-prefix 'discover') slug=theme.id class="" invokeAction=(action "click" "link" "Navbar - Search")}}{{t "global.search"}}{{/link-to}}</li>
+            <li><a class="" href='{{theme.pathPrefix}}discover' onclick={{action "click" "link" "Navbar - Search"}}>{{t "global.search"}}</a></li>
             {{navbar-auth-dropdown
                 signupUrl=theme.signupUrl
                 loginAction=(action 'login')