Skip to content

Commit

Permalink
Merge branch '4.0-dev' into mon1
Browse files Browse the repository at this point in the history
  • Loading branch information
@infograf768
infograf768 committed Jul 9, 2019
2 parents 2d37fac + 865bdbf commit e5faf7c
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 29 deletions.
8 changes: 4 additions & 4 deletions administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-10-02.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ ALTER TABLE "#__user_keys" DROP COLUMN "invalid";
-- Insert the new templates into the database. Set as home if the old template is the active one
--
INSERT INTO "#__extensions" ("name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
('atum', 'template', 'atum', '', 1, 1, 1, 0, '{}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
('cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, '{}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
('atum', 'template', 'atum', '', 1, 1, 1, 0, '{}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
('cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, '{}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);

INSERT INTO "#__template_styles" ("template", "client_id", "home", "title", "params") VALUES
('atum', 1, (CASE WHEN (SELECT count FROM (SELECT count("id") AS count FROM "#__template_styles" WHERE home = '1' AND client_id = 1 AND "template" IN ('isis', 'hathor')) as c) = 0 THEN '0' ELSE '1' END), 'atum - Default', '{}'),
('cassiopeia', 0, (CASE WHEN (SELECT count FROM (SELECT count("id") AS count FROM "#__template_styles" WHERE home = '1' AND client_id = 0 AND "template" IN ('protostar', 'beez3')) as c) = 0 THEN '0' ELSE '1' END), 'cassiopeia - Default', '{}');
('atum', 1, (CASE WHEN (SELECT count FROM (SELECT count("id") AS count FROM "#__template_styles" WHERE home = 1 AND client_id = 1 AND "template" IN ('isis', 'hathor')) as c) = 0 THEN 0 ELSE 1 END), 'atum - Default', '{}'),
('cassiopeia', 0, (CASE WHEN (SELECT count FROM (SELECT count("id") AS count FROM "#__template_styles" WHERE home = 1 AND client_id = 0 AND "template" IN ('protostar', 'beez3')) as c) = 0 THEN 0 ELSE 1 END), 'cassiopeia - Default', '{}');

--
-- Now we can clean up the old templates
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-10-03.sql
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DELETE FROM "#__extensions" WHERE "name" = "mod_submenu";
DELETE FROM "#__extensions" WHERE "name" = 'mod_submenu';
2 changes: 1 addition & 1 deletion administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-04-25.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ INSERT INTO "#__extensions" ("name", "type", "element", "folder", "client_id", "
('plg_filesystem_local', 'plugin', 'local', 'filesystem', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
('plg_media-action_crop', 'plugin', 'crop', 'media-action', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
('plg_media-action_resize', 'plugin', 'resize', 'media-action', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
('plg_media-action_rotate', 'plugin', 'rotate', 'media-action', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),;
('plg_media-action_rotate', 'plugin', 'rotate', 'media-action', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0);
2 changes: 1 addition & 1 deletion administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-10-10.sql
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
INSERT INTO "#__extensions" (name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES
INSERT INTO "#__extensions" ("name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES
('plg_system_httpheaders', 'plugin', 'httpheaders', 'system', 0, 0, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0);

INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled")
Expand Down
1 change: 0 additions & 1 deletion administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-07-29.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ ALTER TABLE "#__finder_terms" ALTER COLUMN "soundex" SET DEFAULT '';
CREATE INDEX "#__finder_terms_idx_stem" on "#__finder_terms" ("stem");
CREATE INDEX "#__finder_terms_idx_language" on "#__finder_terms" ("language");
ALTER TABLE "#__finder_terms" DROP CONSTRAINT "#__finder_terms_idx_term", ADD CONSTRAINT "#__finder_terms_idx_term_language" UNIQUE ("term", "language");
CREATE INDEX "#__finder_terms_idx_language" on "#__finder_terms" ("language");

DROP TABLE IF EXISTS "#__finder_terms_common";
CREATE TABLE "#__finder_terms_common" (
Expand Down
6 changes: 3 additions & 3 deletions administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-02-03.sql
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
DELETE FROM "#__menu" WHERE "link" = "index.php?option=com_postinstall" AND "menutype" = "main";
DELETE FROM "#__menu" WHERE "link" = "index.php?option=com_redirect" AND "menutype" = "main";
DELETE FROM "#__menu" WHERE "link" = "index.php?option=com_joomlaupdate" AND "menutype" = "main";
DELETE FROM "#__menu" WHERE "link" = 'index.php?option=com_postinstall' AND "menutype" = 'main';
DELETE FROM "#__menu" WHERE "link" = 'index.php?option=com_redirect' AND "menutype" = 'main';
DELETE FROM "#__menu" WHERE "link" = 'index.php?option=com_joomlaupdate' AND "menutype" = 'main';
1 change: 0 additions & 1 deletion administrator/components/com_languages/forms/override.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
name="searchstring"
type="text"
label="COM_LANGUAGES_OVERRIDE_FIELD_SEARCHSTRING_LABEL"
description="COM_LANGUAGES_OVERRIDE_FIELD_SEARCHSTRING_DESC"
size="50"
/>

Expand Down
39 changes: 22 additions & 17 deletions administrator/components/com_languages/tmpl/override/edit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,20 +96,6 @@
<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_('COM_LANGUAGES_VIEW_OVERRIDE_SEARCH_TIP'); ?>
</div>
<div class="control-group">
<div class="input-group">
<?php echo $this->form->getInput('searchstring'); ?>
<span class="input-group-append">
<button type="submit" class="btn btn-primary" onclick="Joomla.overrider.searchStrings();return false;" formnovalidate>
<?php echo Text::_('COM_LANGUAGES_VIEW_OVERRIDE_SEARCH_BUTTON'); ?>
</button>
</span>
</div>
<span id="refresh-status" class="help-block">
<span class="fa fa-sync fa-spin" aria-hidden="true"></span>
<?php echo Text::_('COM_LANGUAGES_VIEW_OVERRIDE_REFRESHING'); ?>
</span>
</div>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('searchtype'); ?>
Expand All @@ -118,16 +104,35 @@
<?php echo $this->form->getInput('searchtype'); ?>
</div>
</div>

<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('searchstring'); ?>
</div>
<div class="controls">
<div class="input-group">
<?php echo $this->form->getInput('searchstring'); ?>
<span class="input-group-append">
<button type="submit" class="btn btn-primary" onclick="Joomla.overrider.searchStrings();return false;" formnovalidate>
<?php echo Text::_('COM_LANGUAGES_VIEW_OVERRIDE_SEARCH_BUTTON'); ?>
</button>
</span>
<span id="refresh-status" class="help-block">
<span class="fa fa-sync fa-spin" aria-hidden="true"></span>
<?php echo Text::_('COM_LANGUAGES_VIEW_OVERRIDE_REFRESHING'); ?>
</span>
</div>
</div>
</div>
</fieldset>

<fieldset id="results-container" class="adminform">
<legend><?php echo Text::_('COM_LANGUAGES_VIEW_OVERRIDE_RESULTS_LEGEND'); ?></legend>
<div id="overrider-spinner" class="overrider-spinner text-center" data-search-string-expired="<?php echo $expired; ?>"><span class="fa fa-spinner fa-spin" aria-hidden="true"></span></div>
<span id="more-results" class="mt-2">
<a id="more-results-button" class="btn btn-secondary">
<button type="button" id="more-results-button" class="btn btn-secondary">
<span id="overrider-spinner-btn" class="overrider-spinner-btn fa fa-spinner fa-spin" aria-hidden="true"></span>
<?php echo Text::_('COM_LANGUAGES_VIEW_OVERRIDE_MORE_RESULTS'); ?></a>
<?php echo Text::_('COM_LANGUAGES_VIEW_OVERRIDE_MORE_RESULTS'); ?>
</button>
</span>
</fieldset>

Expand Down

0 comments on commit e5faf7c

Please sign in to comment.