From 5d8861a49ab5743c8e84aab920383d0b7c5df046 Mon Sep 17 00:00:00 2001
From: vitalets <noginsk@rambler.ru>
Date: Tue, 27 Nov 2012 14:21:08 +0400
Subject: [PATCH] change cancel button
---
CHANGELOG.txt | 1 +
README.md | 2 +-
src/editable-form/editable-form-bootstrap.js | 2 +-
src/editable-form/editable-form-jqueryui.js | 2 +-
src/editable-form/editable-form.css | 8 ++++++--
5 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 07824fc..6b1e46b 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ X-editable changelog
Version 1.1.0 wip
----------------------------
+[enh] added support for IE7+ (vitalets)
[enh #9] 'name' or 'id' is not required anymore (vitalets)
[enh] 'clear' button added in date and dateui (vitalets)
[enh] form template changed: added DIV.editable-input, DIV.editable.buttons and $.fn.editableform buttons (vitalets)
diff --git a/README.md b/README.md
index d8fe40a..1a3ef1a 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Your feedback is very appreciated!
## Contribution
A few steps how to start contributing:
-1.[Fork X-editable](https://github.com/vitalets/x-editable/fork)
+1.[Fork X-editable](https://github.com/vitalets/x-editable/fork) and pull the latest changes from <code>dev</code> branch
2.Arrange local directory structure. It should be:
**x-editable**
diff --git a/src/editable-form/editable-form-bootstrap.js b/src/editable-form/editable-form-bootstrap.js
index d55e3fd..50f72bb 100644
--- a/src/editable-form/editable-form-bootstrap.js
+++ b/src/editable-form/editable-form-bootstrap.js
@@ -15,7 +15,7 @@ Editableform based on Twitter Bootstrap
//buttons
$.fn.editableform.buttons = '<button type="submit" class="btn btn-primary editable-submit"><i class="icon-ok icon-white"></i></button>'+
- '<button type="button" class="btn editable-cancel"><i class="icon-ban-circle"></i></button>';
+ '<button type="button" class="btn editable-cancel"><i class="icon-remove"></i></button>';
//error classes
$.fn.editableform.errorGroupClass = 'error';
diff --git a/src/editable-form/editable-form-jqueryui.js b/src/editable-form/editable-form-jqueryui.js
index b5983c8..804b6d2 100644
--- a/src/editable-form/editable-form-jqueryui.js
+++ b/src/editable-form/editable-form-jqueryui.js
@@ -14,7 +14,7 @@ Editableform based on jQuery UI
text: false
}).removeAttr('title');
this.$form.find('.editable-cancel').button({
- icons: { primary: "ui-icon-cancel" },
+ icons: { primary: "ui-icon-closethick" },
text: false
}).removeAttr('title');
diff --git a/src/editable-form/editable-form.css b/src/editable-form/editable-form.css
index 049eb56..1ff18fe 100644
--- a/src/editable-form/editable-form.css
+++ b/src/editable-form/editable-form.css
@@ -47,11 +47,15 @@
.editable-error-block {
max-width: 300px;
- padding-top: 3px;
- margin: 0;
+ margin: 5px 0 0 0;
width: auto;
}
+/*add padding for jquery ui*/
+.editable-error-block.ui-state-error {
+ padding: 3px;
+}
+
.editable-error {
color: red;
}