Merge branch 'master' of github.com:phpDocumentor/template.responsive

mvriel · mvriel · commit 5cc453d7946c · 2013-12-05T09:50:30.000+01:00
diff --git a/css/template.css b/css/template.css
@@ -340,12 +340,6 @@ i.icon-custom
     display: none;
 }
 
-.btn-group.view
-{
-    margin-left: 20px;
-    margin-bottom: 20px;
-}
-
 .visibility button
 {
     height: 24px;
@@ -437,6 +431,14 @@ div.labels
     font-size: 13px;
 }
 
+.nav-list .nav-header .side-nav-header
+{
+    font-weight: bold;
+    line-height: 18px;
+    color: #999999;
+    text-transform: uppercase;
+}
+
 .detail-description code {
     white-space: pre;
     display:     inline-block;
@@ -501,7 +503,7 @@ div.labels
     {
         font-size: 0.80em;
         margin-bottom: 7px;
-        display: block;
+        display: inline-block;
         float: right;
     }
 }
diff --git a/elements/class.xsl b/elements/class.xsl
@@ -4,22 +4,24 @@
     <!-- Sidebar index for classes and interfaces -->
         <xsl:template match="/project/file/class|/project/file/interface" mode="sidebar">
         <!-- Visibility toggles -->
-        <span class="btn-group visibility" data-toggle="buttons-checkbox">
-          <button class="btn public active" title="Show public elements">Public</button>
-          <button class="btn protected" title="Show protected elements">Protected</button>
-          <button class="btn private" title="Show private elements">Private</button>
-          <button class="btn inherited active" title="Show inherited elements">Inherited</button>
-        </span>
-
-        <div class="btn-group view pull-right" data-toggle="buttons-radio">
-          <button class="btn details" title="Show descriptions and method names"><i class="icon-list"></i></button>
-          <button class="btn simple" title="Show only method names"><i class="icon-align-justify"></i></button>
+        <div class="btn-toolbar">
+            <div class="btn-group visibility" data-toggle="buttons-checkbox">
+                <button class="btn public active" title="Show public elements">Public</button>
+                <button class="btn protected" title="Show protected elements">Protected</button>
+                <button class="btn private" title="Show private elements">Private</button>
+                <button class="btn inherited active" title="Show inherited elements">Inherited</button>
+            </div>
+
+            <div class="btn-group view pull-right" data-toggle="buttons-radio">
+                <button class="btn details" title="Show descriptions and method names"><i class="icon-list"></i></button>
+                <button class="btn simple" title="Show only method names"><i class="icon-align-justify"></i></button>
+            </div>
         </div>
 
         <ul class="side-nav nav nav-list">
             <xsl:if test="method">
                 <li class="nav-header">
-                    <i class="icon-custom icon-method"></i>&#160;Methods
+                    <i title="Methods" class="icon-custom icon-method"></i>&#160;Methods
                     <ul>
                         <xsl:apply-templates select="method[@visibility != 'protected' and @visibility != 'private']" mode="sidebar">
                             <xsl:sort select="name" />
@@ -50,7 +52,7 @@
 
             <xsl:if test="property">
                 <li class="nav-header">
-                    <i class="icon-custom icon-property"></i>&#160;Properties
+                    <i title="Properties" class="icon-custom icon-property"></i>&#160;Properties
                     <ul>
                         <xsl:apply-templates select="property[@visibility != 'protected' and @visibility != 'private']" mode="sidebar">
                             <xsl:sort select="name" />
@@ -81,7 +83,7 @@
 
             <xsl:if test="constant">
                 <li class="nav-header">
-                    <i class="icon-custom icon-constant"></i>&#160;Constants
+                    <i title="Constants" class="icon-custom icon-constant"></i>&#160;Constants
                     <ul>
                         <xsl:apply-templates select="constant" mode="sidebar">
                             <xsl:sort select="name" />
@@ -159,7 +161,7 @@
 
         <ul class="breadcrumb">
             <li>
-                <a href="{$root}index.html"><i class="icon-custom icon-class"></i></a>
+                <a href="{$root}index.html"><i title="Classes" class="icon-custom icon-class"></i></a>
                 <span class="divider">\</span>
             </li>
             <xsl:apply-templates select="//namespace[@full_name=$namespace]" mode="breadcrumb">
@@ -188,23 +190,23 @@
                 </xsl:if>
 
                 <xsl:if test="method">
-                    <h3><i class="icon-custom icon-method"></i>&#160;Methods</h3>
+                    <h3><i title="Methods" class="icon-custom icon-method"></i>&#160;Methods</h3>
                     <xsl:apply-templates select="method" mode="contents">
                         <xsl:sort select="@visibility" order="descending"/>
                         <xsl:sort select="name"/>
                     </xsl:apply-templates>
                 </xsl:if>
 
                 <xsl:if test="property">
-                    <h3><i class="icon-custom icon-property"></i>&#160;Properties</h3>
+                    <h3><i title="Properties" class="icon-custom icon-property"></i>&#160;Properties</h3>
                     <xsl:apply-templates select="property" mode="contents">
                         <xsl:sort select="@visibility" order="descending" />
                         <xsl:sort select="name" />
                     </xsl:apply-templates>
                 </xsl:if>
 
                 <xsl:if test="constant">
-                    <h3><i class="icon-custom icon-constant"></i>&#160;Constants</h3>
+                    <h3><i title="Constants" class="icon-custom icon-constant"></i>&#160;Constants</h3>
                     <xsl:apply-templates select="constant" mode="contents">
                         <xsl:sort select="name" />
                     </xsl:apply-templates>
@@ -213,4 +215,4 @@
         </div>
     </xsl:template>
 
-</xsl:stylesheet>
+</xsl:stylesheet>
diff --git a/elements/common.xsl b/elements/common.xsl
@@ -81,6 +81,12 @@
             <xsl:with-param name="exclude-link" select="$exclude-link"/>
         </xsl:apply-templates>
         <xsl:value-of select="name"/>
+        <xsl:if test="default[.!='']">
+            <code>
+                <xsl:text>&#160;=&#160;</xsl:text>
+                <xsl:value-of select="default"/>
+            </code>
+        </xsl:if>
     </xsl:template>
 
     <!-- Property/Constant list item in the sidebar -->
@@ -158,7 +164,7 @@
         </tr>
     </xsl:template>
 
-    <xsl:template match="tag[@name = 'license' or @name = 'link' or @name = 'see' or @name = 'author']" mode="tabular">
+    <xsl:template match="tag[@name = 'license' or @name = 'link' or @name = 'see' or @name = 'uses' or @name = 'author']" mode="tabular">
         <tr>
             <th><xsl:value-of select="@name"/></th>
             <td>
@@ -224,4 +230,4 @@
         </li>
     </xsl:template>
 
-</xsl:stylesheet>
+</xsl:stylesheet>
diff --git a/elements/constant.xsl b/elements/constant.xsl
@@ -16,8 +16,11 @@
         <xsl:param name="exclude-link" />
 
         <xsl:variable name="name" select="."/>
+        <xsl:variable name="value" select="../value"/>
         <pre>
             <xsl:value-of select="$name"/>
+            <xsl:text>&#160;=&#160;</xsl:text>
+            <xsl:value-of select="$value"/>
             <xsl:text>&#160;</xsl:text>
             <xsl:apply-templates select="../docblock/tag[@name='var']" mode="signature">
                 <xsl:with-param name="exclude-link" select="$exclude-link"/>
@@ -30,7 +33,7 @@
         <xsl:variable name="desc">
             <xsl:apply-templates select="name" />
         </xsl:variable>
-        <div class="element clickable {local-name(.)} {@visibility} {local-name(.)}_{translate(name, '$', '')}" data-toggle="collapse" data-target=".{local-name(.)}_{translate(name, '$', '')} .collapse">
+        <div class="element clickable {local-name(.)} {@visibility} {local-name(.)}_{translate(name, '$', '')}" data-toggle="collapse" data-target=".{local-name(.)}_{translate(name, '$', '')} .collapse" title="{@visibility}">
             <h2>
                 <xsl:if test="not($desc)">
                     <xsl:value-of select="name"/>
diff --git a/elements/function.xsl b/elements/function.xsl
@@ -56,7 +56,7 @@
 
     <xsl:template match="function|method" mode="contents">
         <a id="{local-name(.)}_{name}"></a>
-        <div class="element clickable {local-name(.)} {@visibility} {local-name(.)}_{name}" data-toggle="collapse" data-target=".{local-name(.)}_{name} .collapse">
+        <div class="element clickable {local-name(.)} {@visibility} {local-name(.)}_{name}" data-toggle="collapse" data-target=".{local-name(.)}_{name} .collapse" title="{@visibility}">
             <h2><xsl:apply-templates select="name" /></h2>
             <xsl:apply-templates select="name" mode="signature" />
             <div class="labels">
diff --git a/elements/namespace.xsl b/elements/namespace.xsl
@@ -66,7 +66,7 @@
 
                 <xsl:variable name="functions" select="/project/file/function[@namespace=$fqnn]"/>
                 <xsl:if test="count($functions) > 0">
-                    <h3><i class="icon-custom icon-function"></i> Functions</h3>
+                    <h3><i title="Functions" class="icon-custom icon-function"></i> Functions</h3>
                     <xsl:apply-templates select="$functions" mode="contents">
                         <xsl:sort select="name" />
                     </xsl:apply-templates>
@@ -75,7 +75,7 @@
                 <xsl:variable name="classes" select="/project/file/class[@namespace=$fqnn]"/>
                 <xsl:variable name="interfaces" select="/project/file/interface[@namespace=$fqnn]"/>
                 <xsl:if test="count($classes)+count($interfaces) > 0">
-                    <h3><i class="icon-custom icon-class"></i> Classes and interfaces</h3>
+                    <h3><i title="Class" class="icon-custom icon-class"></i> Classes and interfaces</h3>
                     <xsl:apply-templates select="$classes|$interfaces" mode="compact">
                         <xsl:sort select="local-name()" order="descending" />
                         <xsl:sort select="full_name" />
@@ -84,7 +84,7 @@
 
                 <xsl:variable name="constants" select="/project/file/constant[@namespace=$fqnn]"/>
                 <xsl:if test="count($constants) > 0">
-                    <h3><i class="icon-custom icon-constant"></i> Constants</h3>
+                    <h3><i title="Constants" class="icon-custom icon-constant"></i> Constants</h3>
                     <xsl:apply-templates select="$constants" mode="contents">
                         <xsl:sort select="name" />
                     </xsl:apply-templates>
@@ -119,36 +119,36 @@
 
             <xsl:variable name="functions" select="/project/file/function[@namespace=$parent_name]"/>
             <xsl:if test="count($functions) > 0">
-                <li class="nav-header"><i class="icon-custom icon-function"></i> Functions</li>
+                <li class="nav-header"><i title="Functions" class="icon-custom icon-function"></i> Functions</li>
                 <xsl:apply-templates select="$functions" mode="sidebar">
                     <xsl:sort select="name" />
                 </xsl:apply-templates>
             </xsl:if>
 
             <xsl:variable name="interfaces" select="/project/file/interface[@namespace=$parent_name]"/>
             <xsl:if test="count($interfaces) > 0">
-                <li class="nav-header"><i class="icon-custom icon-interface"></i> Interfaces</li>
+                <li class="nav-header"><i title="Interfaces" class="icon-custom icon-interface"></i> Interfaces</li>
                 <xsl:for-each select="$interfaces">
                     <li><a href="#{name}" title="{docblock/description}"><xsl:value-of select="name" /></a></li>
                 </xsl:for-each>
             </xsl:if>
 
             <xsl:variable name="classes" select="/project/file/class[@namespace=$parent_name]"/>
             <xsl:if test="count($classes) > 0">
-                <li class="nav-header"><i class="icon-custom icon-class"></i> Classes</li>
+                <li class="nav-header"><i title="Classes" class="icon-custom icon-class"></i> Classes</li>
                 <xsl:for-each select="$classes">
                     <li><a href="#{name}" title="{docblock/description}"><xsl:value-of select="name" /></a></li>
                 </xsl:for-each>
             </xsl:if>
 
             <xsl:variable name="constants" select="/project/file/constant[@namespace=$parent_name]"/>
             <xsl:if test="count($constants) > 0">
-                <li class="nav-header"><i class="icon-custom icon-constant"></i> Constants</li>
+                <li class="nav-header"><i title="Constants" class="icon-custom icon-constant"></i> Constants</li>
                 <xsl:apply-templates select="$constants" mode="sidebar">
                     <xsl:sort select="name" />
                 </xsl:apply-templates>
             </xsl:if>
         </ul>
     </xsl:template>
 
-</xsl:stylesheet>
+</xsl:stylesheet>
diff --git a/elements/package.xsl b/elements/package.xsl
@@ -64,15 +64,15 @@
 
                 <xsl:variable name="functions" select="/project/file/function[@package=$fqnn]"/>
                 <xsl:if test="count($functions) > 0">
-                    <h3><i class="icon-custom icon-function"></i> Functions</h3>
+                    <h3><i title="Functions" class="icon-custom icon-function"></i> Functions</h3>
                     <xsl:apply-templates select="$functions" mode="contents">
                         <xsl:sort select="name" />
                     </xsl:apply-templates>
                 </xsl:if>
 
                 <xsl:variable name="classes" select="/project/file/class[@package=$fqnn]|/project/file/interface[@package=$fqnn]"/>
                 <xsl:if test="count($classes) > 0">
-                    <h3><i class="icon-custom icon-class"></i> Classes and interfaces</h3>
+                    <h3><i title="Classes" class="icon-custom icon-class"></i> Classes and interfaces</h3>
                     <xsl:apply-templates select="$classes" mode="compact">
                         <xsl:sort select="local-name()" order="descending" />
                         <xsl:sort select="full_name" />
@@ -81,7 +81,7 @@
 
                 <xsl:variable name="constants" select="/project/file/constant[@package=$fqnn]"/>
                 <xsl:if test="count($constants) > 0">
-                    <h3><i class="icon-custom icon-constant"></i> Constants</h3>
+                    <h3><i title="Constants" class="icon-custom icon-constant"></i> Constants</h3>
                     <xsl:apply-templates select="$constants" mode="contents">
                         <xsl:sort select="name" />
                     </xsl:apply-templates>
@@ -116,36 +116,36 @@
 
             <xsl:variable name="functions" select="/project/file/function[@package=$name]"/>
             <xsl:if test="count($functions) > 0">
-                <li class="nav-header"><i class="icon-custom icon-function"></i> Functions</li>
+                <li class="nav-header"><i title="Functions" class="icon-custom icon-function"></i> Functions</li>
                 <xsl:apply-templates select="$functions" mode="sidebar">
                     <xsl:sort select="name" />
                 </xsl:apply-templates>
             </xsl:if>
 
             <xsl:variable name="interfaces" select="/project/file/interface[@package=$name]"/>
             <xsl:if test="count($interfaces) > 0">
-                <li class="nav-header"><i class="icon-custom icon-interface"></i> Interfaces</li>
+                <li class="nav-header"><i title="Interfaces" class="icon-custom icon-interface"></i> Interfaces</li>
                 <xsl:for-each select="$interfaces">
                     <li><a href="#{name}" title="{docblock/description}"><xsl:value-of select="name" /></a></li>
                 </xsl:for-each>
             </xsl:if>
 
             <xsl:variable name="classes" select="/project/file/class[@package=$name]"/>
             <xsl:if test="count($classes) > 0">
-                <li class="nav-header"><i class="icon-custom icon-class"></i> Classes</li>
+                <li class="nav-header"><i title="Classes" class="icon-custom icon-class"></i> Classes</li>
                 <xsl:for-each select="$classes">
                     <li><a href="#{name}" title="{docblock/description}"><xsl:value-of select="name" /></a></li>
                 </xsl:for-each>
             </xsl:if>
 
             <xsl:variable name="constants" select="/project/file/constant[@package=$name]"/>
             <xsl:if test="count($constants) > 0">
-                <li class="nav-header"><i class="icon-custom icon-constant"></i> Constants</li>
+                <li class="nav-header"><i title="Constants" class="icon-custom icon-constant"></i> Constants</li>
                 <xsl:apply-templates select="$constants" mode="sidebar">
                     <xsl:sort select="name" />
                 </xsl:apply-templates>
             </xsl:if>
         </ul>
     </xsl:template>
 
-</xsl:stylesheet>
+</xsl:stylesheet>
diff --git a/elements/property.xsl b/elements/property.xsl
@@ -27,6 +27,19 @@
                 <xsl:with-param name="exclude-link" select="$exclude-link"/>
             </xsl:apply-templates>
         </pre>
+        
+        <div class="row collapse">
+            <div class="detail-description">
+                <h3>Default</h3>
+                <div class="subelement argument">
+                    <xsl:if test="../default[.!='']">
+                        <code>
+                            <xsl:value-of select="../default" disable-output-escaping="yes"/>
+                        </code>
+                    </xsl:if>
+                </div>
+            </div>
+        </div>
     </xsl:template>
 
-</xsl:stylesheet>
+</xsl:stylesheet>
diff --git a/js/template.js b/js/template.js

Original file line number	Diff line number	Diff line change
`@@ -340,12 +340,6 @@ i.icon-custom`
`340`	`340`	`display: none;`
`341`	`341`	`}`
`342`	`342`
`343`		`-.btn-group.view`
`344`		`-{`
`345`		`- margin-left: 20px;`
`346`		`- margin-bottom: 20px;`
`347`		`-}`
`348`		`-`
`349`	`343`	`.visibility button`
`350`	`344`	`{`
`351`	`345`	`height: 24px;`
`@@ -437,6 +431,14 @@ div.labels`
`437`	`431`	`font-size: 13px;`
`438`	`432`	`}`
`439`	`433`
	`434`	`+.nav-list .nav-header .side-nav-header`
	`435`	`+{`
	`436`	`+ font-weight: bold;`
	`437`	`+ line-height: 18px;`
	`438`	`+ color: #999999;`
	`439`	`+ text-transform: uppercase;`
	`440`	`+}`
	`441`	`+`
`440`	`442`	`.detail-description code {`
`441`	`443`	`white-space: pre;`
`442`	`444`	`display: inline-block;`
`@@ -501,7 +503,7 @@ div.labels`
`501`	`503`	`{`
`502`	`504`	`font-size: 0.80em;`
`503`	`505`	`margin-bottom: 7px;`
`504`		`- display: block;`
	`506`	`+ display: inline-block;`
`505`	`507`	`float: right;`
`506`	`508`	`}`
`507`	`509`	`}`