Skip to content

Commit

Permalink
Add three vertical layouts, of width 1/3, 1/2 and 2/3 of page width.
Browse files Browse the repository at this point in the history
  • Loading branch information
malthe committed May 16, 2012
1 parent ad308a3 commit a1c3b51
Show file tree
Hide file tree
Showing 7 changed files with 77 additions and 19 deletions.
3 changes: 3 additions & 0 deletions CHANGES.rst
Expand Up @@ -5,6 +5,9 @@ In next release ..


Features: Features:


- Added three new vertical layouts, assigned respectively 1/3, 1/2 and
2/3 page width.

- Added option to select standard, double or triple spacing, all of - Added option to select standard, double or triple spacing, all of
which are given as a percentage of the page width. which are given as a percentage of the page width.


Expand Down
26 changes: 22 additions & 4 deletions src/collective/panels/configure.zcml
Expand Up @@ -161,28 +161,46 @@


<browser:panel <browser:panel
name="left" name="left"
title="B" title="B1"
template="templates/left.pt" template="templates/left.pt"
/> />


<browser:panel <browser:panel
name="right" name="right"
title="C" title="B2"
template="templates/right.pt" template="templates/right.pt"
/> />


<browser:panel <browser:panel
name="one-third-left" name="one-third-left"
title="D" title="C1"
template="templates/onethirdleft.pt" template="templates/onethirdleft.pt"
/> />


<browser:panel <browser:panel
name="one-third-right" name="one-third-right"
title="E" title="C2"
template="templates/onethirdright.pt" template="templates/onethirdright.pt"
/> />


<browser:panel
name="split-one-third"
title="D1"
template="templates/splitonethird.pt"
/>

<browser:panel
name="split-half"
title="D2"
template="templates/splithalf.pt"
/>

<browser:panel
name="split-two-thirds"
title="D3"
template="templates/splittwothirds.pt"
/>

<!-- Browser resources --> <!-- Browser resources -->


<browser:resource <browser:resource
Expand Down
27 changes: 13 additions & 14 deletions src/collective/panels/display.pt
@@ -1,24 +1,23 @@
<div class="panels" i18n:domain="collective.panels"> <div class="panels" i18n:domain="collective.panels">
<tal:panels repeat="panel view/panels"> <tal:panels repeat="panel view/panels">
<tal:display define="html panel/@@display"> <tal:render define="html panel/@@display">
<div class="panel-content"
tal:attributes="class string:panel panel-${repeat/panel/index}" <div tal:attributes="class string:panel panel-${repeat/panel/index}"
tal:condition="html" tal:condition="html"
tal:content="structure html" tal:content="structure html"
/> />


<dl class="portalMessage info" <tal:manage condition="view/can_manage">
tal:condition="python: not html.strip() and view.can_manage"> <dl class="portalMessage info"
<dt i18n:translate="">Info</dt> tal:condition="python: not html.strip() and view.can_manage">
<dd i18n:translate="">This panel is empty.</dd> <dt i18n:translate="">Info</dt>
</dl> <dd i18n:translate="">This panel is empty.</dd>
</tal:display> </dl>

<div class="visualClear"></div>


<tal:manage condition="view/can_manage" <div class="visualClear"></div>
content="structure panel/@@manage" <div tal:content="structure panel/@@manage" />
/> </tal:manage>
</tal:render>


</tal:panels> </tal:panels>
</div> </div>
10 changes: 9 additions & 1 deletion src/collective/panels/styles.css
@@ -1,3 +1,7 @@
.panel {
display: inline;
}

.panels .row { .panels .row {
float: left; float: left;
width: 100%; width: 100%;
Expand All @@ -18,6 +22,10 @@
font-weight: bold !important; font-weight: bold !important;
} }


.add-panel {
width: 75%;
}

.add-panel dd { .add-panel dd {
margin: 0 !important; margin: 0 !important;
line-height: 4em; line-height: 4em;
Expand All @@ -37,7 +45,7 @@
border: 1px solid #999966 !important; border: 1px solid #999966 !important;
margin-right: 1em; margin-right: 1em;
margin-bottom: 1em; margin-bottom: 1em;
width: 10%; width: 7em;
background-color: #FFFFE3; background-color: #FFFFE3;
} }


Expand Down
10 changes: 10 additions & 0 deletions src/collective/panels/templates/splithalf.pt
@@ -0,0 +1,10 @@
<div class="row"
tal:attributes="style string:width: ${width}%;; float: left;; margin-left: 1.125%;; margin-right: ${spacing}%"
tal:define="portlets portlets | python: ('&darr;', );
spacing spacing | python: 1.125;
width python: 50 - spacing - 1.125"
tal:condition="portlets">
<div class="cell" style="float: none; left: 0" tal:repeat="portlet portlets">
<div tal:content="structure portlet" />
</div>
</div>
10 changes: 10 additions & 0 deletions src/collective/panels/templates/splitonethird.pt
@@ -0,0 +1,10 @@
<div class="row"
tal:attributes="style string:width: ${width}%;; float: left;; margin-left: 1.125%;; margin-right: ${spacing}%"
tal:define="portlets portlets | python: ('&darr;', );
spacing spacing | python: 1.125;
width python: 33.332 - spacing - 1.125"
tal:condition="portlets">
<div class="cell" style="float: none; left: 0" tal:repeat="portlet portlets">
<div tal:content="structure portlet" />
</div>
</div>
10 changes: 10 additions & 0 deletions src/collective/panels/templates/splittwothirds.pt
@@ -0,0 +1,10 @@
<div class="row"
tal:attributes="style string:width: ${width}%;; float: left;; margin-left: 1.125%;; margin-right: ${spacing}%"
tal:define="portlets portlets | python: ('&darr;', );
spacing spacing | python: 1.125;
width python: 66.667 - spacing - 1.125"
tal:condition="portlets">
<div class="cell" style="float: none; left: 0" tal:repeat="portlet portlets">
<div tal:content="structure portlet" />
</div>
</div>

0 comments on commit a1c3b51

Please sign in to comment.