-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Branch: refs/heads/master Date: 2015-07-20T13:54:08+02:00 Author: Philip Bauer (pbauer) <bauer@starzel.de> Commit: plone/plone.dexterity@9dde7a4 remove additional class and text in statusmessages Files changed: M plone/dexterity/browser/add.py M plone/dexterity/browser/edit.py Repository: plone.dexterity Branch: refs/heads/master Date: 2015-07-22T10:38:32+02:00 Author: Philip Bauer (pbauer) <bauer@starzel.de> Commit: plone/plone.dexterity@36f0508 changelog Files changed: M CHANGES.rst Repository: plone.dexterity Branch: refs/heads/master Date: 2015-07-22T11:02:36+02:00 Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> Commit: plone/plone.dexterity@a223def Merge pull request #36 from plone/statusmessages remove additional class and text in statusmessages Files changed: M CHANGES.rst M plone/dexterity/browser/add.py M plone/dexterity/browser/edit.py
- Loading branch information
Showing
1 changed file
with
121 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,130 @@ | ||
Repository: mockup | ||
Repository: plone.dexterity | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2015-07-21T20:46:20+02:00 | ||
Date: 2015-07-20T13:54:08+02:00 | ||
Author: Philip Bauer (pbauer) <bauer@starzel.de> | ||
Commit: https://github.com/plone/mockup/commit/88f6bc586be3e8d531aa88f1242f1cb24e27eddc | ||
Commit: https://github.com/plone/plone.dexterity/commit/9dde7a4d8aafcd32d61b358109d8a3b9a96cb3b9 | ||
|
||
make Coluns translatable | ||
remove additional class and text in statusmessages | ||
|
||
Files changed: | ||
M mockup/patterns/structure/js/views/columns.js | ||
|
||
diff --git a/mockup/patterns/structure/js/views/columns.js b/mockup/patterns/structure/js/views/columns.js | ||
index 15cc422..3784ac4 100644 | ||
--- a/mockup/patterns/structure/js/views/columns.js | ||
+++ b/mockup/patterns/structure/js/views/columns.js | ||
@@ -9,7 +9,7 @@ define([ | ||
|
||
var ColumnsView = PopoverView.extend({ | ||
className: 'popover attribute-columns', | ||
- title: _.template('Columns'), | ||
+ title: _.template('<%- _t("Columns") %>'), | ||
content: _.template( | ||
'<label><%- _t("Select columns to show, drag and drop to reorder") %></label>' + | ||
'<ul>' + | ||
M plone/dexterity/browser/add.py | ||
M plone/dexterity/browser/edit.py | ||
|
||
diff --git a/plone/dexterity/browser/add.py b/plone/dexterity/browser/add.py | ||
index d92db51..c5d4fe6 100644 | ||
--- a/plone/dexterity/browser/add.py | ||
+++ b/plone/dexterity/browser/add.py | ||
@@ -106,7 +106,7 @@ def handleAdd(self, action): | ||
# mark only as finished if we get the new object | ||
self._finishedAdd = True | ||
IStatusMessage(self.request).addStatusMessage( | ||
- self.success_message, "info success" | ||
+ self.success_message, "info" | ||
) | ||
|
||
@button.buttonAndHandler(_(u'Cancel'), name='cancel') | ||
diff --git a/plone/dexterity/browser/edit.py b/plone/dexterity/browser/edit.py | ||
index d0ba58a..f891d25 100644 | ||
--- a/plone/dexterity/browser/edit.py | ||
+++ b/plone/dexterity/browser/edit.py | ||
@@ -28,7 +28,7 @@ def handleApply(self, action): | ||
return | ||
self.applyChanges(data) | ||
IStatusMessage(self.request).addStatusMessage( | ||
- self.success_message, "info success" | ||
+ self.success_message, "info" | ||
) | ||
self.request.response.redirect(self.nextURL()) | ||
notify(EditFinishedEvent(self.context)) | ||
|
||
|
||
Repository: plone.dexterity | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2015-07-22T10:38:32+02:00 | ||
Author: Philip Bauer (pbauer) <bauer@starzel.de> | ||
Commit: https://github.com/plone/plone.dexterity/commit/36f0508f88520bed8cb93ce07b8f6586a21d5116 | ||
|
||
changelog | ||
|
||
Files changed: | ||
M CHANGES.rst | ||
|
||
diff --git a/CHANGES.rst b/CHANGES.rst | ||
index 7969d2f..59a94b7 100644 | ||
--- a/CHANGES.rst | ||
+++ b/CHANGES.rst | ||
@@ -4,7 +4,8 @@ Changelog | ||
2.3.3 (unreleased) | ||
------------------ | ||
|
||
-- Nothing changed yet. | ||
+- Remove obsolete css-class and text from statusmessages. | ||
+ [pbauer] | ||
|
||
|
||
2.3.2 (2015-07-18) | ||
|
||
|
||
Repository: plone.dexterity | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2015-07-22T11:02:36+02:00 | ||
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> | ||
Commit: https://github.com/plone/plone.dexterity/commit/a223def8e572f93aa4d365b4fb497e45226a7591 | ||
|
||
Merge pull request #36 from plone/statusmessages | ||
|
||
remove additional class and text in statusmessages | ||
|
||
Files changed: | ||
M CHANGES.rst | ||
M plone/dexterity/browser/add.py | ||
M plone/dexterity/browser/edit.py | ||
|
||
diff --git a/CHANGES.rst b/CHANGES.rst | ||
index 7969d2f..59a94b7 100644 | ||
--- a/CHANGES.rst | ||
+++ b/CHANGES.rst | ||
@@ -4,7 +4,8 @@ Changelog | ||
2.3.3 (unreleased) | ||
------------------ | ||
|
||
-- Nothing changed yet. | ||
+- Remove obsolete css-class and text from statusmessages. | ||
+ [pbauer] | ||
|
||
|
||
2.3.2 (2015-07-18) | ||
diff --git a/plone/dexterity/browser/add.py b/plone/dexterity/browser/add.py | ||
index d92db51..c5d4fe6 100644 | ||
--- a/plone/dexterity/browser/add.py | ||
+++ b/plone/dexterity/browser/add.py | ||
@@ -106,7 +106,7 @@ def handleAdd(self, action): | ||
# mark only as finished if we get the new object | ||
self._finishedAdd = True | ||
IStatusMessage(self.request).addStatusMessage( | ||
- self.success_message, "info success" | ||
+ self.success_message, "info" | ||
) | ||
|
||
@button.buttonAndHandler(_(u'Cancel'), name='cancel') | ||
diff --git a/plone/dexterity/browser/edit.py b/plone/dexterity/browser/edit.py | ||
index d0ba58a..f891d25 100644 | ||
--- a/plone/dexterity/browser/edit.py | ||
+++ b/plone/dexterity/browser/edit.py | ||
@@ -28,7 +28,7 @@ def handleApply(self, action): | ||
return | ||
self.applyChanges(data) | ||
IStatusMessage(self.request).addStatusMessage( | ||
- self.success_message, "info success" | ||
+ self.success_message, "info" | ||
) | ||
self.request.response.redirect(self.nextURL()) | ||
notify(EditFinishedEvent(self.context)) | ||
|
||
|