[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10487]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [10487] |
|
Date: |
Tue, 06 Nov 2012 13:41:52 +0000 |
Revision: 10487
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10487
Author: vator
Date: 2012-11-06 13:41:50 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/logistic/inc/class.uiactivity.inc.php
trunk/logistic/templates/base/activity/activity_tabs.xsl
trunk/logistic/templates/base/css/base.css
Modified: trunk/logistic/inc/class.uiactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.uiactivity.inc.php 2012-11-06 12:29:16 UTC (rev
10486)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2012-11-06 13:41:50 UTC (rev
10487)
@@ -705,16 +705,23 @@
{
return;
}
+
$path = $this->so->get_path($activity_id);
- $level = count($path) - 1;
- $breadcrumb_array = array();
-
- for ($i=0;$i<$level;$i++)
+
+ foreach($path as $menu_item)
{
- $_link = self::link(array('menuaction' =>
$menuaction, $id_name => $path[$i]['id']));
- $breadcrumb_array[] = "<a
href=\"{$_link}\">{$path[$i]['name']}</a>";
+ if($menu_item['id'] == $activity_id)
+ {
+ $breadcrumb_array[] = array("name" =>
$menu_item['name'], "link" => "", "current" => 1);
+ }
+ else
+ {
+ $_link = self::link(array('menuaction'
=> $menuaction, $id_name => $menu_item['id'] ));
+ $breadcrumb_array[] = array("name" =>
$menu_item['name'], "link" => $_link, "current" => 0);
+ }
+
}
- $breadcrumb_array[] = $path[$level]['name'];
- return implode(' > ', $breadcrumb_array);
+
+ return $breadcrumb_array;
}
}
Modified: trunk/logistic/templates/base/activity/activity_tabs.xsl
===================================================================
--- trunk/logistic/templates/base/activity/activity_tabs.xsl 2012-11-06
12:29:16 UTC (rev 10486)
+++ trunk/logistic/templates/base/activity/activity_tabs.xsl 2012-11-06
13:41:50 UTC (rev 10487)
@@ -8,10 +8,9 @@
<xsl:when test="view = 'activity_details'">
<xsl:call-template name="yui_phpgw_i18n"/>
+ <!-- =========== HEADING ============== -->
<xsl:choose>
<xsl:when test="activity/id != '' or
activity/id != 0">
-
- <!-- =========== HEADING ==============
-->
<h1 style="float:left;">
<span>
<xsl:value-of
select="php:function('lang', 'Overview for activity')" />
@@ -20,37 +19,25 @@
<xsl:value-of
select="activity/name" />
</span>
</h1>
-
- <!-- =========== BREADCRUMB
============== -->
- <div id="breadcrumb">
- <span>Du er her:</span>
- <xsl:value-of
disable-output-escaping="yes" select="breadcrumb" />
- </div>
-
</xsl:when>
<xsl:otherwise>
-
- <!-- =========== HEADING ==============
-->
<h1 style="float:left;">
<xsl:value-of
select="php:function('lang', 'Requirement allocation')" />
</h1>
-
- <!-- =========== BREADCRUMB
============== -->
- <div id="breadcrumb">
- <span>Du er her:</span>
- <xsl:value-of
disable-output-escaping="yes" select="breadcrumb" />
- </div>
</xsl:otherwise>
</xsl:choose>
-
+
+ <!-- =========== BREADCRUMB ============== -->
+ <xsl:call-template name="breadcrumb" />
+
<xsl:value-of disable-output-escaping="yes"
select="tabs" />
<xsl:call-template name="activity_details" />
</xsl:when>
<xsl:when test="view = 'requirement_overview'">
+
+ <!-- =========== HEADING ============== -->
<xsl:choose>
<xsl:when test="activity/id != '' or
activity/id != 0">
-
- <!-- =========== HEADING ==============
-->
<h1 style="float:left;">
<span>
<xsl:value-of
select="php:function('lang', 'Overview of resources for activity')" />
@@ -59,32 +46,44 @@
<xsl:value-of
select="activity/name" />
</span>
</h1>
-
- <!-- =========== BREADCRUMB
============== -->
- <div id="breadcrumb">
- <span>Du er her:</span>
- <xsl:value-of
disable-output-escaping="yes" select="breadcrumb" />
- </div>
</xsl:when>
<xsl:otherwise>
-
- <!-- =========== HEADING ==============
-->
<h1 style="float:left;">
<xsl:value-of
select="php:function('lang', 'Add criterias')" />
</h1>
-
- <!-- =========== BREADCRUMB
============== -->
- <div id="breadcrumb">
- <span>Du er her:</span>
- <xsl:value-of
disable-output-escaping="yes" select="breadcrumb" />
- </div>
</xsl:otherwise>
</xsl:choose>
-
+
+ <!-- =========== BREADCRUMB ============== -->
+ <xsl:call-template name="breadcrumb" />
+
<xsl:value-of disable-output-escaping="yes"
select="tabs" />
<xsl:call-template name="requirement_overview" />
</xsl:when>
</xsl:choose>
</div>
-
</xsl:template>
+
+<!-- =========== BREADCRUMB TEMPLATE ============== -->
+<xsl:template name="breadcrumb">
+ <div id="breadcrumb">
+ <span>Du er her:</span>
+ <xsl:for-each select="breadcrumb">
+ <xsl:choose>
+ <xsl:when test="current = 1">
+ <span class="current">
+ <xsl:value-of select="name"/>
+ </span>
+ </xsl:when>
+ <xsl:otherwise>
+ <a href="{link}">
+ <xsl:value-of select="name"/>
+ </a>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:if test="not( position() = last() )">
+ <img src="logistic/images/arrow_right.png" />
+ </xsl:if>
+ </xsl:for-each>
+ </div>
+</xsl:template>
Modified: trunk/logistic/templates/base/css/base.css
===================================================================
--- trunk/logistic/templates/base/css/base.css 2012-11-06 12:29:16 UTC (rev
10486)
+++ trunk/logistic/templates/base/css/base.css 2012-11-06 13:41:50 UTC (rev
10487)
@@ -2439,9 +2439,22 @@
}
#breadcrumb span{
+ font-weight: bold;
+}
+
+#breadcrumb span.txt{
margin-right: 5px;
}
+#breadcrumb img{
+ height: 14px;
+ margin: 0 5px 0 8px;
+}
+
+#breadcrumb span.current{
+ text-decoration: underline;
+}
+
#requirement-container .btn-sm.cancel {
border: 1px solid #CCCCCC;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10487],
Torstein <=