Skip to content

[JUX2] [20] Rearranged item edit views in admin #2162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 30 commits into from Oct 9, 2013
Merged

[JUX2] [20] Rearranged item edit views in admin #2162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
6234151
Refactored to be in sync with master
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
a34685f
Merge remote-tracking branch 'remotes/upstream/master' into jux-layou…
Oct 5, 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
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
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
920ea3d
Fixed issue with wrong icon size in btn-micro if in btn-group
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
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions administrator/components/com_banners/config.xml
View file
Open in desktop
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
View file
Open in desktop
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 @@ -102,10 +105,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 @@ -166,7 +169,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 @@ -187,11 +191,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
19 changes: 12 additions & 7 deletions administrator/components/com_banners/models/forms/client.xml
View file
Open in desktop
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,10 +97,11 @@

</fieldset>

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

<field name="extrainfo" type="textarea" class="inputbox"
rows="10" cols="40" label="COM_BANNERS_FIELD_EXTRAINFO_LABEL"
<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
2 changes: 1 addition & 1 deletion administrator/components/com_banners/models/forms/download.xml
View file
Open in desktop
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