Skip to content

Commit

Permalink
[fc] Repository: plone.app.workflow
Browse files Browse the repository at this point in the history 
Branch: refs/heads/master
Date: 2021-01-21T14:52:45-03:00
Author: Franco Pellegrini (frapell) <[email protected]>
Commit: plone/plone.app.workflow@af30107

Missed these 2 icons for gh-25

Files changed:
M plone/app/workflow/browser/sharing.pt
Repository: plone.app.workflow

Branch: refs/heads/master
Date: 2021-01-22T13:42:21+01:00
Author: Jens W. Klein (jensens) <[email protected]>
Commit: plone/plone.app.workflow@2eb9942

Merge pull request #27 from plone/frapell-sharing-view-2

Missed these 2 icons for gh-25

Files changed:
M plone/app/workflow/browser/sharing.pt
  • Loading branch information
@jensens
jensens committed Jan 22, 2021
1 parent 2e897e6 commit d06c25e
Showing 1 changed file with 9 additions and 11 deletions.
20 changes: 9 additions & 11 deletions last_commit.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,31 @@ Repository: plone.app.workflow


Branch: refs/heads/master
Date: 2021-01-20T18:32:58-03:00
Date: 2021-01-21T14:52:45-03:00
Author: Franco Pellegrini (frapell) <[email protected]>
Commit: https://github.com/plone/plone.app.workflow/commit/ddbc47bf2e49235c6684bd52935ff600930801f0
Commit: https://github.com/plone/plone.app.workflow/commit/af30107db5667fd459d7642bfd9fe75d2fadb040

Have the icons from the sharing tab to have their URL relative to the site root. closes gh-25
Missed these 2 icons for gh-25

Files changed:
A news/25.feature
M plone/app/workflow/browser/sharing.pt

b'diff --git a/news/25.feature b/news/25.feature\nnew file mode 100644\nindex 0000000..fb1ed4f\n--- /dev/null\n+++ b/news/25.feature\n@@ -0,0 +1,2 @@\n+Have the icons from the sharing tab to have their URL relative to the site root\n+[frapell]\ndiff --git a/plone/app/workflow/browser/sharing.pt b/plone/app/workflow/browser/sharing.pt\nindex 7f9cfb5..5d785e8 100644\n--- a/plone/app/workflow/browser/sharing.pt\n+++ b/plone/app/workflow/browser/sharing.pt\n@@ -127,8 +127,8 @@\n <td class="listingCheckbox"\n tal:repeat="role available_roles">\n <tal:block define="entry_role python:entry[\'roles\'][role[\'id\']]">\n- <img tal:condition="python:entry_role == \'global\'" tal:replace="structure context/site_icon.png" />\n- <img tal:condition="python:entry_role == \'acquired\'" tal:replace="structure context/confirm_icon.png" />\n+ <img tal:condition="python:entry_role == \'global\'" tal:replace="structure portal/site_icon.png" />\n+ <img tal:condition="python:entry_role == \'acquired\'" tal:replace="structure portal/confirm_icon.png" />\n <tal:block condition="python:entry_role in (True, False)">\n <input class="noborder"\n type="checkbox"\n@@ -165,10 +165,10 @@\n be valid.\n In the overview, the symbol\n <img i18n:name="image_confirm_icon"\n- tal:replace="structure context/confirm_icon.png" />\n+ tal:replace="structure portal/confirm_icon.png" />\n indicates an inherited value. Similarly, the symbol\n <img i18n:name="image_link_icon"\n- tal:replace="structure context/site_icon.png" />\n+ tal:replace="structure portal/site_icon.png" />\n indicates a global role, which is managed by the site administrator.\n </div>\n </div>\n'
b'diff --git a/plone/app/workflow/browser/sharing.pt b/plone/app/workflow/browser/sharing.pt\nindex 5d785e8..b3f8213 100644\n--- a/plone/app/workflow/browser/sharing.pt\n+++ b/plone/app/workflow/browser/sharing.pt\n@@ -95,8 +95,8 @@\n sticky python:entry[\'id\'] in view.STICKY"\n tal:attributes="class python:oddrow and \'odd\' or \'even\'">\n <td tal:attributes="title entry/id">\n- <img tal:condition="is_group" tal:replace="structure context/group.png" />\n- <img tal:condition="not:is_group" tal:replace="structure context/user.png" />\n+ <img tal:condition="is_group" tal:replace="structure portal/group.png" />\n+ <img tal:condition="not:is_group" tal:replace="structure portal/user.png" />\n \n <a tal:omit-tag="python:not is_group or not can_view_groups or entry.get(\'id\') == \'AuthenticatedUsers\'"\n tal:attributes="href string:${portal_url}/@@usergroup-groupmembership?groupname=${entry/id}">\n'

Repository: plone.app.workflow


Branch: refs/heads/master
Date: 2021-01-21T13:09:21+01:00
Date: 2021-01-22T13:42:21+01:00
Author: Jens W. Klein (jensens) <[email protected]>
Commit: https://github.com/plone/plone.app.workflow/commit/80fde757bd42150c168f178dfb3636378a4b075b
Commit: https://github.com/plone/plone.app.workflow/commit/2eb99420cd4bd864cb3274b54caf54e6db2fdb25

Merge pull request #26 from plone/frapell-sharing-view
Merge pull request #27 from plone/frapell-sharing-view-2

Have the icons from the sharing tab to have their URL relative to the site root
Missed these 2 icons for gh-25

Files changed:
A news/25.feature
M plone/app/workflow/browser/sharing.pt

b'diff --git a/news/25.feature b/news/25.feature\nnew file mode 100644\nindex 0000000..fb1ed4f\n--- /dev/null\n+++ b/news/25.feature\n@@ -0,0 +1,2 @@\n+Have the icons from the sharing tab to have their URL relative to the site root\n+[frapell]\ndiff --git a/plone/app/workflow/browser/sharing.pt b/plone/app/workflow/browser/sharing.pt\nindex 7f9cfb5..5d785e8 100644\n--- a/plone/app/workflow/browser/sharing.pt\n+++ b/plone/app/workflow/browser/sharing.pt\n@@ -127,8 +127,8 @@\n <td class="listingCheckbox"\n tal:repeat="role available_roles">\n <tal:block define="entry_role python:entry[\'roles\'][role[\'id\']]">\n- <img tal:condition="python:entry_role == \'global\'" tal:replace="structure context/site_icon.png" />\n- <img tal:condition="python:entry_role == \'acquired\'" tal:replace="structure context/confirm_icon.png" />\n+ <img tal:condition="python:entry_role == \'global\'" tal:replace="structure portal/site_icon.png" />\n+ <img tal:condition="python:entry_role == \'acquired\'" tal:replace="structure portal/confirm_icon.png" />\n <tal:block condition="python:entry_role in (True, False)">\n <input class="noborder"\n type="checkbox"\n@@ -165,10 +165,10 @@\n be valid.\n In the overview, the symbol\n <img i18n:name="image_confirm_icon"\n- tal:replace="structure context/confirm_icon.png" />\n+ tal:replace="structure portal/confirm_icon.png" />\n indicates an inherited value. Similarly, the symbol\n <img i18n:name="image_link_icon"\n- tal:replace="structure context/site_icon.png" />\n+ tal:replace="structure portal/site_icon.png" />\n indicates a global role, which is managed by the site administrator.\n </div>\n </div>\n'
b'diff --git a/plone/app/workflow/browser/sharing.pt b/plone/app/workflow/browser/sharing.pt\nindex 5d785e8..b3f8213 100644\n--- a/plone/app/workflow/browser/sharing.pt\n+++ b/plone/app/workflow/browser/sharing.pt\n@@ -95,8 +95,8 @@\n sticky python:entry[\'id\'] in view.STICKY"\n tal:attributes="class python:oddrow and \'odd\' or \'even\'">\n <td tal:attributes="title entry/id">\n- <img tal:condition="is_group" tal:replace="structure context/group.png" />\n- <img tal:condition="not:is_group" tal:replace="structure context/user.png" />\n+ <img tal:condition="is_group" tal:replace="structure portal/group.png" />\n+ <img tal:condition="not:is_group" tal:replace="structure portal/user.png" />\n \n <a tal:omit-tag="python:not is_group or not can_view_groups or entry.get(\'id\') == \'AuthenticatedUsers\'"\n tal:attributes="href string:${portal_url}/@@usergroup-groupmembership?groupname=${entry/id}">\n'

0 comments on commit d06c25e

Please sign in to comment.