Merge branch 'pr/527' into IAU

src/discovery.config.js

@@ -76,6 +76,7 @@ require.config({
         UserNavbarWidget: 'js/widgets/user_navbar/widget',
         AlertsWidget: 'js/widgets/alerts/widget',
         SearchWidget: 'js/widgets/search_bar/search_bar_widget',
+        FormAccordionWidget : 'js/widgets/form_accordion/widget',
         Results: 'js/widgets/results/widget',
         QueryInfo: 'js/widgets/query_info/query_info_widget',
         QueryDebugInfo: 'js/widgets/api_query/widget',

src/js/page_managers/templates/landing-page-layout.html

@@ -13,20 +13,25 @@
     <!-- search bar row -->
     <section class="s-search-bar-row s-landing-section-2 row">
         <div class="col-sm-12"></div>
-            <div class="s-content-container" style="padding-left:30px;">
+            <div class="s-content-container">
 
 
                 <div class="search-bar-rows-container s-search-bar-rows-container">
                     <br/>
                     <br/>
                     <div data-widget="SearchWidget"/>
                     <br/>
+                    <h4 class=" s-light-font" style="text-align:center"> The search bar above uses the concise new <a target="_blank" href="http://adsabs.github.io/help/search/search-syntax/">ADS search syntax</a>.
+                    </h4>
                     <br/>
-                    <br/>
-                    <br/>
-                    <h4 class=" s-light-font" style="text-align:center"> This form uses the powerful new <a target="_blank" href="http://adsabs.github.io/help/search/search-syntax/">ADS search syntax</a>.</h4>
                     <div class="row s-message-control-row" id="message-control-row"><span data-widget="AlertsWidgetx"></span></div>
+                    <br/>
                 </div>
+
+                <div>
+                    <div data-widget="FormAccordionWidget"/>
+                </div>
+
         </div>
 
     </section>

src/js/widgets/form_accordion/templates/author_form.html

@@ -0,0 +1,28 @@
+<form action="">
+
+
+    <div class="form-group author-group">
+        <span> Author Name (last, first)</span>
+        <span class="pull-right"> first author? </span>
+        <div class="author-entry">
+            <input class="form-control author-input" type="text"/>
+            <input class="first-author" type="checkbox"/>
+        </div>
+
+        <button class="btn btn-default add-author" type="button"><i class="fa fa-lg fa-plus"></i> author</button>
+        <div class="button-div">
+            <button class="btn btn-primary author-submit" disabled="true" type="submit"><i class="fa fa-search"></i> Search</button>
+            <button class="btn clear"><fa class="fa fa-times"></fa> Clear</button>
+        </div>
+    </div>
+
+    <div class="author-entry-template hidden">
+        <div class="author-entry">
+            <span class="and">and </span>
+            <input class="form-control author-input" type="text"/>
+            <input class="first-author" type="checkbox"/>
+        </div>
+    </div>
+
+
+</form>

src/js/widgets/form_accordion/templates/form_container.html

@@ -0,0 +1,35 @@
+<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
+    <div class="panel panel-default">
+        <div class="panel-heading collapsed" role="tab" id="headingOne" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="false" aria-controls="collapseOne">
+            <h4 class="panel-title">
+                <span class="s-light-font"> <i class="toggle-icon"></i> Search for an </span> author
+            </h4>
+        </div>
+        <div id="collapseOne" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+            <div class="panel-body author-form">
+            </div>
+        </div>
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading collapsed" role="tab" id="headingTwo"  role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
+            <h4 class="panel-title">
+                    <span class="s-light-font"> <i class="toggle-icon"></i> Search for a </span> paper
+            </h4>
+        </div>
+        <div id="collapseTwo" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTwo">
+            <div class="panel-body paper-form">
+            </div>
+        </div>
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading collapsed" role="tab" id="headingThree"  role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
+            <h4 class="panel-title">
+                <span class="s-light-font"> <i class="toggle-icon"></i> Search for a </span>Topic
+            </h4>
+        </div>
+        <div id="collapseThree" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree">
+            <div class="panel-body topic-form">
+            </div>
+        </div>
+    </div>
+</div>

src/js/widgets/form_accordion/templates/paper_form.html

@@ -0,0 +1,46 @@
+<div class="parse-container">
+    Paste an <a href="http://aas.org/authors/aas-journal-reference-instructions" target="_blank">AAS-style</a> journal article reference here and we will try to parse it into the form below
+    <div class="input-group">
+        <input class="form-control parse-reference"/>
+              <span class="input-group-btn">
+                    <button type="button" class="btn btn-info parse">Parse</button>
+      </span>
+   </div>
+</div>
+
+<form>
+    <div class="form-group">
+
+        <label for="pub-input">Publication </label>
+        <button class="btn btn-link" type="button" data-toggle="collapse" data-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample">
+          <span class="s-light-font">type publication name to find bibstem  <i class="fa fa-question-circle"/></span>
+        </button>
+        <div class="collapse" id="collapseExample">
+            <div class="well">
+                A bibstem is an abbreviation that the ADS uses to identify a journal.
+                <a href="http://adsabs.harvard.edu/abs_doc/journals1.html#">A full list is available here.</a>
+                The input field below will autocomplete on the 500 most popular journal names, allowing you to type
+                "Astrophysical Journal", for instance, to find the bibstem "AJ".
+            </div>
+        </div>
+        <input type="text" class="form-control" id="pub-input" data-term="bibstem" placeholder="e.g Astrophysical Journal">
+    </div>
+    <div class="form-group">
+        <label for="year-input">Year</label>
+        <input type="text" class="form-control" id="year-input" data-term="year">
+    </div>
+    <div class="form-group">
+        <label for="volume-input">Volume</label>
+        <input type="text" class="form-control" id="volume-input" data-term="volume">
+    </div>
+    <div class="form-group">
+        <label for="page-input">Page</label>
+        <input type="text" class="form-control" id="page-input" data-term = "page">
+    </div>
+    <div class="form-group">
+        <div class="button-div">
+            <button class="btn btn-primary author-submit" disabled="true" type="submit"><i class="fa fa-search"></i> Search</button>
+            <button class="btn clear"><fa class="fa fa-times"></fa> Clear</button>
+        </div>
+    </div>
+</form>

src/js/widgets/form_accordion/templates/topic_form.html

@@ -0,0 +1,8 @@
+<form  class="form-horizontal">
+        <label for="topic-search" class="sr-only control-label">Topic</label>
+        <input class="form-control" id="topic-search" placeholder="e.g. neutron star">
+
+    <div class="button-div">
+        <button class="btn btn-primary author-submit" type="submit" disabled="true"><i class="fa fa-search"></i> Search</button>
+    </div>
+</form>