Skip to content

Commit

Permalink
Merge pull request #40 from plone/barceloneta
Browse files Browse the repository at this point in the history 
Barceloneta
  • Loading branch information
@bloodbare
bloodbare committed Oct 9, 2014
2 parents 54778c7 + cbca806 commit 14300cf
Show file tree
Hide file tree
Showing 13 changed files with 162 additions and 200 deletions.
12 changes: 2 additions & 10 deletions plone/app/portlets/browser/templates/error_message.pt
View file
Expand Up @@ -6,20 +6,12 @@
i18n:domain="plone">

<header class="portletHeader">
<span class="portletTopLeft"></span>
<a href="#"
class="tile"
i18n:translate="box_error">Error</a>
<span class="portletTopRight"></span>
</header>

<section class="portletContent" i18n:translate="text_error_rendering_portlet">
There was an error while rendering the portlet.
<section class="portletContent">
<p i18n:translate="text_error_rendering_portlet">There was an error while rendering the portlet.</p>
</section>

<footer class="portletFooter">
<span class="portletBottomLeft"></span>
<span class="portletBottomRight"></span>
</footer>
</section>
</html>
4 changes: 2 additions & 2 deletions plone/app/portlets/browser/templates/manage-dashboard.pt
View file
Expand Up @@ -59,7 +59,7 @@
Portal status message
</div>

<div id="content">
<article id="content">

<h1 class="documentFirstHeading" i18n:translate="title_edit_dashboard">
Edit your dashboard
Expand All @@ -79,7 +79,7 @@
<div class="visualClear"><!-- --></div>
</div>

</div>
</article>
</tal:main-macro>

</metal:main>
Expand Down
4 changes: 2 additions & 2 deletions plone/app/portlets/browser/templates/manage-group-dashboard.pt
View file
Expand Up @@ -55,7 +55,7 @@
Portal status message
</div>

<div id="content">
<article id="content">

<h1 class="documentFirstHeading" i18n:translate="title_edit_dashboard_group">
Edit Dashboard Portlets for <span i18n:name="group" tal:content="view/group" />
Expand Down Expand Up @@ -83,7 +83,7 @@
<div class="visualClear"><!-- --></div>
</div>

</div>
</article>

</tal:main-macro>

Expand Down
4 changes: 2 additions & 2 deletions plone/app/portlets/browser/templates/manage-group.pt
View file
Expand Up @@ -55,7 +55,7 @@
Portal status message
</div>

<div id="content">
<article id="content">

<metal:block metal:define-macro="props" tal:omit-tag="">

Expand Down Expand Up @@ -86,7 +86,7 @@

</metal:block>

</div>
</article>

</metal:main>
</body>
Expand Down
54 changes: 26 additions & 28 deletions plone/app/portlets/portlets/actions.pt
View file
Expand Up @@ -4,43 +4,41 @@
tal:omit-tag=""
i18n:domain="plone">

<section class="portlet portletActions"
<section class="portlet portletActions" role="section"
tal:define="portal_url context/@@plone_portal_state/portal_url;">

<header class="portletHeader" tal:condition="view/showTitle">
<span class="portletTopLeft"></span>
<span tal:condition="view/title" tal:content="view/title">
Title
</span>
<span class="portletTopRight"></span>
</header>
<section class="portletContent">
<ul>
<tal:loop tal:repeat="link view/actionLinks">
<li class="portletItem"
tal:define="icon nocall:link/icon">
<a href="#"
tal:define="modal link/modal|nothing"
tal:attributes="href link/url;
class python:'pat-modal' if modal else None;
data-pat-modal python:modal if modal else None;">

<ul class="portletContent">
<tal:loop tal:repeat="link view/actionLinks">
<li class="portletItem"
tal:define="icon nocall:link/icon">
<a href="#"
tal:define="modal link/modal|nothing"
tal:attributes="href link/url;
class python:'pat-modal' if modal else None;
data-pat-modal python:modal if modal else None;">
<span tal:condition="not:icon"
tal:content="link/title">
Action
</span>

<span tal:condition="not:icon"
tal:content="link/title">
Action
</span>

<span tal:condition="icon"
tal:content="link/title"
tal:define="icon_url icon/absolute_url|icon"
tal:attributes="style string:background-image:url($icon_url);;">
Action
</span>

</a>
</li>
</tal:loop>
</ul>
<span tal:condition="icon"
tal:content="link/title"
tal:define="icon_url icon/absolute_url|icon"
tal:attributes="style string:background-image:url($icon_url);;">
Action
</span>

</a>
</li>
</tal:loop>
</ul>
</section>
</section>
</html>
11 changes: 4 additions & 7 deletions plone/app/portlets/portlets/language.pt
View file
@@ -1,13 +1,11 @@
<tal:block i18n:domain="plone">

<section class="portlet portletLanguage">
<section class="portlet portletLanguage" role="section">
<header class="portletHeader">
<span class="portletTopLeft"></span>
<span class="tile" i18n:translate="box_languages">Languages</span>
<span class="portletTopRight"></span>
</header>

<ul class="portletContent" tal:define="showFlags view/showFlags">
<section class="portletContent">
<ul tal:define="showFlags view/showFlags">
<li class="portletItem" tal:repeat="lang view/languages">
<span tal:define="code lang/code;
selected lang/selected"
Expand All @@ -32,8 +30,7 @@
</span>
</li>
</ul>
</section>

<span class="portletBottomLeft"></span>
<span class="portletBottomRight"></span>
</section>
</tal:block>
40 changes: 20 additions & 20 deletions plone/app/portlets/portlets/login.pt
View file
@@ -1,20 +1,17 @@
<tal:block condition="view/show"
i18n:domain="plone">

<section class="portlet portletLogin"
<section class="portlet portletLogin" role="section"
tal:condition="view/available">

<header class="portletHeader">
<span class="portletTopLeft"></span>
<a href="#"
class="tile"
tal:attributes="href view/login_form"
i18n:translate="box_sign_in">Log in</a>
<span class="portletTopRight"></span>
</header>

<ul class="portletContent">
<li class="portletItem odd"
<section class="portletContent">
<div
tal:define="ac_name view/login_name;
ac_password view/login_password">
<form action="login_form"
Expand Down Expand Up @@ -73,11 +70,15 @@
i18n:attributes="alt label_password;"/>
</div>

<div i18n:translate="enable_cookies_message_before_login"
class="cookiesMessage portalMessage"
style="display:none">
Cookies are not enabled. You must enable cookies before you
can log in.
<div class="cookiesMessage portalMessage warning"
style="display:none" role="alert">
<strong i18n:translate="">
Warning
</strong>
<span i18n:translate="enable_cookies_message_before_login">
Cookies are not enabled. You must enable cookies before you
can log in.
</span>
</div>

<div class="formControls">
Expand All @@ -90,28 +91,27 @@
i18n:attributes="value label_log_in; alt label_log_in;"/>
</div>
</form>
</li>

<li class="portletItem even" tal:condition="view/can_request_password">
</div>
</section>
<footer class="portletFooter">
<div tal:condition="view/can_request_password">
<a href="mail_password_form"
class="tile"
tal:attributes="href view/mail_password_form">
<tal:block replace="structure context/info_icon.png"/>
<span tal:omit-tag="" i18n:translate="box_forgot_password_option">Forgot your password?</span>
</a>
</li>
</div>

<li class="portletItem lastItem" tal:condition="view/can_register">
<div tal:condition="view/can_register">
<a href=""
class="tile"
tal:attributes="href view/join_action">
<tal:block replace="structure context/user.png"/>
<span tal:omit-tag="" i18n:translate="box_new_user_option">New user?</span>
</a>
<span class="portletBottomLeft"></span>
<span class="portletBottomRight"></span>
</li>
</ul>
</div>
</footer>
</section>

<section class="portlet portletLogin"
Expand Down
8 changes: 2 additions & 6 deletions plone/app/portlets/portlets/navigation.pt
View file
Expand Up @@ -5,16 +5,14 @@

<header class="portletHeader"
tal:attributes="class python:view.hasName() and 'portletHeader' or 'portletHeader hiddenStructure'">
<span class="portletTopLeft"></span>
<a href="#"
class="tile"
tal:attributes="href string:${view/heading_link_target}"
tal:content="view/title"
i18n:translate="">Navigation</a>
<span class="portletTopRight"></span>
</header>

<div class="portletContent lastItem">
<nav class="portletContent lastItem">
<ul class="navTree navTreeLevel0">
<li tal:define="selectedClass view/root_item_class;
li_class python:selectedClass and ' navTreeCurrentNode' or '';
Expand Down Expand Up @@ -44,8 +42,6 @@
SUBTREE
</li>
</ul>
<span class="portletBottomLeft"></span>
<span class="portletBottomRight"></span>
</div>
</nav>
</section>
</tal:block>
54 changes: 24 additions & 30 deletions plone/app/portlets/portlets/news.pt
View file
Expand Up @@ -2,58 +2,52 @@
xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:i18n="http://xml.zope.org/namespaces/i18n"
tal:omit-tag="">
<section class="portlet portletNews"
<section class="portlet portletNews" role="section"
i18n:domain="plone">

<header class="portletHeader">
<span class="portletTopLeft"></span>
<a href="#"
class="tile"
tal:define="all_news_link view/all_news_link"
tal:omit-tag="not:all_news_link"
tal:attributes="href all_news_link"
i18n:translate="box_news">News</a>
<span class="portletTopRight"></span>
</header>
<section class="portletContent">
<ul>
<tal:newsitems tal:define="toLocalizedTime nocall:context/@@plone/toLocalizedTime;
plone_view context/@@plone;
getIcon nocall:plone_view/getIcon;"
tal:repeat="obj view/published_news_items">
<li tal:define="oddrow repeat/obj/odd;
item_icon python:getIcon(obj);"
tal:attributes="class python:oddrow and 'portletItem even' or 'portletItem odd'">

<ul class="portletContent">
<tal:newsitems tal:define="toLocalizedTime nocall:context/@@plone/toLocalizedTime;
plone_view context/@@plone;
getIcon nocall:plone_view/getIcon;"
tal:repeat="obj view/published_news_items">
<li tal:define="oddrow repeat/obj/odd;
item_icon python:getIcon(obj);"
tal:attributes="class python:oddrow and 'portletItem even' or 'portletItem odd'">

<a href=""
class="tile"
tal:attributes="href obj/getURL;
title obj/Description">
<img tal:replace="structure item_icon/html_tag" />
<span tal:replace="obj/pretty_title_or_id">
<a href=""
class="tile"
tal:attributes="href obj/getURL;
title obj/Description">
<img tal:replace="structure item_icon/html_tag" />
<span tal:replace="obj/pretty_title_or_id">
Plone 2.1 announced!
</span>
</a>
<span class="portletItemDetails"
tal:content="python:toLocalizedTime(obj.Date)">May 5</span>

</li>
</tal:newsitems>
</ul>
</span>
</a>
<time class="portletItemDetails"
tal:content="python:toLocalizedTime(obj.Date)">May 5</time>

</li>
</tal:newsitems>
</ul>
</section>
<footer class="portletFooter"
tal:condition="view/all_news_link">
<span class="portletBottomLeft"></span>
<a href=""
tal:attributes="href view/all_news_link"
i18n:translate="box_more_news_link">
More news&hellip;
</a>
<span class="portletBottomRight"></span>
</footer>
<footer class="portletFooter" condition="not:view/all_news_link">
<span class="portletBottomLeft"></span>
<span class="portletBottomRight"></span>
</footer>
</section>
</html>

1 comment on commit 14300cf

@mister-roboto
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TESTS PASSED
Mr.Roboto url : http://jenkins.plone.org/roboto/get_info?push=72d74545e0084b21aad9f6d93995582c
[SUCCESS] kgs-plone.app.portlets-plone-5.0-python-2.7 kgs

Please sign in to comment.