Skip to content

Commit

Permalink
SAK-29012 - adding row headers and scope to rows and cols
Browse files Browse the repository at this point in the history
  • Loading branch information
@gsilver
gsilver committed Apr 14, 2015
1 parent 46e4393 commit b356408
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
12 changes: 6 additions & 6 deletions calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_viewDay.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
#set($temp = $timer)
#set($timer = $timer - 12)
#end
<td width="5%" rowspan="2" align="right" bgcolor="#eeeeee" class="borderWhite" nowrap="nowrap">
<th width="5%" rowspan="2" align="right" bgcolor="#eeeeee" class="borderWhite" nowrap="nowrap" scope="row">
#foreach ($format in $timeFormat)
#if ($format == "h")
$timer
Expand All @@ -111,10 +111,10 @@
#end
#end
#end
</td>
</th>
#if ($temp>12) #set($timer = $temp) #end
#elseif ( $page == "third" )
<td width="5%" rowspan="2" align="right" bgcolor="#eeeeee" class="borderWhite" nowrap="nowrap">
<th width="5%" rowspan="2" align="right" bgcolor="#eeeeee" class="borderWhite" nowrap="nowrap" scope="row">
#foreach ($format in $timeFormat)
#if ($format == "h")
$timer
Expand All @@ -125,9 +125,9 @@
${temp}:00
#end
#end
</td>
</th>
#elseif ($page == "first")
<td width="5%" rowspan="2" align="right" bgcolor="#eeeeee" class="borderWhite" nowrap="nowrap">
<th width="5%" rowspan="2" align="right" bgcolor="#eeeeee" class="borderWhite" nowrap="nowrap" scope="row">
#foreach ($format in $timeFormat)
#if ($format == "h")
#if($timer == 0) 12 #else $timer #end
Expand All @@ -137,7 +137,7 @@
${timer}:00
#end
#end
</td>
</th>
#end

#set($timer = $timer + 1)
Expand Down
2 changes: 1 addition & 1 deletion calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_viewMonth.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
## --- Modificado por la UPV - Begin
##set ($day_of_Week = $calObj.getDay_Of_Week())
#foreach ($dayname in $dayOfWeekNames)
<th align="center" width="14%" class="borderWhite">$dayname</th>
<th align="center" width="14%" class="borderWhite" scope="col">$dayname</th>
#end
## --- Modificado por la UPV - End
</tr>
Expand Down
32 changes: 16 additions & 16 deletions calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_viewWeek.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@
#end

#set ($j=2*$i+1)
<th align="right" height="20" width="13%" class="$border" colspan="$vec.elementAt($j)">$dayName
<th align="right" height="20" width="13%" class="$border" colspan="$vec.elementAt($j)" scope="col">$dayName
<a href="#toolLinkParam("$action" "doDay" "day=$week.getWeek($i).getDay()&month=$week.getWeek($i).getMonth()&year=$week.getWeek($i).getYear()")">
$week.getWeek($i).getDay()</a>
</th>
Expand All @@ -489,7 +489,7 @@
<tr valign="top" bgcolor="#FFFFFF" >
#if($fractiontime == "false")
#if($timer == 12)
<td align="right" bgcolor="#eeeeee" rowspan="2" class="borderWhite">
<th align="right" bgcolor="#eeeeee" rowspan="2" class="borderWhite" scope="row">
#foreach ($format in $timeFormat)
#if ($format == "h")
$timer
Expand All @@ -499,9 +499,9 @@
${timer}:00
#end
#end
</td>
</th>
#elseif($timer<=11)
<td align="right" bgcolor="#eeeeee" rowspan="2" class="borderWhite">
<th align="right" bgcolor="#eeeeee" rowspan="2" class="borderWhite" scope="row">
#foreach ($format in $timeFormat)
#if ($format == "h")
$timer
Expand All @@ -511,11 +511,11 @@
${timer}:00
#end
#end
</td>
</th>
#else
#set($temp = $timer)
#set($timer = $timer - 12)
<td align="right" bgcolor="#eeeeee" rowspan="2" class="borderWhite">
<th align="right" bgcolor="#eeeeee" rowspan="2" class="borderWhite" scope="row">
#foreach ($format in $timeFormat)
#if ($format == "h")
$timer
Expand All @@ -525,7 +525,7 @@
${temp}:00
#end
#end
</td>
</th>
#set($timer = $temp)
#end
#set($fractiontime ="true")
Expand Down Expand Up @@ -833,7 +833,7 @@
#set($temp = $timer)
#set($timer = $timer - 12)
#if($timer<12)
<td align="right" bgcolor="#eeeeee" rowspan="2" class="borderWhite">
<th align="right" bgcolor="#eeeeee" rowspan="2" class="borderWhite" scope="row">
#foreach ($format in $timeFormat)
#if ($format == "h")
$timer
Expand All @@ -843,15 +843,15 @@
${temp}:00
#end
#end
</td>
</th>
#set($timer = $temp)
#elseif($timer ==12)
<td align="right" bgcolor="#eeeeee" rowspan="2" class="borderWhite">$timer AM </td>
<th align="right" bgcolor="#eeeeee" rowspan="2" class="borderWhite" scope="row">$timer AM </th>
#set($timer = $temp)
#elseif($timer >12)
#set($temp = $timer)
#set($timer = $timer - 12)
<td align="right" bgcolor="#eeeeee" rowspan="2" class="borderWhite">$timer AM </td>
<th align="right" bgcolor="#eeeeee" rowspan="2" class="borderWhite" scope="row">$timer AM </th>
#set($timer = $temp)
#end
#set($fractiontime ="true")
Expand Down Expand Up @@ -879,7 +879,7 @@
<tr valign="top" bgcolor="#FFFFFF">
#if($fractiontime == "false")
#if($timer == 12)
<td align="right" bgcolor="#eeeeee" rowspan=2 class="borderWhite">
<th align="right" bgcolor="#eeeeee" rowspan=2 class="borderWhite" scope="row">
#foreach ($format in $timeFormat)
#if ($format == "h")
$timer
Expand All @@ -889,11 +889,11 @@
0:00
#end
#end
</td>
</th>
#elseif($timer>12)
#set($temp = $timer)
#set($timer = $timer - 12)
<td align="right" bgcolor="#eeeeee" rowspan=2 class="borderWhite">
<th align="right" bgcolor="#eeeeee" rowspan=2 class="borderWhite" scope="row">
#foreach ($format in $timeFormat)
#if ($format == "h")
$timer
Expand All @@ -903,10 +903,10 @@
${timer}:00
#end
#end
</td>
</th>
#set($timer = $temp)
#else
<td align="right" bgcolor="#eeeeee" rowspan=2 class="borderWhite">$timer PM </td>
<th align="right" bgcolor="#eeeeee" rowspan=2 class="borderWhite" scope="row">$timer PM </th>
#end
#set($fractiontime ="true")
#else
Expand Down

0 comments on commit b356408

Please sign in to comment.