From f8660e416c1a77a68c38d4259e7caac6817ab91b Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Mon, 20 Jun 2016 15:34:07 -0400
Subject: [PATCH] Removed the Advanced Options feature from Dataverse Listing
 Widget section of the Dataverse Theme + Widgets pg. [ref #3171]

---
 src/main/java/Bundle.properties               |  2 --
 src/main/webapp/themeAndWidgetsFragment.xhtml | 33 +------------------
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
index ba2e4b16dfa..8a310f95d1d 100755
--- a/src/main/java/Bundle.properties
+++ b/src/main/java/Bundle.properties
@@ -496,8 +496,6 @@ dataverse.widgets.notPublished.how.tip1=To use widgets, your dataverse and datas
 dataverse.widgets.notPublished.how.tip2=After publishing, code will be available on this page for you to copy and add to your personal or project website.
 dataverse.widgets.notPublished.how.tip3=Do you have an OpenScholar website? If so, learn more about adding the Dataverse widgets to your website <a href="{0}/{1}/user/dataverse-management.html#adding-widgets-to-an-openscholar-website" title="Adding Widgets to an OpenScholar Website - Dataverse User Guide" target="_blank">here</a>.
 dataverse.widgets.notPublished.getStarted=To get started, publish your dataverse. To learn more about Widgets, visit the <a href="{0}/{1}/user/dataverse-management.html#theme-widgets" title="Theme + Widgets - Dataverse User Guide" target="_blank">Theme + Widgets</a> section of the User Guide.
-dataverse.widgets.editAdvanced=Edit Advanced Options
-dataverse.widgets.editAdvanced.tip=<strong>Advanced Options</strong> &#150; Additional options for configuring your widget on your personal or project website.
 dataverse.widgets.tip=Copy and paste this code into the HTML on your site. To learn more about Widgets, visit the <a href="{0}/{1}/user/dataverse-management.html#theme-widgets" title="Theme + Widgets - Dataverse User Guide" target="_blank">Theme + Widgets</a> section of the User Guide.
 dataverse.widgets.searchBox.txt=Dataverse Search Box
 dataverse.widgets.searchBox.tip=Add a way for visitors on your website to be able to search Dataverse.
diff --git a/src/main/webapp/themeAndWidgetsFragment.xhtml b/src/main/webapp/themeAndWidgetsFragment.xhtml
index 883ebd661f2..8fb2bb08c3f 100644
--- a/src/main/webapp/themeAndWidgetsFragment.xhtml
+++ b/src/main/webapp/themeAndWidgetsFragment.xhtml
@@ -237,42 +237,11 @@
                     <div>
                         <textarea rows="3" cols="54" class="form-control">&lt;script src=&quot;#{systemConfig.dataverseSiteUrl}/resources/js/widgets.js?alias=#{themeWidgetFragment.editDv.alias}&amp;amp;dvUrl=#{systemConfig.dataverseSiteUrl}&amp;amp;widgetScope=#{themeWidgetFragment.editDv.alias}&amp;amp;widget=iframe&amp;amp;heightPx=500&quot;&gt;&lt;/script&gt;</textarea>
                     </div>
-                    <div class="alert alert-info margin-top">
-                        <p><h:outputText value="#{bundle['dataverse.widgets.editAdvanced.tip']}" escape="false"/></p>
-                        <p:commandButton class="btn btn-default margin-top-half" id="editAdvanced" value="#{bundle['dataverse.widgets.editAdvanced']}" onclick="PF('advancedOptions').show();" />
-                    </div>
                     <div class="button-block">
                         <p:commandButton class="btn btn-default" action="#{themeWidgetFragment.cancel()}" immediate="true" id="widgetsDone" value="#{bundle.done}"/>
                     </div>
                 </ui:fragment>
             </p:tab>
         </p:tabView>
-    <p:remoteCommand name="saveRedirectUrl" process="@this" update=":#{p:component('messagePanel')}, :themeWidgetsForm, @([id$=Messages]), advancedOptions" actionListener="#{themeWidgetFragment.save()}"/>
-    <p:dialog styleClass="smallPopUp" id="advancedOptions" widgetVar="advancedOptions" modal="true" header="#{bundle['dataverse.widgets.advanced.popup.header']}">
-        <div class="form-horizontal">
-            <div>
-                <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['dataverse.widgets.advanced.prompt']}</p>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-4 control-label" for="personalUrl">
-                    #{bundle['dataverse.widgets.advanced.url.label']}
-                </label>
-                <div class="col-sm-8">
-                    <p:inputText id="personalUrl"  
-                                 styleClass="form-control" value="#{themeWidgetFragment.editDv.citationRedirectURL}"
-                                 />
-                    <p:watermark for="personalUrl" value="#{bundle['dataverse.widgets.advanced.url.watermark']}" id="watermarkURL" />
-                    <p:message id="personalUrlMessages" for="personalUrl" display="text"/>
-                </div>
-            </div>
-            <div class="button-block">
-                <p:commandButton class="btn btn-default" value="#{bundle.saveChanges}"
-                               update=":#{p:component('messagePanel')}, personalUrlMessages" oncomplete="if (args &amp;&amp; !args.validationFailed) PF('advancedOptions').hide();" actionListener="#{themeWidgetFragment.saveAdvanced()}">
-                </p:commandButton>
-                <p:commandButton class="btn btn-default" onclick="PF('advancedOptions').hide();" immediate="true" update=":#{p:component('messagePanel')}" id="advancedDone" value="#{bundle.cancel}">
-                    <p:ajax update="themeWidgetsForm:advancedOptions" resetValues="true" />
-                </p:commandButton>
-            </div>
-        </div>
-    </p:dialog>
+    <p:remoteCommand name="saveRedirectUrl" process="@this" update=":#{p:component('messagePanel')}, :themeWidgetsForm, @([id$=Messages])" actionListener="#{themeWidgetFragment.save()}"/>
 </ui:composition>
\ No newline at end of file