Cleaned up status alert msg block, added dismissible place holder [ref …

…#4842]
IQSS · Oct 3, 2018 · 88c0a63 · 88c0a63
1 parent ba1c1c4
commit 88c0a63
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
@@ -182,22 +182,12 @@
             </div>
         </nav>
         <!-- Status Alert -->
-        <div id="status-alert" class="container" jsf:rendered="#{!empty settingsWrapper.get(':StatusMessageText') and !empty settingsWrapper.get(':StatusMessageHeader')}">
-
-            <div class="alert alert-warning">
+        <div id="status-alert" class="bg-warning" jsf:rendered="#{!empty settingsWrapper.get(':StatusMessageText') and !empty settingsWrapper.get(':StatusMessageHeader')}">
+            <div class="alert alert-dismissible container text-warning">
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&#215;</span></button>
                 <h:outputText styleClass="highlightBold" value="#{!empty settingsWrapper.get(':StatusMessageHeader') ? settingsWrapper.get(':StatusMessageHeader') : bundle['header.status.header']}"/>
-                <h:outputText rendered="#{!empty settingsWrapper.get(':StatusMessageText')}" value=" – #{settingsWrapper.get(':StatusMessageText')}"/>
-
-                <ui:remove>
-                    <h:outputLink value="#" onclick="PF('statusInfo').show()" rendered="#{settingsWrapper.get(':StatusMessageText').length() gt 5000}">Read More</h:outputLink>
-                </ui:remove>
+                <h:outputText rendered="#{!empty settingsWrapper.get(':StatusMessageText')}" value=" – #{settingsWrapper.get(':StatusMessageText')}" escape="false"/>
             </div>
-
-            <ui:remove>
-            <ui:fragment rendered="#{empty settingsWrapper.get(':StatusMessageText') and !empty settingsWrapper.get(':StatusMessageHeader')}">
-                <div class="alert alert-warning status">#{settingsWrapper.get(':StatusMessageHeader')}</div>
-            </ui:fragment>
-            </ui:remove>
         </div>
         <!-- Header Panel -->
         <!-- FIXME: Rather than hard-coding "FFFFFF", get it from the backend (ThemeWidgetFragment.DEFAULT_BACKGROUND_COLOR). -->
@@ -301,6 +291,9 @@
             </div>
         </ui:remove>
 
+
+
+
         <!-- Message Panel -->
         <p:fragment id="messagePanel" rendered="#{showMessagePanel}">
             <div class="container messagePanel">

diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
@@ -37,7 +37,8 @@ body .ui-widget {font-size: inherit;}
 #navbarFixed .dropdown.accountName .logout a {clear: both; color: #333333; display: block; font-weight: normal; line-height: 1.42857; padding: 3px 20px; white-space: nowrap; text-decoration: none;}
 #navbarFixed li.dropdown.open > span.dropdown-toggle {background-color: #e7e7e7;}
 
-#status-alert {margin-top:12px;}
+#status-alert {margin-top:0; margin-bottom:0;}
+#status-alert div.alert {border:0; box-shadow:none;}
 
 #footer {margin-top:3em; padding-bottom:4em; color:#808080;}
 #footer.widget-view {position:fixed; left:0px; bottom:0px; margin:0; padding:4px 0 0 0; min-height:44px; width:100%; background:#fff;}