You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2017/03/17 16:37:15 UTC
svn commit: r1787444 - in /myfaces/tobago/branches/TOBAGO-1719: ./
tobago-example/tobago-example-demo/src/main/webapp/main.xhtml
Author: lofwyr
Date: Fri Mar 17 16:37:15 2017
New Revision: 1787444
URL: http://svn.apache.org/viewvc?rev=1787444&view=rev
Log:
Merged from trunk
nicer look of the demo menu on small devices [from revision 1787443]
Modified:
myfaces/tobago/branches/TOBAGO-1719/ (props changed)
myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml
Propchange: myfaces/tobago/branches/TOBAGO-1719/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 17 16:37:15 2017
@@ -1,4 +1,4 @@
/myfaces/tobago/branches/tobago-1.5.x:1356585,1357124
/myfaces/tobago/branches/tobago-3.0.x:1781306,1781310,1781380
/myfaces/tobago/branches/tobago-tree-table:1226794-1341423
-/myfaces/tobago/trunk:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1602151,1602154,1602343,1604224,1606201,1607642,1609696-1609697,1609718,1610942,1610948,1610970,1610989,1611011,1611259,1611264,1611276,1611329,1611338-1611339,1611571,1613015,1613032,1614827,1614853,1615053,1615114,1615121,1617310,1619789,1621101,1621107,1621134,1621156,1621264,1621282,1621332,1622222,1622243,1622508,1623934,1624033,1625968,1625972,1626270,1628899,1628953,1636842,1636911,1640117,1640147,1640541,1640548,1640638,1640761,1640917,1641575,1641635,1641772,1641775,1641777,1656502,1656507,1657180,1657269,1657276,1657279,1658343,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665486,1665521,1665549,1665569-1665570,1666464,1667304,1667306-1667307,1667309,1668147,1668153,1668249,1675330,1675565,1675584,1675588-1675589,1675636,1676030,1676035,1676038,1679031,1680197,1681981,1682187,1682448,1682545,1682548,1683231,1683306,1683373,1683664
,1686204,1687354,1693426,1696720,1698292,1698297,1700742,1700795,1701249,1701251,1701256,1701980,1709006,1725894,1726691,1726986,1727161,1731050-1731051,1731054,1731057,1731218-1731219,1787403,1787422
+/myfaces/tobago/trunk:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1602151,1602154,1602343,1604224,1606201,1607642,1609696-1609697,1609718,1610942,1610948,1610970,1610989,1611011,1611259,1611264,1611276,1611329,1611338-1611339,1611571,1613015,1613032,1614827,1614853,1615053,1615114,1615121,1617310,1619789,1621101,1621107,1621134,1621156,1621264,1621282,1621332,1622222,1622243,1622508,1623934,1624033,1625968,1625972,1626270,1628899,1628953,1636842,1636911,1640117,1640147,1640541,1640548,1640638,1640761,1640917,1641575,1641635,1641772,1641775,1641777,1656502,1656507,1657180,1657269,1657276,1657279,1658343,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665486,1665521,1665549,1665569-1665570,1666464,1667304,1667306-1667307,1667309,1668147,1668153,1668249,1675330,1675565,1675584,1675588-1675589,1675636,1676030,1676035,1676038,1679031,1680197,1681981,1682187,1682448,1682545,1682548,1683231,1683306,1683373,1683664
,1686204,1687354,1693426,1696720,1698292,1698297,1700742,1700795,1701249,1701251,1701256,1701980,1709006,1725894,1726691,1726986,1727161,1731050-1731051,1731054,1731057,1731218-1731219,1787403,1787422,1787443
Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml?rev=1787444&r1=1787443&r2=1787444&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml (original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml Fri Mar 17 16:37:15 2017
@@ -37,39 +37,39 @@
<ui:include src="/menu.xhtml"/>
- <!--<tc:segmentLayout large="#{tc:columnPartition(navigationState.viewSource ? '8;4' : '12')}">-->
+ <tc:segmentLayout large="#{tc:columnPartition(navigationState.viewSource ? '8;4' : '12')}">
- <!--<tc:flexLayout columns="auto;30px;*">-->
+ <tc:panel><!-- xxx this panel is needed currently because of a bug -->
- <tc:panel>
- <ui:include src="/navigation.xhtml"/>
- </tc:panel>
- <!--<tc:panel/>-->
+ <tc:segmentLayout large="2;10" medium="3;9" small="4;8" extraSmall="12">
- <tc:flexLayout rows="auto;*">
+ <tc:panel>
+ <ui:include src="/navigation.xhtml"/>
+ </tc:panel>
- <tc:messages id="messages" orderBy="severity"
- rendered="#{!navigationTree.outputPage and !navigationTree.messagesPage}"/>
+ <tc:flexLayout rows="auto;*">
- <tc:section label="#{title}" id="content">
- <tc:form id="mainForm">
- <ui:insert/>
- </tc:form>
- </tc:section>
+ <tc:messages id="messages" orderBy="severity"
+ rendered="#{!navigationTree.outputPage and !navigationTree.messagesPage}"/>
- </tc:flexLayout>
+ <tc:section label="#{title}" id="content">
+ <tc:form id="mainForm">
+ <ui:insert/>
+ </tc:form>
+ </tc:section>
- <!--</tc:flexLayout>-->
+ </tc:flexLayout>
+
+ </tc:segmentLayout>
+ </tc:panel>
-<!--
<tc:panel rendered="#{navigationState.viewSource}">
<pre><code class="language-markup" id="demo-view-source">
<tc:out value="#{navigationTree.source}"/>
</code></pre>
</tc:panel>
--->
- <!--</tc:segmentLayout>-->
+ </tc:segmentLayout>
<tc:footer fixed="true">
© 2017 Apache Software Foundation, Licensed under the <a