Cleaned up layout of various buttons, popups and text in Manage Datas…

…et Guestbook and Guestbook Responses pgs. [ref #3609]
IQSS · Aug 14, 2017 · e3588d3 · e3588d3
1 parent 39fa4d5
commit e3588d3
Show file tree

Hide file tree

Showing 4 changed files with 143 additions and 103 deletions.
diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
@@ -1057,7 +1057,8 @@ dataset.manageGuestbooks.tab.action.btn.copy=Copy
 dataset.manageGuestbooks.tab.action.btn.enable=Enable
 dataset.manageGuestbooks.tab.action.btn.disable=Disable
 dataset.manageGuestbooks.tab.action.btn.edit=Edit
-dataset.manageGuestbooks.tab.action.btn.viewCollectedData=View Collected Data
+dataset.manageGuestbooks.tab.action.btn.preview=Preview
+dataset.manageGuestbooks.tab.action.btn.viewCollectedData=Responses
 dataset.manageGuestbooks.tab.action.btn.delete=Delete
 dataset.manageGuestbooks.tab.action.btn.delete.dialog.header=Delete Guestbook
 dataset.manageGuestbooks.tab.action.btn.delete.dialog.tip=Are you sure you want to delete this guestbook? You cannot undelete a guestbook.
@@ -1076,20 +1077,22 @@ dataset.manageGuestbooks.message.enableSuccess=The guestbook has been enabled.
 dataset.manageGuestbooks.message.enableFailure=The guestbook could not be enabled.
 dataset.manageGuestbooks.message.disableSuccess=The guestbook has been disabled.
 dataset.manageGuestbooks.message.disableFailure=The guestbook could not be disabled.
-dataset.manageGuestbooks.tip.title=Manage Guestbooks
-dataset.manageGuestbooks.tip.downloadascsv=Click \"Donwload All Responses\" to download all the collected guestbook responses for this dataverse, as a CSV file. If you are interested in selecting the responses for specific datasets, files, users etc., we recommend importing this CSV file into Excel, Google Sheets or similar software.
+dataset.manageGuestbooks.tip.title=Manage Dataset Guestbooks
+dataset.manageGuestbooks.tip.downloadascsv=Click \"Download All Responses\" to download all the collected guestbook responses for this dataverse, as a CSV file. If you are interested in selecting the responses for specific datasets, files, users etc., we recommend importing this CSV file into Excel, Google Sheets or similar software.
 dataset.guestbooksResponses.dataset=Dataset
 dataset.guestbooksResponses.date=Date
 dataset.guestbooksResponses.type=Type
 dataset.guestbooksResponses.file=File
-dataset.guestbooksResponses.tip.title=Collected Guestbook Responses
-dataset.guestbooksResponses.tip.downloadascsv=Click \"Donwload Responses\" to download all the collected responses for this guestbook, as a CSV file. If you are interested in selecting the responses for specific datasets, files, users etc., we recommend importing this CSV file into Excel, Google Sheets or similar software.
+dataset.guestbooksResponses.tip.title=Guestbook Responses
+dataset.guestbooksResponses.count.responses={0} {0, choice, 0#Responses|1#Response|2#Responses}
+dataset.guestbooksResponses.count.toofresults={0} to {1} of {2} {2, choice, 0#Responses|1#Response|2#Responses}
+dataset.guestbooksResponses.tip.downloadascsv=Click \"Download Responses\" to download all the collected responses for this guestbook, as a CSV file. If you are interested in selecting the responses for specific datasets, files, users etc., we recommend importing this CSV file into Excel, Google Sheets or similar software.
 dataset.guestbooksResponses.tooManyResponses.header=Please note: This guestbook has too many responses to display on the page. 
 dataset.guestbooksResponses.tooManyResponses.message.1=Only the last {0} responses are shown below.
 dataset.guestbooksResponses.tooManyResponses.message.2=Click \"Download Responses\" to download all the collected responses ({0} total) as a CSV file.
 
 # guestbook-responses.xhtml
-dataset.guestbookResponses.pageTitle=View Guestbook Responses
+dataset.guestbookResponses.pageTitle=Guestbook Responses
 
 # guestbook.xhtml
 
@@ -1098,10 +1101,9 @@ dataset.manageGuestbooks.guestbook.name.tip=Enter a unique name for this Guestbo
 dataset.manageGuestbooks.guestbook.dataCollected=Data Collected
 dataset.manageGuestbooks.guestbook.dataCollected.description=Dataverse account information that will be collected when a user downloads a file. Check the ones that will be required.
 dataset.manageGuestbooks.guestbook.customQuestions=Custom Questions
-dataset.manageGuestbooks.guestbook.requiredCustomQuestions=Required Custom Questions
-dataset.manageGuestbooks.guestbook.optionalCustomQuestions=Optional Custom Questions
-dataset.manageGuestbooks.guestbook.requiredAccountInformation=Required Account Information
-dataset.manageGuestbooks.guestbook.optionalAccountInformation=Optional Account Information
+dataset.manageGuestbooks.guestbook.accountInformation=Account Information
+dataset.manageGuestbooks.guestbook.required=(Required)
+dataset.manageGuestbooks.guestbook.optional=(Optional)
 dataset.manageGuestbooks.guestbook.customQuestions.description=Create your own questions to have users provide more than their account information when they download a file. Questions can be required or optional and answers can be text or multiple choice.
 dataset.manageGuestbooks.guestbook.customQuestions.questionType=Question Type
 dataset.manageGuestbooks.guestbook.customQuestions.questionText=Question Text

diff --git a/src/main/webapp/guestbook-responses.xhtml b/src/main/webapp/guestbook-responses.xhtml
@@ -23,21 +23,40 @@
 
             <ui:define name="body">
                 <h:form id="manageGuestbooksForm">
-                        <div class="form-group clearfix">
-                            <label for="guestbookNameStatic" class="col-sm-2 control-label">
-                                <span>#{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.datasetGuestbook']}</span>
-                            </label>
-                            <div class="col-sm-9">
-                                #{guestbookResponsesPage.guestbook.name}
+                    <div class="row">
+                        <label for="guestbookNameStatic" class="col-sm-2 control-label">
+                            <span>#{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.datasetGuestbook']}</span>
+                        </label>
+                        <div class="col-sm-9">
+                            #{guestbookResponsesPage.guestbook.name}
+                        </div>
+                    </div>
+                    <div class="row" id="resultsCountPaginatorBlock">
+                        <div class="col-xs-6">
+                            <!-- number of results -->
+                            <div class="results-count margin-top">
+                                <h:outputFormat rendered="#{guestbookResponsesPage.guestbook.responseCount lt systemConfig.guestbookResponsesPageDisplayLimit}"
+                                                styleClass="highlightBold" value="#{bundle['dataset.guestbooksResponses.count.responses']}">
+                                    <f:param value="#{guestbookResponsesPage.guestbook.responseCount}"/>
+                                </h:outputFormat>
+                                <h:outputFormat rendered="#{guestbookResponsesPage.guestbook.responseCount gt systemConfig.guestbookResponsesPageDisplayLimit}"
+                                                styleClass="highlightBold" value="#{bundle['dataset.guestbooksResponses.count.toofresults']}">
+                                    <f:param value="1"/>
+                                    <f:param value="#{systemConfig.guestbookResponsesPageDisplayLimit}"/>
+                                    <f:param value="#{guestbookResponsesPage.guestbook.responseCount}"/>
+                                </h:outputFormat>
                             </div>
-                            <div class="pull-right">
+                        </div>
+                        <div class="col-xs-6">
+                            <p class="button-block text-right">
                                 <button class="btn btn-default" jsf:id="downloadResponsesLink" jsf:action="#{guestbookResponsesPage.streamResponsesByDataverseAndGuestbook()}"  >
-                                     #{bundle['dataset.manageGuestbooks.download.responses']}
-                                </button>  
-                            </div>
+                                     <span class="glyphicon glyphicon-download-alt"/> #{bundle['dataset.manageGuestbooks.download.responses']}
+                                </button>
+                            </p>
                         </div>
+                    </div>
 
-                    <p:fragment id="tooManyEntries" rendered="#{guestbookResponsesPage.guestbook.responseCount > systemConfig.guestbookResponsesPageDisplayLimit}">
+                    <p:fragment id="tooManyEntries" rendered="#{guestbookResponsesPage.guestbook.responseCount gt systemConfig.guestbookResponsesPageDisplayLimit}">
                         <div class="row">
                             <div class="col-sm-12">
                                 <div id="no-clients-message" class="panel panel-default">
@@ -65,7 +84,6 @@
                         </div>
                     </p:fragment>
 
-
                     <p:dataTable id="responsesGuestbook" value="#{guestbookResponsesPage.responsesAsArray}" var="response">
                         <p:column sortBy="#{response[0]}" headerText="#{bundle['dataset.guestbooksResponses.dataset']}">
                             <h:outputText value="#{response[0]}"/>
@@ -82,7 +100,6 @@
                         <p:column sortBy="#{response[4]}" headerText="User">
                             <h:outputText value="#{response[4]}"/>
                         </p:column>
-
                         <p:column headerText="Custom Questions" >
                             <ui:repeat value="#{response[5]}" var="customQResponse"><b>#{customQResponse[0]}: </b>#{customQResponse[1]} <br></br></ui:repeat>
                         </p:column>