Changed help-block text from blue to grey. Moved text to bundle and C…

…SS to stylesheet. [ref #1571 #1325]
IQSS · Mar 4, 2015 · 5611c18 · 5611c18
1 parent d922a70
commit 5611c18
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 37 deletions.
diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
@@ -164,6 +164,11 @@ shib.accountInformation=Account Information
 shib.offerToCreateNewAccount=Please agree to the Dataverse Terms of Use to create your account.
 shib.passwordRejected=Accounts can only be converted if you provide the correct password for your existing account.
 
+#apitoken.xhtml
+apitoken.title=API Token
+apitoken.message=Here is your API Token. Check out our {0}API Guide{1} for more information.
+apitoken.generateBtn=Generate Token
+
 # passwordreset.xhtml
 
 pageTitle.passwdReset.pre=Account Password Reset

diff --git a/src/main/webapp/apitoken.xhtml b/src/main/webapp/apitoken.xhtml
@@ -11,46 +11,18 @@
 
     <h:body>
         <ui:composition template="/dataverse_template.xhtml">
-            <ui:param name="pageTitle" value="API Token - #{dataverseServiceBean.findRootDataverse().name} Dataverse"/>
-<!--            <ui:param name="dataverse" value="#{dataverseServiceBean.findRootDataverse()}"/>-->
+            <ui:param name="pageTitle" value="#{bundle['apitoken.title']} - #{dataverseServiceBean.findRootDataverse().name} #{bundle.dataverse}"/>
             <ui:param name="showDataverseHeader" value="false"/>
             <ui:define name="body">
-                <f:metadata>
-<!--                    <f:viewAction action="#{ApiTokenPage.init}" />                    -->
-                </f:metadata>
-                <style type="text/css">
-                    .highlight {
-                        padding: 9px 14px;
-                        margin-bottom: 1em;
-                        background-color: #f7f7f9;
-                        border: 1px solid #e1e1e8;
-                        border-radius: 4px;
-                    }
-                    .highlight pre {
-                        background-color: transparent;
-                        border: 0;
-                        margin-bottom: 0;
-                        margin-top: 0;
-                        padding: 0;
-                        white-space: nowrap;
-                        word-break: normal;
-                    }
-                    .highlight pre code {
-                        display: inline-block;
-                        color: #333;
-                        font-size: inherit;
-                        background-color: transparent;
-                        border-radius: 0;
-                        color: inherit;
-                        padding: 0;
-                        white-space: pre-wrap;
-                    }
-                </style>
-                <h:form id="apiTokenForm" style="margin-top:1em;">
+                <h:form id="apiTokenForm">
                     <p:tabView id="apiTokenView">
                         <p:tab id="apiTokenTab" title="API Token">
-                            <p style="display:block; margin-bottom:.5em;" class="text-primary">
-                                <span class="glyphicon glyphicon-info-sign"></span> Here is your API Token. Check out our <a href="/guides/API/index.html" target="_blank">API Guide</a> for more information.
+                            <p class="help-block">
+                                <span class="glyphicon glyphicon-info-sign"/>&#160;
+                                <h:outputFormat value="#{bundle['apitoken.message']}" escape="false">
+                                    <f:param value="&lt;a href=&#34;/guides/API/index.html&#34; target=&#34;_blank&#34;&gt;"/>
+                                    <f:param value="&lt;/a&gt;"/>
+                                </h:outputFormat>
                             </p>
                             <div class="highlight">
                                  <pre>
@@ -59,7 +31,7 @@
                             </div>
                             <div>
                                 <button class="btn btn-default" jsf:action="#{ApiTokenPage.generate()}">
-                                    Generate
+                                    #{bundle['apitoken.generateBtn']}
                                 </button>
                             </div>
                         </p:tab>

diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
@@ -125,6 +125,33 @@ label.normal-text input {margin-right:4px;}
     border-radius: 6px 0 6px 6px;
 }
 
+.highlight {
+    padding: 9px 14px;
+    margin-bottom: 1em;
+    background-color: #f7f7f9;
+    border: 1px solid #e1e1e8;
+    border-radius: 4px;
+}
+.highlight pre {
+    background-color: transparent;
+    border: 0;
+    margin-bottom: 0;
+    margin-top: 0;
+    padding: 0;
+    white-space: nowrap;
+    word-break: normal;
+}
+.highlight pre code {
+    display: inline-block;
+    color: #333;
+    font-size: inherit;
+    background-color: transparent;
+    border-radius: 0;
+    color: inherit;
+    padding: 0;
+    white-space: pre-wrap;
+}
+
 /* -------- HEADER -------- */
 #dataverseHeader {margin:0 auto .5em auto; background:#F5F5F5;}
 #dataverseHeader .dataverseHeaderBlock {display:table-row;}