Merge Release 1.0.5 into Master (#97)

* Update tjcertificate.xml * Bug #168296 Fix: Certificate view - Text is not coming from language constant. (#92) * Bug #168296 Fix: Certificate view - Text is not coming from language constant. * Bug #168296 Fix: Certificate view - Text is not coming from language constant. * Task #168311 feat: Remove duplicates Language constant from language … (#93) * Task #168311 feat: Remove duplicates Language constant from language files. * Task #168311 feat: Remove duplicates Language constant from language files. * Task #168722 chore: Add jQuery LoadingOverlay (#95) Co-authored-by: MeghaBiranje <[email protected]> Co-authored-by: Rohan Shinde <[email protected]> Co-authored-by: Tushar Shekokar <[email protected]>
techjoomla · Mar 17, 2021 · 0a267a2 · 0a267a2
1 parent 8c513b1
commit 0a267a2
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 27 deletions.
diff --git a/src/components/com_tjcertificate/administrator/languages/en-GB/en-GB.com_tjcertificate.ini b/src/components/com_tjcertificate/administrator/languages/en-GB/en-GB.com_tjcertificate.ini
@@ -69,7 +69,7 @@ COM_TJCERTIFICATE_PAGE_ADD_CERTIFICATE="Issue Certificate: New"
 COM_TJCERTIFICATE_PAGE_EDIT_CERTIFICATE="Issued Certificate: Edit"
 COM_TJCERTIFICATE_PAGE_VIEW_CERTIFICATE="Issued Certificate: View"
 
-COM_TJCERTIFICATE_CERTIFICATE_FORM_LBL_CERTIFICATE_ID="Unique Certificate ID"
+COM_TJCERTIFICATE_CERTIFICATE_FORM_LBL_CERTIFICATE_ID="Record Id"
 COM_TJCERTIFICATE_CERTIFICATE_FORM_DESC_CERTIFICATE_ID="Unique Certificate ID generated using Prefix"
 COM_TJCERTIFICATE_CERTIFICATE_FORM_LBL_CERTIFICATE_TEMPLATE="Template"
 COM_TJCERTIFICATE_CERTIFICATE_FORM_DESC_CERTIFICATE_TEMPLATE="Template"
@@ -83,9 +83,9 @@ COM_TJCERTIFICATE_CERTIFICATE_FORM_LBL_CERTIFICATE_ISSUED_USER="User"
 COM_TJCERTIFICATE_CERTIFICATE_FORM_DESC_CERTIFICATE_ISSUED_USER="User against whom the certificate is issued"
 COM_TJCERTIFICATE_CERTIFICATE_FORM_LBL_CERTIFICATE_COMMENT="Comment"
 COM_TJCERTIFICATE_CERTIFICATE_FORM_DESC_CERTIFICATE_ISSUED_COMMENT="Comment"
-COM_TJCERTIFICATE_CERTIFICATE_FORM_LBL_CERTIFICATE_ISSUED_DATE="Issued Date"
+COM_TJCERTIFICATE_CERTIFICATE_FORM_LBL_CERTIFICATE_ISSUED_DATE="Issue Date"
 COM_TJCERTIFICATE_CERTIFICATE_FORM_DESC_CERTIFICATE_ISSUED_DATE="Certificate issue date"
-COM_TJCERTIFICATE_CERTIFICATE_FORM_LBL_CERTIFICATE_EXPIRY_DATE="Expiry Date"
+COM_TJCERTIFICATE_CERTIFICATE_FORM_LBL_CERTIFICATE_EXPIRY_DATE="Expiration Date"
 COM_TJCERTIFICATE_CERTIFICATE_FORM_DESC_CERTIFICATE_EXPIRY_DATE="Certificate expiry date"
 
 ;Certificate - List view
@@ -113,7 +113,6 @@ COM_TJCERTIFICATE_CERTIFICATE_FILTER_CERTIFICATE_CLIENT_SELECT="- Select Client
 COM_TJCERTIFICATE_CERTIFICATE_FILTER_CERTIFICATE_CLIENT="Client"
 COM_TJCERTIFICATE_CERTIFICATE_FILTER_DESC_CERTIFICATE_CLIENT="Client"
 COM_TJCERTIFICATE_CERTIFICATE_FILTER_ISSUED_USER_SELECT="- Select Issued User -"
-COM_TJCERTIFICATE_CERTIFICATE_FILTER_ISSUED_USER="Issued User"
 COM_TJCERTIFICATE_CERTIFICATE_FILTER_ISSUED_USER="Issue User"
 COM_TJCERTIFICATE_CERTIFICATE_FILTER_PUBLISHED="Status"
 COM_TJCERTIFICATE_CERTIFICATE_FILTER_PUBLISHED_DESC="Status"
@@ -195,10 +194,8 @@ COM_TJCERTIFICATE_CERTIFICATE_TEMPLATE_FILTER_SEARCH_LABEL="Search"
 COM_TJCERTIFICATE_CERTIFICATE_TEMPLATE_FILTER_SEARCH_LABEL_DESC="Search in title. Prefix with ID:to search for a Template ID"
 COM_TJCERTIFICATE_CERTIFICATE_TEMPLATE_FILTER_CERTIFICATE_SELECT_CLIENT="- Select Client -"
 COM_TJCERTIFICATE_CERTIFICATE_TEMPLATE_FILTER_DESC_CERTIFICATE_CLIENT="Client"
-COM_TJCERTIFICATE_CERTIFICATE_TEMPLATE_FILTER_DESC_CERTIFICATE_CLIENT="Client"
 COM_TJCERTIFICATE_CERTIFICATE_TEMPLATE_FILTER_ISSUED_SELECT_USER="- Select Created By -"
 COM_TJCERTIFICATE_CERTIFICATE_TEMPLATE_FILTER_ISSUED_USER="Created By"
-COM_TJCERTIFICATE_CERTIFICATE_TEMPLATE_FILTER_ISSUED_USER="Created By"
 COM_TJCERTIFICATE_CERTIFICATE_TEMPLATE_FILTER_PUBLIC="Access"
 COM_TJCERTIFICATE_CERTIFICATE_TEMPLATE_FILTER_PUBLIC_DESC="Access"
 COM_TJCERTIFICATE_CERTIFICATE_TEMPLATE_PRIVATE="Private"
@@ -327,15 +324,12 @@ COM_TJCERTIFICATE_CUSTOM_DATE_FORMAT_DESC="This option will used to set custom p
 ;Training record form
 COM_TJCERTIFICATE_FORM_LBL_CERTIFICATE_NAME="Name"
 COM_TJCERTIFICATE_FORM_LBL_CERTIFICATE_NAME_DESC="Training record name"
-COM_TJCERTIFICATE_CERTIFICATE_FORM_LBL_CERTIFICATE_ID="Record Id"
 COM_TJCERTIFICATE_CERTIFICATE_FORM_LBL_CERTIFICATE_ID_DESC="Record Id"
 COM_TJCERTIFICATE_FORM_LBL_CERTIFICATE_URL="Url <br/> (start url with http/https)"
 COM_TJCERTIFICATE_FORM_LBL_CERTIFICATE_URL_DESC="Add training record certificate Url"
 COM_TJCERTIFICATE_FORM_LBL_ISSUE_ORG="Issuing Organization"
 COM_TJCERTIFICATE_FORM_LBL_ISSUE_ORG_DESC="Organization Name"
-COM_TJCERTIFICATE_CERTIFICATE_FORM_LBL_CERTIFICATE_ISSUED_DATE="Issue Date"
 COM_TJCERTIFICATE_CERTIFICATE_FORM_LBL_CERTIFICATE_ISSUED_DATE_DESC="Add training record completion or certificate issue date"
-COM_TJCERTIFICATE_CERTIFICATE_FORM_LBL_CERTIFICATE_EXPIRY_DATE="Expiration Date"
 COM_TJCERTIFICATE_CERTIFICATE_FORM_LBL_CERTIFICATE_EXPIRY_DATE_DESC="Certificate expiry date"
 COM_TJCERTIFICATE_CERTIFICATE_FORM_LBL_CERTIFICATE_STATUS="Record Status"
 COM_TJCERTIFICATE_CERTIFICATE_FORM_LBL_CERTIFICATE_STATUS_DESC="Select record status"

diff --git a/...omponents/com_tjcertificate/administrator/languages/en-GB/en-GB.com_tjcertificate.sys.ini b/...omponents/com_tjcertificate/administrator/languages/en-GB/en-GB.com_tjcertificate.sys.ini
@@ -16,9 +16,6 @@ COM_TJCERTIFICATE_CERTIFICATE_MY_VIEW_DEFAULT_TITLE="My Certificates"
 COM_TJCERTIFICATE_CERTIFICATE_MY_VIEW_DEFAULT_DESC="Display user's own certificates."
 
 ;Template list menu
-COM_TJCERTIFICATE_TEMPLATE_LIST_DEFAULT_TITLE="Templates"
-COM_TJCERTIFICATE_TEMPLATE_LIST_DEFAULT_DESC="List of templates"
-
 COM_TJCERTIFICATE_TEMPLATE_LIST_DEFAULT_TITLE="Templates"
 COM_TJCERTIFICATE_TEMPLATE_LIST_DEFAULT_DESC="List of templates"
 COM_TJCERTIFICATE_TEMPLATE_FIELDSET_CLIENT_SELECT_LABEL="Client"

diff --git a/src/components/com_tjcertificate/media/images/loader/loader.gif b/src/components/com_tjcertificate/media/images/loader/loader.gif
diff --git a/src/components/com_tjcertificate/media/js/certificateImage.js b/src/components/com_tjcertificate/media/js/certificateImage.js
@@ -54,7 +54,7 @@ var certificateImage = {
                         viewport.setAttribute("content", "width=device-width");
                     }
 
-					Joomla.loadingLayer('hide');
+					jQuery.LoadingOverlay("hide");
                 }, 1000);
             }
         });
@@ -71,7 +71,9 @@ var certificateImage = {
             viewport.setAttribute("content", "width=1200px");
         }
 
-        Joomla.loadingLayer('show');
+		jQuery.LoadingOverlay("show", {
+			image : "media/com_tjcertificate/images/loader/loader.gif"
+		});
 
         html2canvas(element, {
             // scale: (2),

diff --git a/src/components/com_tjcertificate/media/js/certificateImage.min.js b/src/components/com_tjcertificate/media/js/certificateImage.min.js