Updates to prepare release

Kontent · Jul 28, 2020 · e5ded10 · e5ded10
1 parent 55de98d
commit e5ded10
Show file tree

Hide file tree

Showing 43 changed files with 425 additions and 424 deletions.
diff --git a/atomic4/ajax/ajax.php → atomic/ajax/ajax.php b/atomic4/ajax/ajax.php → atomic/ajax/ajax.php
diff --git a/atomic4/component.php → atomic/component.php b/atomic4/component.php → atomic/component.php
@@ -62,6 +62,7 @@
 $codeafterbody					= $this->params->get('codeafterbody');
 $codebeforebody				= $this->params->get('codebeforebody');
 $cssoverride						= $this->params->get('cssoverride');
+$protopositions					= $this->params->get('protopositions');
 ?>
 <!DOCTYPE html>
 <html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">

diff --git a/atomic4/css/index.html → atomic/css/index.html b/atomic4/css/index.html → atomic/css/index.html
diff --git a/atomic4/css/template.css → atomic/css/template.css b/atomic4/css/template.css → atomic/css/template.css
diff --git a/atomic4/css/template_bs4.css → atomic/css/template_bs4.css b/atomic4/css/template_bs4.css → atomic/css/template_bs4.css
diff --git a/atomic4/css/template_rtl.css → atomic/css/template_rtl.css b/atomic4/css/template_rtl.css → atomic/css/template_rtl.css
diff --git a/atomic4/error.php → atomic/error.php b/atomic4/error.php → atomic/error.php
diff --git a/atomic4/favicon.ico → atomic/favicon.ico b/atomic4/favicon.ico → atomic/favicon.ico
diff --git a/atomic4/favicons/android-chrome-192x192.png → atomic/favicons/android-chrome-192x192.png b/atomic4/favicons/android-chrome-192x192.png → atomic/favicons/android-chrome-192x192.png
diff --git a/atomic4/favicons/android-chrome-512x512.png → atomic/favicons/android-chrome-512x512.png b/atomic4/favicons/android-chrome-512x512.png → atomic/favicons/android-chrome-512x512.png
diff --git a/atomic4/favicons/apple-touch-icon.png → atomic/favicons/apple-touch-icon.png b/atomic4/favicons/apple-touch-icon.png → atomic/favicons/apple-touch-icon.png
diff --git a/atomic4/favicons/browserconfig.xml → atomic/favicons/browserconfig.xml b/atomic4/favicons/browserconfig.xml → atomic/favicons/browserconfig.xml
diff --git a/atomic4/favicons/favicon-16x16.png → atomic/favicons/favicon-16x16.png b/atomic4/favicons/favicon-16x16.png → atomic/favicons/favicon-16x16.png
diff --git a/atomic4/favicons/favicon-32x32.png → atomic/favicons/favicon-32x32.png b/atomic4/favicons/favicon-32x32.png → atomic/favicons/favicon-32x32.png
diff --git a/atomic4/favicons/favicon.ico → atomic/favicons/favicon.ico b/atomic4/favicons/favicon.ico → atomic/favicons/favicon.ico
diff --git a/atomic4/favicons/index.html → atomic/favicons/index.html b/atomic4/favicons/index.html → atomic/favicons/index.html
diff --git a/atomic4/favicons/mstile-150x150.png → atomic/favicons/mstile-150x150.png b/atomic4/favicons/mstile-150x150.png → atomic/favicons/mstile-150x150.png
diff --git a/atomic4/favicons/safari-pinned-tab.svg → atomic/favicons/safari-pinned-tab.svg b/atomic4/favicons/safari-pinned-tab.svg → atomic/favicons/safari-pinned-tab.svg
diff --git a/atomic4/favicons/site.webmanifest → atomic/favicons/site.webmanifest b/atomic4/favicons/site.webmanifest → atomic/favicons/site.webmanifest
diff --git a/atomic4/fields/button.php → atomic/fields/button.php b/atomic4/fields/button.php → atomic/fields/button.php
@@ -14,7 +14,7 @@ public function getInput() {
 					var base_url = window.location.href;
                     var script_id = "createcss";
                     var url = base_url.substring(0, base_url.indexOf(\'administrator\'));
-                    var page = \'templates/atomic4/ajax/ajax.php\';
+                    var page = \'templates/atomic/ajax/ajax.php\';
                     var link = url.concat(page); 
                     jQuery.ajax(
                     	{
@@ -32,7 +32,7 @@ public function getInput() {
 				<button id="'.$this->id.'" name="'.$this->name.'" type="button" onclick="
                     var base_url = window.location.href;
                     var url = base_url.substring(0, base_url.indexOf(\'administrator\'));
-                    var page = \'templates/atomic4/ajax/ajax.php\';
+                    var page = \'templates/atomic/ajax/ajax.php\';
                     var link = url.concat(page); 
                     jQuery.ajax(
                     	{

diff --git a/atomic4/fonts/index.html → atomic/fonts/index.html b/atomic4/fonts/index.html → atomic/fonts/index.html
diff --git a/atomic4/htaccess.txt → atomic/htaccess.txt b/atomic4/htaccess.txt → atomic/htaccess.txt
diff --git a/atomic4/html/index.html → atomic/html/index.html b/atomic4/html/index.html → atomic/html/index.html
diff --git a/atomic4/html/layouts/chromes/basic.php → atomic/html/layouts/chromes/basic.php b/atomic4/html/layouts/chromes/basic.php → atomic/html/layouts/chromes/basic.php
diff --git a/atomic4/html/layouts/chromes/default.php → atomic/html/layouts/chromes/default.php b/atomic4/html/layouts/chromes/default.php → atomic/html/layouts/chromes/default.php
diff --git a/atomic4/html/layouts/chromes/mobilemenu.php → atomic/html/layouts/chromes/mobilemenu.php b/atomic4/html/layouts/chromes/mobilemenu.php → atomic/html/layouts/chromes/mobilemenu.php
diff --git a/atomic4/html/modules.php → atomic/html/modules.php b/atomic4/html/modules.php → atomic/html/modules.php
diff --git a/atomic4/images/index.html → atomic/images/index.html b/atomic4/images/index.html → atomic/images/index.html
diff --git a/atomic4/index.html → atomic/index.html b/atomic4/index.html → atomic/index.html
diff --git a/atomic4/index.php → atomic/index.php b/atomic4/index.php → atomic/index.php
diff --git a/atomic4/js/index.html → atomic/js/index.html b/atomic4/js/index.html → atomic/js/index.html
diff --git a/atomic4/js/template.js → atomic/js/template.js b/atomic4/js/template.js → atomic/js/template.js
diff --git a/atomic/language/en-GB/en-GB.tpl_atomic.ini b/atomic/language/en-GB/en-GB.tpl_atomic.ini
@@ -0,0 +1,179 @@
+; Copyright (C) 2020 Ron Severdia. All rights reserved.
+; License GNU General Public License version 2 or later
+; Note : All ini files need to be saved as UTF-8
+
+TPL_ATOMIC_XML_DESCRIPTION="Atomic is an easy-to-modify and minimal example of a Joomla template."
+
+; Basic Settings
+TPL_ATOMIC_GA_LABEL="Google Analytics code"
+TPL_ATOMIC_GA_DESC="Enter the code provided by Google Analytics to activate GA for your site."
+
+TPL_ATOMIC_COPYRIGHTTXT_LABEL="Copyright Notice"
+TPL_ATOMIC_COPYRIGHTTXT_DESC="Add a custom copyrigh notice. If left blank, the site name will be used."
+
+TPL_ATOMIC_KILLGENERATOR_LABEL="Remove Joomle generator tag"
+TPL_ATOMIC_KILLGENERATOR_DESC="Remove the generator meta tag Joomla adds to every page."
+
+TPL_ATOMIC_LOGO_LABEL="Header logo"
+TPL_ATOMIC_LOGO_DESC="Select an image to be used for the header logo."
+
+; CSS Settings
+TPL_ATOMIC_FLUID_LABEL="Fluid or Fixed Width"
+TPL_ATOMIC_FLUID_DESC="Choose a fixed width or a fluid width depending on browser width."
+
+TPL_ATOMIC_FIXED="Fixed width"
+TPL_ATOMIC_FLUID="Fluid width"
+
+TPL_ATOMIC_BOOTSTRAP_LABEL="Load Bootstrap 4"
+TPL_ATOMIC_BOOTSTRAP_DESC="Load Bootstrap 4.5 from CDN."
+TPL_ATOMIC_BS4_REMOTE="Bootstrap 4.5 (CDN)"
+TPL_ATOMIC_BS4_CUSTOM="Custom Bootstrap URL"
+
+TPL_ATOMIC_BOOTSTRAPCDN_LABEL="Custom Bootstrap CDN"
+TPL_ATOMIC_BOOTSTRAPCDN_DESC="Load a custom version of Bootstrap from the CDN. Paste in the code from bootstrapcdn.com here. This will override your selection for Bootstrap source."
+
+TPL_ATOMIC_CUSTOMCSSFILE_LABEL="Load custom CSS file"
+TPL_ATOMIC_CUSTOMCSSFILE_DESC="Load the custom template.css file in the Atomic template folder. Add your customizations to this file."
+
+TPL_ATOMIC_CSSOVERRIDE_LABEL="CSS override"
+TPL_ATOMIC_CSSOVERRIDE_DESC="Enable and create the custom template.css file in the Atomic template folder. Add your customizations to this file."
+
+TPL_ATOMIC_CUSTOMCSS_LABEL="Load custom CSS"
+TPL_ATOMIC_CUSTOMCSS_DESC="Add your CSS customizations in this field. These styles load last in the head of your document."
+
+TPL_ATOMIC_CUSTOMDARKCSS_LABEL="Load dark mode CSS"
+TPL_ATOMIC_CUSTOMDARKCSS_DESC="Add your CSS customizations for drak mode in this field for browsers that support 'prefers-color-scheme:dark'. These styles load in the head of your document after your custom CSS."
+
+TPL_ATOMIC_TEMPLATEBSFIX_LABEL="Load Bootstrap fixes"
+TPL_ATOMIC_TEMPLATEBSFIX_DESC="This CSS file fixes incompatiblities between Bootstrap structures and Joomla outputs. Don't disable this unless you know what you're doing."
+
+TPL_ATOMIC_BODYMENU_LABEL="Add Menu Alias to Body"
+TPL_ATOMIC_BODYMENU_DESC="To enable page-specific styling, automatically add the current menu item alias to the body as a class, ID, or both."
+TPL_ATOMIC_BODYMENU_OPTION_DEFAULT="None"
+TPL_ATOMIC_BODYMENU_OPTION_BODYCLASS="Class"
+TPL_ATOMIC_BODYMENU_OPTION_BODYID="ID"
+TPL_ATOMIC_BODYMENU_OPTION_BODYCLASSID="Class & ID"
+
+TPL_ATOMIC_KILLJOOMLACSS_LABEL="Remove Joomla CSS"
+TPL_ATOMIC_KILLJOOMLACSS_DESC="Remove the CSS file Joomla normally adds to the head for modal styles: bootstrap.min.css"
+
+
+; JavaScript Settings
+TPL_ATOMIC_CUSTOMJS_LABEL="Load custom JavaScript"
+TPL_ATOMIC_CUSTOMJS_DESC="Load the custom template.js file in the Atomic template folder at the bottom fo the head. Add your customizations to this file."
+
+TPL_ATOMIC_KILLJOOMLAJS_LABEL="Remove Joomla JavaScript"
+TPL_ATOMIC_KILLJOOMLAJS_DESC="Remove the JavaScript files Joomla normally adds to the head: caption.js, bootstrap.min.js, script.min.js, and core.js. It will not remove jquery.min.js, jquery-noconflict.js, jquery-migrate.min.js. Use the other settings for those."
+
+TPL_ATOMIC_JQUERY_LABEL="Load jQuery source"
+TPL_ATOMIC_JQUERY_DESC="Choose a version other than the default loaded by Joomla. If you you load Bootstrap, you should choose the version that supports the version you have enabled. Be very careful with this option."
+
+TPL_ATOMIC_JQUERYCDN_LABEL="Custom jQuery CDN"
+TPL_ATOMIC_JQUERYCDN_DESC="Load a custom version of jQuery from the CDN. Paste in the code from code.jquery.com here. This will override your selection for jQuery source."
+
+TPL_ATOMIC_JQUERY_DEFAULT="jQuery 1.12.4 Local (Joomla 3 Default)"
+TPL_ATOMIC_JQUERY_2="jQuery 2.2.4 Remote CDN"
+TPL_ATOMIC_JQUERY_3="jQuery 3.5.1 Remote CDN (Bootstrap 4 Default)"
+
+TPL_ATOMIC_NOCONFLICT_LABEL="Use jQuery noConflict()"
+TPL_ATOMIC_NOCONFLICT_DESC="Prevent conflicts between jQuery and MooTools. This is loaded by default by Joomla so no need to add it unless you are disabling Joomla's version."
+
+TPL_ATOMIC_JQUERYMIGRATE_LABEL="Use jQuery Migrate"
+TPL_ATOMIC_JQUERYMIGRATE_DESC="Load the jQuery Migrate library to support older APIs."
+TPL_ATOMIC_JQUERYMIGRATE_DEFAULT="jQuery Migrate 1.4.1 (Joomla Default)"
+TPL_ATOMIC_JQUERYMIGRATE_3="jQuery Migrate 3.1.0"
+TPL_ATOMIC_JQUERYMIGRATE_NONE="None"
+
+TPL_ATOMIC_INSTANT_LABEL="Use Instant.page"
+TPL_ATOMIC_INSTANT_DESC="Use Instant.page to speed up your site. More info at instant.page"
+
+; Font Settings		
+TPL_ATOMIC_HEADER_FONT_LABEL="Header font (H1-H6)"
+TPL_ATOMIC_HEADER_FONT_DESC="Choose a font library for for header fonts. If you choose Google Fonts, you must enter the font name below. If the font name has two or more words, replace each space with a + symbol."
+TPL_ATOMIC_HEADER_FONTNAME_LABEL="Header font name"
+TPL_ATOMIC_HEADER_FONTNAME_DESC="Enter the font name for the library you've chosen. If using the default (Bootstrap), leave it blank."
+TPL_ATOMIC_BODY_FONT_LABEL="Body font"
+TPL_ATOMIC_BODY_FONT_DESC="Choose a font library for the body font. If you choose Google Fonts, you must enter the font name below. If the font name has two or more words, replace each space with a + symbol."
+TPL_ATOMIC_BODY_FONTNAME_LABEL="Body font name"
+TPL_ATOMIC_BODY_FONTNAME_DESC="Enter the font name for the library you've chosen. If using the default (Bootstrap), leave it blank."
+TPL_ATOMIC_BOOTSTRAPFONT="Bootstrap fonts (Default)"
+TPL_ATOMIC_GOOGLEFONT="Google fonts"
+
+; Icon Settings
+TPL_ATOMIC_LOADFAVICONS_LABEL="Load template favicons"
+TPL_ATOMIC_LOADFAVICONS_DESC="Either load the Atomic favicons or use the default Joomla favicon."
+TPL_ATOMIC_LOADAPPLEICONS_LABEL="Load Apple/Android icons"
+TPL_ATOMIC_LOADAPPLEICONS_DESC="Load precomposed Apple and Android icons. Put icons with the following sizes in the root level of your website: 57x57, 72x72, 76x76, 114x114, 120x120, 144x144, 152x152, 180x180, 192x192"
+TPL_ATOMIC_FONTAWESOME_LABEL="Load FontAwesome 5.13.1 icons"
+TPL_ATOMIC_FONTAWESOME_DESC="You can load the local or remote copy of FontAwesome 5.13.1 or none."
+TPL_ATOMIC_FAREMOTEJS="Use SVG and JS"
+TPL_ATOMIC_FAREMOTECSS="Use Web Fonts and CSS"
+TPL_ATOMIC_FACUSTOM="Custom FontAwesome URL"
+TPL_ATOMIC_FONTAWESOMECDN_LABEL="Custom FontAwesome URL"
+TPL_ATOMIC_FONTAWESOMECDN_DESC="Load a custom version of FontAwesome from the CDN. Paste in the code here. This will override your selection for FontAwesome source."
+
+; TPL_ATOMIC_FONTAWESOMECDN_LABEL=""
+; TPL_ATOMIC_FONTAWESOMECDN_DESC=""
+
+; Module/Layout Settings
+TPL_ATOMIC_PAGEHEADER_LABEL="Page header"
+TPL_ATOMIC_PAGEHEADER_DESC="Show/hide the page header, If you disable this, the site name and description will not be visible."
+TPL_ATOMIC_PAGEHEADERMOD_LABEL="Page header module"
+TPL_ATOMIC_PAGEHEADERMOD_DESC="Show/hide the page header module position. Assign a module to the 'pageheader' position to appear here."
+TPL_ATOMIC_TOPMENU_LABEL="Top navigation module"
+TPL_ATOMIC_TOPMENU_DESC="Show/hide the top navigation module position. Assign a module to the 'navigation' position to appear here."
+TPL_ATOMIC_ABOVEBODY_LABEL="Above body module"
+TPL_ATOMIC_ABOVEBODY_DESC="Show/hide the module position above the main body/content area. Assign a module to the 'abovebody' position to appear here."
+TPL_ATOMIC_LEFTBODY_LABEL="Left body module"
+TPL_ATOMIC_LEFTBODY_DESC="Show/hide the module position left of the main body/content area. Assign a module to the 'leftbody' position to appear here."
+TPL_ATOMIC_RIGHTBODY_LABEL="Right body module"
+TPL_ATOMIC_RIGHTBODY_DESC="Show/hide the module position right of the main body/content area. Assign a module to the 'rightbody' position to appear here."
+TPL_ATOMIC_BELOWBODY_LABEL="Below body module"
+TPL_ATOMIC_BELOWBODY_DESC="Show/hide the module position below the main body/content area. Assign a module to the 'belowbody' position to appear here."
+TPL_ATOMIC_FOOTER_LABEL="Footer"
+TPL_ATOMIC_FOOTER_DESC="Show/hide the page footer, If you disable this, the site name and copyright date will not be visible."
+TPL_ATOMIC_ALERTBAR_LABEL="Alert Bar"
+TPL_ATOMIC_ALERTBAR_DESC="Show/hide the alert bar. Then add a custom module to create a butterbar alert that displays at the top of the page."
+TPL_ATOMIC_PROTO_LABEL="Protostar positions"
+TPL_ATOMIC_PROTO_DESC="Enable module positions used in the Protostar default Joomla template. Use this if you were using Protostar and don't want to move your modules to the Atomic positions."
+
+; Custom Code Settings
+TPL_ATOMIC_CODEAFTERHEAD_LABEL="After opening &#60;head&#62; tag"
+TPL_ATOMIC_CODEAFTERHEAD_DESC="Add HTML here to appear after the opening &#60;head&#62; tag."
+TPL_ATOMIC_CODEBEFOREHEAD_LABEL="Before closing &#60;/head&#62; tag"
+TPL_ATOMIC_CODEBEFOREHEAD_DESC="Add HTML here to appear before the closing &#60;/head&#62; tag."
+TPL_ATOMIC_CODEAFTERBODY_LABEL="After opening &#60;body&#62; tag"
+TPL_ATOMIC_CODEAFTERBODY_DESC="Add HTML here to appear after the opening &#60;body&#62; tag."
+TPL_ATOMIC_CODEBEFOREBODY_LABEL="Before closing &#60;/body&#62; tag"
+TPL_ATOMIC_CODEBEFOREBODY_DESC="Add HTML here to appear before the closing &#60;/body&#62; tag."
+
+; Configuration Options
+TPL_ATOMIC_NONE="None"
+TPL_ATOMIC_LOCAL="Local"
+TPL_ATOMIC_REMOTE="Remote"
+TPL_ATOMIC_NO="No"
+TPL_ATOMIC_YES="Yes"
+TPL_ATOMIC_ENABLED="Enabled"
+TPL_ATOMIC_DISABLED="Disabled"
+
+; Template Configuration Tabs
+COM_TEMPLATES_JOOMLA_SETTINGS_FIELDSET_LABEL="Joomla Settings"
+COM_TEMPLATES_CSS_SETTINGS_FIELDSET_LABEL="CSS"
+COM_TEMPLATES_JAVASCRIPT_SETTINGS_FIELDSET_LABEL="JavaScript"
+COM_TEMPLATES_FONT_SETTINGS_FIELDSET_LABEL="Fonts"
+COM_TEMPLATES_ICON_SETTINGS_FIELDSET_LABEL="Icons"
+COM_TEMPLATES_MODULE_SETTINGS_FIELDSET_LABEL="Layout/Modules"
+COM_TEMPLATES_CUSTOM_CODE_FIELDSET_LABEL="Custom Code"
+
+; Module Positions
+TPL_ATOMIC_POSITION_ATOMIC-BOTTOMLEFT="Bottom left"
+TPL_ATOMIC_POSITION_ATOMIC-BOTTOMMIDDLE="Bottom middle"
+TPL_ATOMIC_POSITION_ATOMIC-SEARCH="Search"
+TPL_ATOMIC_POSITION_ATOMIC-SIDEBAR="Sidebar"
+TPL_ATOMIC_POSITION_ATOMIC-TOPMENU="Top Menu"
+TPL_ATOMIC_POSITION_ATOMIC-TOPQUOTE="Top Quote"
+TPL_ATOMIC_COPYRIGHT_LABEL="Show copyright in footer"
+TPL_ATOMIC_COPYRIGHT_DESC="Show or hide the copyright in the footer. The footer position must be active for this to appear."
+
+
+
diff --git a/atomic/language/en-GB/en-GB.tpl_atomic.sys.ini b/atomic/language/en-GB/en-GB.tpl_atomic.sys.ini
@@ -0,0 +1,6 @@
+; Copyright (C) 2020 Ron Severdia. All rights reserved.
+; License GNU General Public License version 2 or later
+; Note : All ini files need to be saved as UTF-8
+
+TPL_ATOMIC_XML_DESCRIPTION="Atomic is an easy-to-modify and minimal example of a Joomla template."
+
diff --git a/atomic4/language/en-GB/index.html → atomic/language/en-GB/index.html b/atomic4/language/en-GB/index.html → atomic/language/en-GB/index.html
diff --git a/atomic4/language/index.html → atomic/language/index.html b/atomic4/language/index.html → atomic/language/index.html