Permalink
Browse files

Merge branch 'feature/portfolio' of github.com:open-steam/koala into …

…feature/portfolio
  • Loading branch information...
2 parents 1f3690a + 40fcfc8 commit d34898182c396b67a88a311f477e8889b171c514 @multivm multivm committed Feb 27, 2012
Showing with 6 additions and 7 deletions.
  1. +6 −7 extensions/content/eportfolio/classes/commands/Descriptions.class.php
View
13 extensions/content/eportfolio/classes/commands/Descriptions.class.php
@@ -48,21 +48,20 @@ public function frameResponse(\FrameResponseObject $frameResponseObject) {
foreach ($sortedActivities as $activityItem){
$html .=
'<tr>
- <th colspan=4>Tätigkeitsfeld ' . $activityItem[0]->index .': '. $activityItem[0]->name . '</td>
+ <th colspan=2>Tätigkeitsfeld ' . $activityItem[0]->index .': '. $activityItem[0]->name . '</td>
</tr>
<tr>
- <td>Beruf</td>
- <td>Niveau</td>
- <td>Niveabeschreibung</td>
- <td>Tätigkeitsbeschreibung</td>
+ <td colspan=2>Tätigkeitsbeschreibung: ' . $activityItem[0]->description . '</td>
+ </tr>
+ <tr>
+ <td><i>Niveau</i></td>
+ <td><i>Niveabeschreibung</i></td>
</tr>';
foreach ($activityItem as $activity){
$html .=
"<tr>
- <td>{$activity->job}</td>
<td>{$activity->niveau}</td>
<td>{$activity->niveauDescription}</td>
- <td>{$activity->description}</td>
</tr>";
}
}

0 comments on commit d348981

Please sign in to comment.