Skip to content

Attributes #55

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
max-shamaev merged 1 commit into from
Nov 12, 2012
Merged

Attributes #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/skins/admin/en/attributes/parts/type.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
*}

<div data-class-id="{productClass.getId()}" data-id="{entity.getId()}" />
<widget class="\XLite\View\Button\Submit" style="edit-attribute" label="{t(#Edit attribute#)}" />
<a href="javascript: void(0);" class="edit-attribute" label="{t(#Edit attribute#)}"><span>{t(#Edit attribute#)}</span></a>
{t(entity.getTypes(entity.getType()))}
</div>
4 changes: 3 additions & 1 deletion src/skins/admin/en/attributes/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ popup.postprocessRequest = function(XMLHttpRequest, textStatus, data, isValid) {
}
}
);

jQuery('.ajax-container-loadable form.attribute', this.base).commonController('submitOnlyChanged', false);
}

jQuery().ready(
Expand All @@ -42,7 +44,7 @@ jQuery().ready(
);
}
);
jQuery('button.new-attribute, button.edit-attribute').click(
jQuery('button.new-attribute, a.edit-attribute').click(
function () {
return !popup.load(
URLHandler.buildURL({
Expand Down
34 changes: 20 additions & 14 deletions src/skins/admin/en/attributes/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,27 +165,33 @@ div.group table.list th.actions.left {
}

.edit-attribute {
background: url("../images/tri_right_button.png") no-repeat scroll right top transparent;
padding: 0 11px 0 0;
border: none;
border-radius: 0;
background: url("../images/tri_right_button.png") no-repeat right top transparent;
padding-right: 13px;
display: none;
margin: 0 5px 0 0;
height: 26px;
line-height: 26px;
}
.edit-mark .edit-attribute {
display: inline;
display: inline-block;
}
.edit-attribute span {
background-color: #eff9fe;
border: 1px solid #CADCE8;
border-bottom-left-radius: 3px;
border-right: 0 none;
-moz-top-left-border-radius: 3px;
-moz-bottom-left-border-radius: 3px;
-webkit-top-left-border-radius: 3px;
-webkit-bottom-left-border-radius: 3px;
border-top-left-radius: 3px;
padding: 5px 0 5px 10px;
background-color: #EFF8FE;
color: #154E9C;
border-bottom-left-radius: 3px;
padding-left: 10px;
line-height: 24px;
background-color: #eff8fe;
color: #154e9c;
border: 1px solid #cadce8;
border-right: 0 none;
display: inline-block;
}

.items-list-table table.list tbody.lines td .edit-attribute,
.items-list-table table.list tbody.lines td .edit-attribute span {
vertical-align: top;
}

.ajax-container-loadable .model-properties ul.table div.table-label label {
Expand Down