Skip to content
This repository was archived by the owner on Sep 17, 2018. It is now read-only.

not core #75

Merged
merged 2 commits into from
Aug 28, 2018
Merged

not core #75

merged 2 commits into from
Aug 28, 2018

Conversation

@brianteeman
Copy link
Contributor

@brianteeman brianteeman commented Aug 28, 2018

Pull Request for Issue # .
image

Updated strings - they are not core files etc

Note from the screenshot we can see that the _1 string was not used when it should have been

@anuragteapot
Copy link
Member

anuragteapot commented Aug 28, 2018

@brianteeman I am still confused here.
Because in update the core file of the overridden file is changed or update. So, this is fine ?

@brianteeman
Copy link
Contributor Author

brianteeman commented Aug 28, 2018

Core = joomla
Core != Extension

@brianteeman
Copy link
Contributor Author

brianteeman commented Aug 28, 2018

Maybe it should be

Files that were overridden have changed

@anuragteapot
Copy link
Member

anuragteapot commented Aug 28, 2018

Core = joomla
Core != Extension

Ok, now I understand. Like com_media or com_content etc is the extension of Joomla but not the core of Joomla right?

@brianteeman
Copy link
Contributor Author

brianteeman commented Aug 28, 2018

no. Core is anything that is shipped with a default install of joomla
com_content = core
com_helloworld = extension

@anuragteapot
Copy link
Member

anuragteapot commented Aug 28, 2018 •
edited
Loading

no. Core is anything that is shipped with a default install of joomla
com_content = core
com_helloworld = extension

ok got it . Then you are right we cannot use core keyword.

@anuragteapot
Copy link
Member

anuragteapot commented Aug 28, 2018

Because the user may create an override of default Joomla extensions like com_content and non-core like com_helloworld

@brianteeman
Copy link
Contributor Author

brianteeman commented Aug 28, 2018

yes - and on this screen we are only talking about non-core extensions

anuragteapot
anuragteapot reviewed Aug 28, 2018
View reviewed changes
administrator/language/en-GB/en-GB.plg_installer_override.ini Outdated
PLG_INSTALLER_OVERRIDE_PLUGIN_XML_DESCRIPTION="The system overrides plugin enables notifications and handling of overrides after an update in case of differences."
PLG_INSTALLER_N_OVERRIDE_FILE_UPDATED="%s Overrides core file updated."
PLG_INSTALLER_N_OVERRIDE_FILE_UPDATED_1="Override core file updated."
PLG_INSTALLER_N_OVERRIDE_FILE_UPDATED="%s Overriden files have changed."
Copy link
Member

@anuragteapot anuragteapot Aug 28, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@brianteeman Overridden right ?

Copy link
Contributor Author

@brianteeman brianteeman Aug 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes my mistake

@brianteeman
Copy link
Contributor Author

brianteeman commented Aug 28, 2018

fixed it

@anuragteapot anuragteapot merged commit 2e3bd86 into joomla-projects:master Aug 28, 2018
@anuragteapot
Copy link
Member

anuragteapot commented Aug 28, 2018

Thank you very much.

@brianteeman brianteeman deleted the patch-6 branch August 28, 2018 18:39
zero-24 pushed a commit that referenced this pull request Sep 6, 2018
@anuragteapot @laoneo
[4.0][GSoC 2018] Improve Override Management (#21851)
811ab3f 
* Load correct core files of override files (#2)

Start implements loadcorefile() in administrator/components/com_templates/Model/TemplateModel.php

* CS (#3) Coding Standards

* codingstandards

* codingstandards (#4)

* Test (#6)

Phase 2 (2 part) Mechanism to find correct core file and implementation.

* Remove Notice: Only available for html-folder

* Remove Warning if core file not found (#11)

Thanks.
So one part of the issue #12 is done.

* Implement the diff view in template manager 

Implement the diff view in template manager

* coding standard (#17)

* fix diff (#18) Fix bug in path in case of administrator template override.

Fix bug in path in case of administrator template override.

* Notification after update and TEST (#16)

Find changed files of overridden files and show message.

* coding standard (#21)

* correction

* correction (#26)

* Correcthtmlpath (#27)

* correction

* change oldhtml to newhtml

* List of updated override files. (#30)

* addcss (#34)

* Final Product  (#39)

Core and Diff view
Updated override history list.
Quick icon notification plugin.
Override control plugin.

* save 3 lines :)

* New feature show status. (#47)

show status in com_template view templates

* link

* corrected namespace

* Button to Switch (#35)

* wip add Switcher

* wip style switcher

* wip style switch make inline and change on off text

* wip start with js

* wip js

* wip delete buttons and make js more robust

* wip save to storage

* wip delete old code

* wip

* wip lint

* wip css

* set default value for switcher

* wip make switcher blue

* wip

* wip

* build

* correct names

* create new functions

* fist test code

* use onchange

* undo installer.min.js

* add forgotten new line at the end of css file

* correct align

* correct compare.es6 - only deleted the toggle part

* correct compare.js - only deleted the toggle part

* wip

* reduce timeout

* wrap in funcitons

* wip

* add use strict to both js-files(compare and toggle)

* add the timeout value of 500 again, because 200 are not enought in my case

* use css class 'active' for toggle views

* add strict

* time out for editor

* wip

* improvments use newActive and switch

* correction

* width of switcher-spans

* correct align

* do not use global

* wip

* removed timeouts

* JTEXT to TEXT

* forgotton last line

* deleted duplicated comments

* css fix align

* use unnamed functions in es6

* Sql files for fix database (#50)

* sql files for database fix

* delete space

* Suggestion for displaying Dates in view updates files (#52)

Correct Dates and do not use date of file any more

* Store Date as UTC and show it in server time zone (#57)

* modified and created date are created and stored in UTC

* convert dates for displaying in model

* spar a loop

* normalize timezone in view

* use language constants for dateformat

* JToolbarHelper to ToolbarHelper

* CS

* namespace

* plural

* name

* clean

* text

* fx

* sin

* files

* s

* Suggestion for language strings (#60)

* language strings

* correct typo

* delete media folder plg_quickicon

* add folder plg_quickicon to build/media_src

* delete files in media folder

* Move media folder - System (#66)

* multi

* cs

* delete files in media folder for joomla toolbar (#67)

* Fix button switchers style. (#70)

* button

* CS

* changed uitab.addTab for updated files

* Bring back core.js changes. (#69)

* core.js

* const

* fix

* form

* core

* hound

* CS

* scopr

* grid

* alpha

* cs

* lang

* only override file

* lang

* override lang installer

* Cs

* sub

* Update list of core extensions (#71)

* Language changes (#76)

* update

* Update en-GB.com_templates.ini

* override JLIB_HTML_PUBLISH_ITEM

this is the hover text on the publish icon in the list of files

* Change icon (#74)

change the icon to use an outline for more consistency

* lang

* not core (#75)

* not core

* Update en-GB.plg_installer_override.ini

* namespace

* cs

* Updated files (#82)

* Update default_updated_files.php

* Update en-GB.com_templates.ini

* Update en-GB.com_templates.ini (#81)

* Update en-GB.plg_quickicon_overridecheck.ini (#80)

* Update en-GB.plg_quickicon_overridecheck.ini (#79)

* remove space (#78)

* Update en-GB.plg_quickicon_overridecheck.ini

* Update en-GB.plg_quickicon_overridecheck.sys.ini

* remove hardcoded id

* null get function

* state

* clean

* More changes "core" to "original" (#85)

* cs

* update

* plural
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@anuragteapot anuragteapot anuragteapot left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@brianteeman @anuragteapot