Merge pull request #873 from aholachek/enhanced

updated bbb message + hide library import for now
adsabs · Apr 1, 2016 · fb4c634 · fb4c634
2 parents 5b2a009 + 0c3f7ba
commit fb4c634
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 14 deletions.
diff --git a/src/404.html b/src/404.html
@@ -52,7 +52,10 @@
 <body>
 
 <div >
-    <img src="styles/img/404.jpg" alt="incredibly cute 404 error image made by Jason Bitterman"/>
+    <img src="styles/img/404.jpg"
+         class="img-responsive"
+         style="margin:auto;"
+         alt="incredibly cute 404 error image made by Jason Bitterman"/>
    <p style="text-align: center">Would you like to <a href="/">go back to the homepage?</a></p>
 </div>
 </body>

diff --git a/src/discovery.config.js b/src/discovery.config.js
@@ -130,7 +130,7 @@ require.config({
 
         IndividualLibraryWidget : 'js/widgets/library_individual/widget',
         AllLibrariesWidget : 'js/widgets/libraries_all/widget',
-        LibraryImport : 'js/widgets/library-import/widget'
+        LibraryImport : 'js/widgets/library_import/widget'
 
       },
       plugins: {}

diff --git a/...emplates/authentication-form-partial.html → ...emplates/authentication-form-partial.html b/...emplates/authentication-form-partial.html → ...emplates/authentication-form-partial.html
diff --git a/...ry-import/templates/import-view-ads2.html → ...ry_import/templates/import-view-ads2.html b/...ry-import/templates/import-view-ads2.html → ...ry_import/templates/import-view-ads2.html
@@ -1,7 +1,7 @@
 
 {{#unless twopointoh_email}}
 
-    {{> js/widgets/library-import/templates/authentication-form-partial}}
+    {{> js/widgets/library_import/templates/authentication-form-partial}}
 
 {{else}}
 
@@ -39,7 +39,7 @@
             Sign into a new ADS 2.0 account
         </button>
     <div class="collapse" id="ads2-form-container">
-        {{> js/widgets/library-import/templates/authentication-form-partial}}
+        {{> js/widgets/library_import/templates/authentication-form-partial}}
     </div>
 
 

diff --git a/...import/templates/import-view-classic.html → ...import/templates/import-view-classic.html b/...import/templates/import-view-classic.html → ...import/templates/import-view-classic.html
@@ -1,5 +1,5 @@
 {{#unless classic_email}}
-    {{> js/widgets/library-import/templates/authentication-form-partial}}
+    {{> js/widgets/library_import/templates/authentication-form-partial}}
 {{else}}
 
 <div>
@@ -35,7 +35,7 @@
         Sign into a new Classic account
     </button>
 <div class="collapse" id="classic-form-container">
-    {{> js/widgets/library-import/templates/authentication-form-partial}}
+    {{> js/widgets/library_import/templates/authentication-form-partial}}
 </div>
 
 

diff --git a/...ry-import/templates/success-template.html → ...ry_import/templates/success-template.html b/...ry-import/templates/success-template.html → ...ry_import/templates/success-template.html
diff --git a/...brary-import/templates/tab-container.html → ...brary_import/templates/tab-container.html b/...brary-import/templates/tab-container.html → ...brary_import/templates/tab-container.html
diff --git a/src/js/widgets/library-import/widget.js → src/js/widgets/library_import/widget.js b/src/js/widgets/library-import/widget.js → src/js/widgets/library_import/widget.js
diff --git a/src/js/wraps/landing_page_manager/landing-page-layout.html b/src/js/wraps/landing_page_manager/landing-page-layout.html
@@ -21,12 +21,14 @@
 
             <div class="s-ads-card">
                 <div class="unobtrusive-landing-page-alert">
-                    <b>
-                        <a href="http://zenodo.org/communities/about/astrothesis/" target="_blank">
-                            <i class="fa fa-graduation-cap"></i>
-                            Learn how to contribute your thesis to the ADS Astronomy Thesis Collection
+                    <i>Reviewers Hate It!</i>
+                            <p style="margin-top:10px">One weird trick to search the ADS will have you writing 3-5 papers a day!</p>
+                        <h4>
+                        <a href="https://adsabs.github.io/ads_enhanced/" target="_blank" style="display: block;margin-top: 8px;">
+                            Introducing ADS Enhanced&reg;
                         </a>
-                    </b></div>
+                        </h4>
+                    </div>
 
                 <div class="search-bar-rows-container s-search-bar-rows-container">
                     <br/>

diff --git a/src/js/wraps/user_settings_page_manager/user-settings-layout.html b/src/js/wraps/user_settings_page_manager/user-settings-layout.html
@@ -13,7 +13,7 @@
     <div class="col-sm-2 nav-container s-nav-container"></div>
 
     <div class="col-sm-10">
-        <div data-widget="LibraryImport"/>
+        <!--<div data-widget="LibraryImport"/>-->
         <div data-widget="UserSettings"/>
         <div data-widget="UserPreferences"/>
     </div>

diff --git a/src/js/wraps/user_settings_page_manager/user_page_manager.js b/src/js/wraps/user_settings_page_manager/user_page_manager.js
@@ -30,7 +30,7 @@ define([
     navConfig : {
       UserPreferences__librarylink : {"title": "Library Link Server", "path":"user/settings/librarylink","category":"preferences" },
       UserPreferences__orcid : {"title": "ORCID Settings", "path":"user/settings/orcid","category":"preferences" },
-      LibraryImport : {"title": "Import Libraries", "path":"user/settings/libraryimport","category":"preferences" },
+      //LibraryImport : {"title": "Import Libraries", "path":"user/settings/libraryimport","category":"preferences" },
 
       UserSettings__email : {"title": "Change Email", "path":"user/settings/email","category":"settings"},
       UserSettings__password : {"title": "Change Password", "path":"user/settings/password","category":"settings"},

diff --git a/test/mocha/js/widgets/library_import_widget.spec.js b/test/mocha/js/widgets/library_import_widget.spec.js
@@ -1,5 +1,5 @@
 define([
-'js/widgets/library-import/widget',
+'js/widgets/library_import/widget',
  'js/bugutils/minimal_pubsub',
 'js/components/api_targets'