Version 6.3.0-release.1

EhsanCh · Mar 29, 2016 · 7091cd0 · 7091cd0
1 parent 9d3a9b6
commit 7091cd0
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 21 deletions.
diff --git a/css/styles.css b/css/styles.css
@@ -1894,6 +1894,7 @@ tr.masspay-total td {
  * Markdown Editor
  * -------------------------
  */
+
 .markdown-editor-status {
     padding: 2px 10px;
     font-size: 9pt;
@@ -1905,3 +1906,59 @@ tr.masspay-total td {
 .small-font {
     font-size: 0.9em;
 }
+
+/**
+ * -------------------------
+ * Markdown Content Formatting
+ * -------------------------
+ */
+
+.markdown-content h1 {
+    font-size: 1.6em;
+    color: #333;
+}
+.markdown-content h2 {
+    font-size: 1.4em;
+    color: #333;
+}
+.markdown-content h3 {
+    font-size: 1.2em;
+    color: #333;
+}
+.markdown-content h4 {
+    font-size: 1.1em;
+    color: #333;
+}
+
+.markdown-content pre {
+    padding: 15px;
+    background-color: #444;
+    color: #f8f8f8;
+    border: 0;
+}
+.markdown-content pre code {
+    white-space: pre;
+    word-break: normal;
+    word-wrap: normal;
+}
+
+.markdown-content blockquote {
+    font-size: 1em;
+}
+
+.markdown-content table {
+    margin: 10px 0;
+    background-color: #fff;
+    border: 1px solid #ddd;
+}
+.markdown-content table > thead > tr > th {
+    padding: 4px 10px;
+    background-color: #f8f8f8;
+    border: 1px solid #ddd;
+    font-weight: bold;
+    text-align: center;
+}
+.markdown-content table > tbody > tr > td {
+    padding: 3px 8px;
+    border: 1px solid #ddd;
+}
diff --git a/js/whmcs.js b/js/whmcs.js
@@ -231,7 +231,7 @@ jQuery(document).ready(function() {
                     async: false,
                     data: {token: csrfToken, action: 'parseMarkdown', content: originalContent},
                     success: function (data) {
-                        parsedContent = data;
+                        parsedContent = JSON.parse(data);
                     }
                 });
 
@@ -251,7 +251,9 @@ jQuery(document).ready(function() {
                             fa: 'fa fa-question-circle',
                             'fa-3': 'icon-question-sign'
                         },
-                        callback: function(){},
+                        callback: function(e) {
+                            e.$editor.removeClass("md-fullscreen-mode");
+                        },
                         additionalAttr: [
                             {
                                 name: 'data-modal-title',

diff --git a/oauth/authorize.tpl b/oauth/authorize.tpl
@@ -6,11 +6,11 @@
         </div>
     {/if}
 
-    <h2 class="text-center">Authorize {$appName}<br />to access your account?</h2>
+    <h2 class="text-center">{lang key='oauth.authoriseAppToAccess' appName: $appName}</h2>
 
     <div class="content-padded">
         <div class="permission-grants">
-            <p>This application will be able to:</p>
+            <p>{lang key='oauth.willBeAbleTo'}:</p>
             <ul>
                 {foreach $requestedPermissions as $permission}
                     <li>{$permission}</li>
@@ -25,10 +25,10 @@
         {/foreach}
         <div class="action-buttons">
             <button name="userAuthorization" id="userAuthorizationAccepted" value="yes" type="submit" class="btn btn-primary">
-                Authorize
+                {lang key='oauth.authorise'}
             </button>
             <button name="userAuthorization" id="userAuthorizationDeclined" value="no" type="submit" class="btn btn-default">
-                Cancel
+                {lang key='cancel'}
             </button>
         </div>
     </form>

diff --git a/oauth/layout.tpl b/oauth/layout.tpl
@@ -31,16 +31,16 @@
                         <input type="hidden" name="logout" value="1"/>
                         <input type="hidden" name="request_hash" value="{$request_hash}"/>
                         <p>
-                            You are currently logged in as {$loggedinuser.firstname} {$loggedinuser.lastname}.
-                            <a href="#" onclick="jQuery('#frmLogout').submit()">Not you?</a>
+                            {lang key='oauth.currentlyLoggedInAs' firstName=$loggedinuser.firstname lastName=$loggedinuser.lastname}.
+                            <a href="#" onclick="jQuery('#frmLogout').submit()">{lang key='oauth.notYou'}</a>
                         </p>
                     </form>
                 {/if}
                 <form method="post" action="{$issuerurl}oauth/authorize.php" id="frmCancelLogin">
                     <input type="hidden" name="return_to_app" value="1"/>
                     <input type="hidden" name="request_hash" value="{$request_hash}"/>
                     <button type="submit" class="btn btn-default">
-                        Return to {$appName}
+                        {lang key='oauth.returnToApp' appName: $appName}
                     </button>
                 </form>
             </div>
@@ -52,7 +52,7 @@
     </section>
 
     <section id="footer">
-        Copyright &copy; {$date_year} {$companyname}. All Rights Reserved.
+        {lang key='oauth.copyrightFooter' dateYear=$date_year companyName=$companyname}
     </section>
 
     <script src="{$BASE_PATH_JS}/jquery.min.js"></script>

diff --git a/oauth/login-twofactorauth.tpl b/oauth/login-twofactorauth.tpl
@@ -12,12 +12,12 @@
                 <input type="text" name="code" class="form-control">
                 <br />
                 <button type="submit" name="backupcode" value="1" class="btn btn-primary btn-block" id="btnLogin">
-                    Login &raquo;
+                    {lang key='login'} &raquo;
                 </button>
             </div>
             <div class="action-buttons">
                 <button type="button" class="btn btn-default" id="btnCancel" onclick="jQuery('#frmCancelLogin').submit()">
-                    Cancel
+                    {lang key='cancel'}
                 </button>
             </div>
         </div>
@@ -39,7 +39,7 @@
                     <a href="#" onclick="jQuery('#loginWithSecondFactor').hide();jQuery('#loginWithBackupCode').removeClass('hidden').show();">{$LANG.twofaloginusingbackupcode}</a>
                 </div>
                 <button type="button" class="btn btn-default" id="btnCancel" onclick="jQuery('#frmCancelLogin').submit()">
-                    Cancel
+                    {lang key='cancel'}
                 </button>
             </div>
         </div>

diff --git a/oauth/login.tpl b/oauth/login.tpl
@@ -6,7 +6,7 @@
         </div>
     {/if}
 
-    <h2 class="text-center">Login to grant {$appName}<br />access to your account</h2>
+    <h2 class="text-center">{lang key='oauth.loginToGrantApp' appName=$appName}</h2>
 
     <form method="post" action="{$issuerurl}dologin.php" role="form">
         <div class="content-padded">
@@ -34,14 +34,14 @@
                         <input type="checkbox" name="rememberme" /> {$LANG.loginrememberme}
                     </label>
                     &bull;
-                    <a href="{$issuerurl}pwreset.php">Forgot password?</a>
+                    <a href="{$issuerurl}pwreset.php">{lang key='forgotpw'}</a>
                 </div>
             </div>
             <button type="submit" class="btn btn-primary" id="btnLogin">
-                Login
+                {lang key='login'}
             </button>
             <button type="button" class="btn btn-default" id="btnCancel" onclick="jQuery('#frmCancelLogin').submit()">
-                Cancel
+                {lang key='cancel'}
             </button>
         </div>
 

diff --git a/oauth/redirect.tpl b/oauth/redirect.tpl
@@ -1,9 +1,9 @@
 <div class="container">
     <div class="alert alert-success text-center">
-        Redirecting you back to the application. This may take a few moments.<br />
-        If your browser doesn't redirect you, please
+        {lang key='oauth.redirectDescriptionOne'}<br />
+        {lang key='oauth.redirectDescriptionTwo'}
         <a href="#" class="alert-link">
-            click here to continue
+            {lang key='oauth.redirectDescriptionThree'}
             <i class="fa fa-arrow-right"></i>
         </a>
     </div>

diff --git a/viewticket.tpl b/viewticket.tpl
@@ -101,7 +101,7 @@
     </div>
 
     {foreach from=$descreplies key=num item=reply}
-        <div class="ticket-reply{if $reply.admin} staff{/if}">
+        <div class="ticket-reply markdown-content{if $reply.admin} staff{/if}">
             <div class="date">
                 {$reply.date}
             </div>