removed pix

phpgwapi/templates/default/help.xsl

@@ -1,23 +1,29 @@
 <!-- $Id$ -->
 
 	<xsl:template name="help">
-		<xsl:apply-templates select="help_data"/>
+		<xsl:apply-templates select="help_values"/>
 	</xsl:template>
 
-	<xsl:template match="help_data">
+	<xsl:template match="help_values">
+		<xsl:variable name="img" select="img"/>
 		<table cellpadding="0" cellspacing="0" width="100%">
  			<tr class="th">
-  				<td class="th_text">
-					<xsl:value-of disable-output-escaping="yes" select="space"/>
-					<xsl:value-of select="title"/>
+  				<td class="th_text" valign="middle">
+					<img src="{$img}" border="0"/>&nbsp;
+					<xsl:value-of select="title"/>&nbsp;
+					<xsl:value-of select="lang_version"/>:&nbsp;<xsl:value-of select="version"/>
 				</td>
 				<td valign="middle" align="right">
-					<xsl:apply-templates select="control_link"/>
+					<xsl:choose>
+						<xsl:when test="control_link != ''">
+							<xsl:apply-templates select="control_link"/>
+						</xsl:when>
+					</xsl:choose>
 				</td>
 			</tr>
  			<tr>
   				<td colspan="2">
-					<table cellpadding="3" cellspacing="0" class="portal">
+					<table cellpadding="3" cellspacing="0" class="row_on" width="100%">
 						<xsl:choose>
 							<xsl:when test="listbox != ''">
 								<tr>
@@ -37,10 +43,10 @@
 									</td>
 								</tr>
 							</xsl:when>
-							<xsl:when test="xextrabox != ''">
+							<xsl:when test="xhelp != ''">
 								<tr>
 									<td>
-										<xsl:call-template name="extrabox"/>
+										<xsl:call-template name="help_data"/>
 									</td>
 								</tr>
 							</xsl:when>

phpgwapi/templates/default/nextmatchs.xsl

@@ -2,7 +2,9 @@
 
 <xsl:template name="nextmatchs">
 <!--	<xsl:param name="nextmatchs_params"/> -->
-	<xsl:variable name="cur_record"><xsl:value-of select="cur_record"/></xsl:variable>
+	<xsl:variable name="allow_all_rows"><xsl:value-of select="allow_all_rows"/></xsl:variable>
+	<xsl:variable name="start_record"><xsl:value-of select="start_record"/></xsl:variable>
+	<xsl:variable name="cur_record"><xsl:value-of select="number($start_record) + number(1)"/></xsl:variable>
 	<xsl:variable name="record_limit"><xsl:value-of select="record_limit"/></xsl:variable>
 	<xsl:variable name="num_records"><xsl:value-of select="num_records"/></xsl:variable>
 	<xsl:variable name="all_records"><xsl:value-of select="all_records"/></xsl:variable>
@@ -13,9 +15,9 @@
 		<tr>
 			<xsl:choose>
 				<xsl:when test="number($cur_record) > number(1)">
-				<xsl:variable name="first"><xsl:value-of select="link_url"/>&amp;currow=1</xsl:variable>
+				<xsl:variable name="first"><xsl:value-of select="link_url"/>&amp;start=0</xsl:variable>
 					<td width="25">
-						<a href="{$first}"><img src="{$img_path}/first-grey.png" border="2" width="12" height="12"/></a>
+						<a href="{$first}"><img src="{$img_path}/first.png" border="2" width="12" height="12"/></a>
 					</td>
 				</xsl:when>
 				<xsl:otherwise>
@@ -33,13 +35,13 @@
 							<xsl:choose>
 								<xsl:when test="number($cur_record) - number($record_limit) > number(0)">
 								<xsl:variable name="prev_number"><xsl:value-of select="number($cur_record) - number($record_limit)"/></xsl:variable>
-								<xsl:variable name="prev"><xsl:value-of select="link_url"/>&amp;currow=<xsl:value-of select="$prev_number"/></xsl:variable>
+								<xsl:variable name="prev"><xsl:value-of select="link_url"/>&amp;start=<xsl:value-of select="number($prev_number) - number(1)"/></xsl:variable>
 									<td width="25">
-										<a href="{$prev}"><img src="{$img_path}/left-grey.png" border="2" width="12" height="12"/></a>
+										<a href="{$prev}"><img src="{$img_path}/left.png" border="2" width="12" height="12"/></a>
 									</td>
 								</xsl:when>
 								<xsl:otherwise>
-								<xsl:variable name="prev"><xsl:value-of select="link_url"/>&amp;currow=1</xsl:variable>
+								<xsl:variable name="prev"><xsl:value-of select="link_url"/>&amp;start=0</xsl:variable>
 									<td width="25">
 										<a href="{$prev}"><img src="{$img_path}/left-grey.png" border="2" width="12" height="12"/></a>
 									</td>
@@ -67,15 +69,15 @@
 				<xsl:otherwise>
 					<xsl:choose>
 						<xsl:when test="number($cur_record) + number($record_limit) > number($num_records)">
-						<xsl:variable name="of_num"><xsl:value-of select="$num_records"/></xsl:variable>
+						<xsl:variable name="of_num"><xsl:value-of select="number($cur_record)+number($num_records) - number(1)"/></xsl:variable>
 							<td nowrap="nowrap" align="center">
-								<xsl:value-of select="$cur_record"/> - <xsl:value-of select="$of_num"/> of <xsl:value-of select="$num_records"/>&#160;
+								<xsl:value-of select="$cur_record"/> - <xsl:value-of select="$of_num"/> of <xsl:value-of select="$all_records"/>&#160;
 							</td>
 						</xsl:when>
 						<xsl:otherwise>
 						<xsl:variable name="of_num"><xsl:value-of select="number($cur_record) + number($record_limit) - number(1)"/></xsl:variable>
 							<td nowrap="nowrap" align="center">
-								<xsl:value-of select="$cur_record"/> - <xsl:value-of select="$of_num"/> of <xsl:value-of select="$num_records"/>&#160;
+								<xsl:value-of select="$cur_record"/> - <xsl:value-of select="$of_num"/> of <xsl:value-of select="$all_records"/>&#160;
 							</td>
 						</xsl:otherwise>
 					</xsl:choose>							
@@ -83,13 +85,13 @@
 			</xsl:choose>
 			
 			<xsl:choose>
-				<xsl:when test="number($num_records) > number($record_limit)">
+				<xsl:when test="number($all_records) > (number($start_record) + number($record_limit))">
 				<xsl:variable name="next_num"><xsl:value-of select="number($cur_record) + number($record_limit)"/></xsl:variable>
 					<xsl:choose>
-						<xsl:when test="number($num_records) > number($next_num)-number(1)">
-						<xsl:variable name="next"><xsl:value-of select="link_url"/>&amp;currow=<xsl:value-of select="$next_num"/></xsl:variable>
+						<xsl:when test="number($all_records) > number($next_num)-number(1)">
+						<xsl:variable name="next"><xsl:value-of select="link_url"/>&amp;start=<xsl:value-of select="number($next_num) - number(1)"/></xsl:variable>
 							<td width="25" align="right">
-								<a href="{$next}"><img src="{$img_path}/right-grey.png" border="2" width="12" height="12"/></a>
+								<a href="{$next}"><img src="{$img_path}/right.png" border="2" width="12" height="12"/></a>
 							</td>
 						</xsl:when>
 						<xsl:otherwise>
@@ -107,11 +109,11 @@
 			</xsl:choose>
 
 			<xsl:choose>
-				<xsl:when test="number($num_records) > number($record_limit)">
-				<xsl:variable name="last_num"><xsl:value-of select="number($num_records)-number($record_limit)+number(1)"/></xsl:variable>
+				<xsl:when test="number($all_records) > (number($start_record) + number($record_limit))">
+				<xsl:variable name="last_num"><xsl:value-of select="number($all_records)-number($record_limit)+number(1)"/></xsl:variable>
 					<xsl:choose>
 						<xsl:when test="number($last_num) > number($cur_record)">
-						<xsl:variable name="last"><xsl:value-of select="link_url"/>&amp;currow=<xsl:value-of select="$last_num"/></xsl:variable>
+						<xsl:variable name="last"><xsl:value-of select="link_url"/>&amp;start=<xsl:value-of select="number($last_num)-number(1)"/></xsl:variable>
 							<td width="25" align="right">
 								<a href="{$last}"><img src="{$img_path}/last-grey.png" border="2" width="12" height="12"/></a>
 							</td>
@@ -132,15 +134,15 @@
 		
 			<xsl:choose>
 				<xsl:when test="number($all_records) =1">
-				<xsl:variable name="all"><xsl:value-of select="link_url"/>&amp;currow=1</xsl:variable>
+				<xsl:variable name="all"><xsl:value-of select="link_url"/>&amp;start=0</xsl:variable>
 					<td width="25" align="right">
-						<a href="{$all}"><img src="{$img_path}/arrow_down.png" border="2" width="12" height="12"/></a>
+						<a href="{$all}"><img src="{$img_path}/down_nm.png" border="2" width="12" height="12"/></a>
 					</td>
 				</xsl:when>
 				<xsl:otherwise>
 				<xsl:variable name="all"><xsl:value-of select="link_url"/>&amp;allrows=1</xsl:variable>
 					<td width="25" align="right">
-						<a href="{$all}"><img src="{$img_path}/arrow_down.png" border="2" width="12" height="12"/></a>
+						<a href="{$all}"><img src="{$img_path}/down_nm.png" border="2" width="12" height="12"/></a>
 					</td>
 				</xsl:otherwise>
 			</xsl:choose>

phpgwapi/templates/default/phpgw_header.xsl

@@ -22,11 +22,11 @@
 				<table width="100%" height="100%" cellspacing="0" cellpadding="0">
 					<tr valign="top" width="100%">
 						<td>
-							<xsl:choose>
-								<xsl:when test="$current_app = 'help'">
+							<!-- <xsl:choose>
+								<xsl:when test="$current_app = 'help'"> -->
 									<xsl:call-template name="help"/>
-								</xsl:when>
-							</xsl:choose>
+								<!-- </xsl:when>
+							</xsl:choose> -->
 						</td>
 					</tr>
 					<tr valign="top">