Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
21f792d
[JUX2] Front-end modules and menu editing: part 1: Cleanup admin area
beat Jul 10, 2013
2a63ef8
[JUX2] Front-end modules and menu editing: part 2: Add Front-end Modu…
beat Jul 9, 2013
874b687
[JUX2] Front-end modules and menu editing: part 3: Add Front-end Modu…
beat Jul 13, 2013
3ba300a
Installer: Added link to JED and setting to remove it
beat Oct 1, 2013
a9d2ab5
Installer: Added spindle-wheel javascript for installations to Isis
beat Oct 1, 2013
b80254f
Installer: Added spindle-wheel javascript for installations to Isis
beat Oct 1, 2013
ef7061b
Installer: Added support for update.xml file urls for Install from UR…
beat Oct 1, 2013
86a13cb
Installer: Fixed error in displaying Install from URL error, sprintf …
beat Oct 1, 2013
64a6384
Refactored to be in sync with master
Oct 2, 2013
ed87002
[imp] keep original bootstrap files as much as possible
phproberto Oct 2, 2013
15c564d
Merge remote-tracking branch 'origin/master' into jux2-frontend-edit-…
beat Oct 2, 2013
939c510
Merge pull request #4 from phproberto/jux-16-topbar
Oct 2, 2013
c1a36de
Refactored to be in sync with master
Oct 2, 2013
b4d7b66
Merge remote-tracking branch 'remotes/origin/jux-topbar' into jux-tit…
Oct 2, 2013
6ad383f
[JUX2] Front-end modules editing: Removed menus-editing and moved to …
beat Oct 2, 2013
67def9b
Fixed RTL styling
Oct 3, 2013
2a7c069
Lost the bootstrap.js fixes. Placed them back.
Oct 3, 2013
f9a486f
Fixed some RTL stuff
Oct 3, 2013
3a73d6a
RTL stuff
Oct 3, 2013
657c169
Fixed some RTL stuff
Oct 3, 2013
c7dcc78
Made rtl temlate contain all styles so it can be loaded as one (not a…
Oct 3, 2013
a7a3c4e
Made rtl template contain all styles so it can be loaded as one (not …
Oct 3, 2013
24761ff
[JUX2] Front-end modules editing: Commented out menus-editing, alowin…
beat Oct 3, 2013
6234151
Refactored to be in sync with master
Oct 3, 2013
d156787
Add extra assertation to give 100% coverage
wilsonge Oct 3, 2013
666b573
[JUX2] Front-end modules editing: Fixed RTL positions to be right, fi…
beat Oct 3, 2013
936e19a
Updated files to be more in sync with master (regarding syntax)
Oct 3, 2013
6aa63c7
Updated files to be more in sync with master (regarding syntax)
Oct 3, 2013
0528473
Updated files to be more in sync with master (regarding syntax)
Oct 3, 2013
91e2457
Updated files to be more in sync with master (regarding syntax)
Oct 3, 2013
49d4945
Updated files to be more in sync with master (regarding syntax)
Oct 4, 2013
57fa32d
Merge remote-tracking branch 'remotes/upstream/master' into jux-layou…
Oct 4, 2013
3e5fe6f
Merge remote-tracking branch 'remotes/upstream/master' into jux-layou…
Oct 4, 2013
548491a
Merge remote-tracking branch 'remotes/upstream/master' into jux-topbar
Oct 4, 2013
f5902a1
Merge remote-tracking branch 'remotes/upstream/master' into jux-titlebar
Oct 4, 2013
eb6ad80
[JUX2] Front-end modules editing: Moved ACL one level up and improved…
beat Oct 4, 2013
089783d
[JUX2] Front-end modules editing: Fixed PHPCS warnings and added the …
beat Oct 4, 2013
f19b7a7
[JUX2] Front-end modules editing: Fixed Beez3 issues and removed inne…
beat Oct 4, 2013
3dc2c43
Added triggers for installation pre-flight and post-flights for custo…
beat Oct 4, 2013
a349fb8
Merge remote-tracking branch 'remotes/upstream/master' into jux-topbar
Oct 5, 2013
1ab7fde
Merge remote-tracking branch 'remotes/upstream/master' into jux-titlebar
Oct 5, 2013
a34685f
Merge remote-tracking branch 'remotes/upstream/master' into jux-layou…
Oct 5, 2013
bdf1542
Install from Web installer: Added language strings and fixed language…
beat Oct 6, 2013
4c71c37
Add some more test cases, tests and some infrastructure for JHelper
elinw Oct 5, 2013
2e1e563
Added out-of-English-JED-content strings to installer language file f…
beat Oct 6, 2013
ea02519
Added the 2 webinstaller plugin translation files for name and descri…
beat Oct 6, 2013
c5a53aa
Added the new settings for first or last tab strings into the webinst…
beat Oct 6, 2013
ee5cdab
Fixed event for adding as last tab and removed unneeded parameter for…
beat Oct 6, 2013
83e4a65
Merge remote-tracking branch 'remotes/upstream/master' into jux-layou…
Oct 7, 2013
9e2df31
Changed name of a layout from main.php to global.php
Oct 7, 2013
7a9822c
Refactored to be in sync with master
Oct 7, 2013
0bcacf3
Removed conditional language check
Oct 7, 2013
ab08284
Fixed options showing without markup when "Show Article Options" opti…
Oct 7, 2013
01e56e2
Fixed options showing without markup when "Show Article Options" opti…
Oct 7, 2013
9a4f3c1
Fixed a styling issue on hidden fields
Oct 7, 2013
de46a21
Added new file (forgotten in previous commit)
Oct 7, 2013
0265abd
Improved language strings for the setting and added tooltip to the Cl…
beat Oct 7, 2013
0969e01
Improved language strings for Joomla! Extensions Directory to match e…
beat Oct 7, 2013
b456d87
Fixed bootstrap loading of RTL files
beat Oct 7, 2013
0a61974
Fixes for Beez3 sensitivity on Bootstrap CSS loaded
beat Oct 8, 2013
1c3bdfb
Fixed Javascript TypeError
beat Oct 8, 2013
63c2f3b
Made Menu popover bottom to address right-screen border issue
beat Oct 8, 2013
b989f99
$ Updating installation lang files: et-EE, fa-IR, ja-JP, tr-TR, ug-CN,
infograf768 Oct 8, 2013
6b3890d
[JUX2] [01] Moved actions (on hover) dropdown to status buttons: Fixe…
beat Oct 8, 2013
1f708e8
Merge pull request #5 from beat/jux-actions-fix
Oct 8, 2013
37e34c2
$ Adding TinyMCE Swahili language file
infograf768 Oct 8, 2013
fc0382a
Fixed bug: Menu Manager=>Menu item: Single item: Selecting an article…
beat Oct 8, 2013
3f66926
Merge pull request #6 from beat/jux-layout-items
Oct 8, 2013
3829aa0
Fixed bug not take into account the specific views for multilang asso…
beat Oct 8, 2013
ab009e0
Merge pull request #7 from beat/jux-layout-items
Oct 8, 2013
f1157eb
Fixed Apply an Save buttons in Plugin Edit
beat Oct 8, 2013
c1bf92c
Fixed Apply an Save buttons in Plugin Edit (better fix)
beat Oct 8, 2013
426a145
Reversed committed WIP by mistake
beat Oct 8, 2013
d6774c7
Reversed committed WIP by mistake
beat Oct 8, 2013
21bf84a
Merge pull request #8 from beat/jux-layout-items
beat Oct 8, 2013
593547c
Fixed News Feeds edit (numarticles, cache_time and rtl were not in pa…
beat Oct 8, 2013
b2e202f
Fixed News Feeds edit (numarticles, cache_time and rtl were not in pa…
beat Oct 8, 2013
b508d6d
Merge pull request #9 from beat/jux-layout-items
beat Oct 8, 2013
6d39eb4
Merge pull request #2149 from elinw/helpertests
elinw Oct 8, 2013
da0fabd
Merge pull request #2143 from beat/feature-apps-installer-of-installer
Oct 8, 2013
5696d94
[#31347] Introducing HTML5 form fields and attributes - GSOC (Fix #1842)
Achal-Aggarwal Oct 9, 2013
b2b61b6
Merge pull request #2123 from wilsonge/jloadertest
elinw Oct 9, 2013
849b1e5
Delete whitespace at end of line.
elinw Oct 9, 2013
c1856cf
Merge pull request #2125 from beat/jux2-frontend-edit-modules
Oct 9, 2013
0133cda
Merge branch 'master' of https://github.com/joomla/joomla-cms
elinw Oct 9, 2013
da65b02
[#30781] Small changes to jForm and jField to allow for repeatable fo…
wilsonge Oct 9, 2013
94b1782
Code Style
elinw Oct 9, 2013
2c1258a
Merge branch 'master' of https://github.com/joomla/joomla-cms
elinw Oct 9, 2013
5c90c39
Updated to check for array
Oct 9, 2013
920ea3d
Fixed issue with wrong icon size in btn-micro if in btn-group
Oct 9, 2013
4ae14d4
Update to remove wrong empty check
Oct 9, 2013
96316ed
Merge pull request #2175 from dbhurley/master
mbabker Oct 9, 2013
6b4caed
Merge remote-tracking branch 'remotes/upstream/master' into jux-layou…
Oct 9, 2013
a688ea8
Changed placeholder param to hint in xmls to match GSOC commit
Oct 9, 2013
6a7909d
Merge pull request #2162 from nonumber/jux-layout-items
Oct 9, 2013
cae4143
Fixed padding issue on toolbar
Oct 9, 2013
c6ef5c5
Merge remote-tracking branch 'remotes/upstream/master' into jux-topbar
Oct 9, 2013
44ab13e
[#30798] Add logging to Joomla Update
dextercowley Oct 9, 2013
7534446
Merge branch 'jux-topbar' into jux-titlebar
Oct 9, 2013
b694d7c
Merge remote-tracking branch 'remotes/upstream/master' into jux-action
Oct 9, 2013
870478b
Merge pull request #2163 from nonumber/jux-actions
Oct 9, 2013
1452ded
Merge pull request #2118 from nonumber/jux-titlebar
Oct 9, 2013
d71946c
[#31490] Duplicate code reduction in categories views (Fix #1552)
elinw Oct 9, 2013
7dbda4e
[#32207] installer leftovers in the Joomla tmp folder after unsuccess…
beat Oct 9, 2013
736289b
Increment version to beta
mbabker Oct 9, 2013
557d006
Merge branch 'master' of https://github.com/joomla/joomla-cms into hi…
elinw Oct 9, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions administrator/components/com_admin/script.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ class JoomlaInstallerScript
*/
public function update($installer)
{
$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
$options['text_file'] = 'joomla_update.php';
JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror'));
JLog::add(JText::_('COM_JOOMLAUPDATE_UPDATE_LOG_DELETE_FILES'), JLog::INFO, 'Update');

$this->deleteUnexistingFiles();
$this->updateManifestCaches();
$this->updateDatabase();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,6 @@ public function display($tpl = null)
*/
protected function addToolbar()
{
JToolbarHelper::title(JText::_('COM_ADMIN_HELP'), 'help_header.png');
JToolbarHelper::title(JText::_('COM_ADMIN_HELP'), 'support help_header');
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ protected function addToolbar()
{
JFactory::getApplication()->input->set('hidemainmenu', 1);

JToolbarHelper::title(JText::_('COM_ADMIN_VIEW_PROFILE_TITLE'), 'user-profile');
JToolbarHelper::title(JText::_('COM_ADMIN_VIEW_PROFILE_TITLE'), 'user user-profile');
JToolbarHelper::apply('profile.apply');
JToolbarHelper::save('profile.save');
JToolbarHelper::cancel('profile.cancel', 'JTOOLBAR_CLOSE');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ protected function _setSubMenu()
*/
protected function addToolbar()
{
JToolbarHelper::title(JText::_('COM_ADMIN_SYSTEM_INFORMATION'), 'systeminfo.png');
JToolbarHelper::title(JText::_('COM_ADMIN_SYSTEM_INFORMATION'), 'info systeminfo');
JToolbarHelper::help('JHELP_SITE_SYSTEM_INFORMATION');
}
}
4 changes: 2 additions & 2 deletions administrator/components/com_banners/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<field
name="track_impressions"
type="radio"
class="btn-group"
class="btn-group btn-group-yesno"
default="0"
label="COM_BANNERS_FIELD_TRACKIMPRESSION_LABEL"
description="COM_BANNERS_FIELD_TRACKIMPRESSION_DESC">
Expand All @@ -39,7 +39,7 @@
<field
name="track_clicks"
type="radio"
class="btn-group"
class="btn-group btn-group-yesno"
default="0"
label="COM_BANNERS_FIELD_TRACKCLICK_LABEL"
description="COM_BANNERS_FIELD_TRACKCLICK_DESC">
Expand Down
22 changes: 13 additions & 9 deletions administrator/components/com_banners/models/forms/banner.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,25 @@
readonly="true" class="readonly"
label="JGLOBAL_FIELD_ID_LABEL" description ="JGLOBAL_FIELD_ID_DESC" />

<field name="name" type="text" class="inputbox"
<field name="name" type="text"
class="inputbox input-xxlarge input-large-text"
size="40" label="COM_BANNERS_FIELD_NAME_LABEL"
description="COM_BANNERS_FIELD_NAME_DESC" required="true" />

<field name="alias" type="text" class="inputbox"
size="40" label="JFIELD_ALIAS_LABEL"
description="COM_BANNERS_FIELD_ALIAS_DESC" />
description="COM_BANNERS_FIELD_ALIAS_DESC"
hint="JFIELD_ALIAS_PLACEHOLDER" />

<field name="catid" type="categoryedit" extension="com_banners"
label="JCATEGORY" description="COM_BANNERS_FIELD_CATEGORY_DESC"
class="inputbox" required="true"
addfieldpath="/administrator/components/com_categories/models/fields" />

<field name="state" type="list"
label="JSTATUS" description="COM_BANNERS_FIELD_STATE_DESC"
class="inputbox span12 small" size="1" default="1" >
class="chzn-color-state"
size="1" default="1" >
<option value="1">JPUBLISHED</option>
<option value="0">JUNPUBLISHED</option>
<option value="2">JARCHIVED</option>
Expand Down Expand Up @@ -110,10 +113,10 @@
<fieldset name="bannerdetails"
label="COM_BANNERS_GROUP_LABEL_BANNER_DETAILS" >

<field name="sticky" type="list" default="0"
<field name="sticky" type="radio" default="0"
label="COM_BANNERS_FIELD_STICKY_LABEL"
description="COM_BANNERS_FIELD_STICKY_DESC"
class="span12 small" >
class="btn-group btn-group-yesno">
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
Expand Down Expand Up @@ -174,7 +177,8 @@
rows="3" cols="30" label="JFIELD_META_KEYWORDS_LABEL"
description="COM_BANNERS_FIELD_METAKEYWORDS_DESC" />

<field name="own_prefix" type="radio" class="btn-group"
<field name="own_prefix" type="radio"
class="btn-group btn-group-yesno"
label="COM_BANNERS_FIELD_BANNEROWNPREFIX_LABEL"
description="COM_BANNERS_FIELD_BANNEROWNPREFIX_DESC"
default="0">
Expand All @@ -195,11 +199,11 @@
description="COM_BANNERS_FIELD_IMAGE_DESC" />

<field name="width" type="text"
class="inputbox validate-numeric" label="COM_BANNERS_FIELD_WIDTH_LABEL"
class="inputbox input-mini validate-numeric" label="COM_BANNERS_FIELD_WIDTH_LABEL"
description="COM_BANNERS_FIELD_WIDTH_DESC" />

<field name="height" type="text"
class="inputbox validate-numeric" label="COM_BANNERS_FIELD_HEIGHT_LABEL"
class="inputbox input-mini validate-numeric" label="COM_BANNERS_FIELD_HEIGHT_LABEL"
description="COM_BANNERS_FIELD_HEIGHT_DESC" />

<field name="alt" type="text" class="inputbox"
Expand Down
29 changes: 13 additions & 16 deletions administrator/components/com_banners/models/forms/client.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@



<field name="name" type="text" class="inputbox"
size="40" label="COM_BANNERS_FIELD_CLIENT_NAME_LABEL"
<field name="name" type="text"
class="inputbox input-xxlarge input-large-text"
size="40" label="COM_BANNERS_FIELD_NAME_LABEL"
description="COM_BANNERS_FIELD_CLIENT_NAME_DESC"
required="true" />

Expand All @@ -25,7 +26,7 @@

<field name="state" type="list"
label="JSTATUS" description="COM_BANNERS_FIELD_CLIENT_STATE_DESC"
class="inputbox" size="1" default="1"
class="chzn-color-state" size="1" default="1"
>
<option value="1">JPUBLISHED</option>
<option value="0">JUNPUBLISHED</option>
Expand All @@ -52,6 +53,7 @@
</field>

<field name="track_impressions" type="list" default="0"
class="chzn-color"
label="COM_BANNERS_FIELD_TRACKIMPRESSION_LABEL"
description="COM_BANNERS_FIELD_TRACKIMPRESSION_DESC"
>
Expand All @@ -61,6 +63,7 @@
</field>

<field name="track_clicks" type="list" default="0"
class="chzn-color"
label="COM_BANNERS_FIELD_TRACKCLICK_LABEL" description="COM_BANNERS_FIELD_TRACKCLICK_DESC"
>
<option value="">JGLOBAL_USE_GLOBAL</option>
Expand All @@ -78,7 +81,8 @@
rows="3" cols="30" label="JFIELD_META_KEYWORDS_LABEL"
description="COM_BANNERS_FIELD_CLIENT_METAKEYWORDS_DESC" />

<field name="own_prefix" type="radio" class="btn-group"
<field name="own_prefix" type="radio"
class="btn-group btn-group-yesno"
label="COM_BANNERS_FIELD_CLIENTOWNPREFIX_LABEL"
description="COM_BANNERS_FIELD_CLIENTOWNPREFIX_DESC"
default="0"
Expand All @@ -93,18 +97,11 @@

</fieldset>

<fieldset name="extra" label="Banners_Extra">

<field name="version_note"
type="text"
label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
description="JGLOBAL_FIELD_VERSION_NOTE_DESC"
class="inputbox" size="45"
labelclass="control-label"
/>

<field name="extrainfo" type="textarea" class="inputbox"
rows="10" cols="40" label="COM_BANNERS_FIELD_EXTRAINFO_LABEL"
<fieldset name="extra" label="COM_BANNERS_EXTRA">

<field name="extrainfo" type="textarea"
class="inputbox span12"
rows="5" cols="80" label="COM_BANNERS_FIELD_EXTRAINFO_LABEL"
description="COM_BANNERS_FIELD_EXTRAINFO_DESC" />

</fieldset>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<form>
<fieldset name="details">

<field name="compressed" type="radio" class="btn-group"
<field name="compressed" type="radio" class="btn-group btn-group-yesno"
label="COM_BANNERS_FIELD_COMPRESSED_LABEL"
description="COM_BANNERS_FIELD_COMPRESSED_DESC"
default="0"
Expand Down
Loading