diff options
| author | Antonio Gallo <tonicucoz@gmail.com> | 2011-02-16 18:15:20 +0000 |
|---|---|---|
| committer | Antonio Gallo <tonicucoz@gmail.com> | 2011-02-16 18:15:20 +0000 |
| commit | c91a070738a9e46008209c4afe596ff56cfaa777 (patch) | |
| tree | e1e996423b9d73a9e09e0c024bf464f349c83876 /h-source/Application/Views/Wiki/differences.php | |
| parent | 4a27b517fc52dde60e5c1837860e4785317490a6 (diff) | |
improved wiki
Diffstat (limited to 'h-source/Application/Views/Wiki/differences.php')
| -rw-r--r-- | h-source/Application/Views/Wiki/differences.php | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/h-source/Application/Views/Wiki/differences.php b/h-source/Application/Views/Wiki/differences.php index 1709cbf..ee7a795 100644 --- a/h-source/Application/Views/Wiki/differences.php +++ b/h-source/Application/Views/Wiki/differences.php @@ -21,41 +21,44 @@ ?> <div id="left"> - - <div class="position_tree_box"> - <a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <?php echo $tree;?> - </div> - - <?php if ($showDiff === true) { ?> - <div class="notebook_view_title"> - Differences between the revision of <b><?php echo smartDate($update_new);?></b>, created by <b><?php echo getLinkToUser($u->getUser($created_by));?></b>, and the revision of <b><?php echo smartDate($update_old);?></b> - </div> - <?php } ?> - - <div class="notebook_insert_link"> - <a title="Back to the history of the page <?php echo $tree_name;?>" href="<?php echo $this->baseUrl."/".$this->controller."/history/$lang/".$id_wiki.$this->viewStatus;?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a> - </div> + + <?php if (!$isDeleted) { ?> - <div class="wiki_external_box"> + <div class="position_tree_box"> + <a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <?php echo $tree;?> + </div> - <div class="diff_color_notice"> - <b>Notice</b>: the text in <del>red</del> has been deleted from the previous revision, the text in <ins>green</ins> has been added in this revision and the text in <span class="gray_text_notice">gray</span> has not been changed. + <?php if ($showDiff === true) { ?> + <div class="notebook_view_title"> + Differences between the revision of <b><?php echo smartDate($update_new);?></b>, created by <b><?php echo getLinkToUser($u->getUser($created_by));?></b>, and the revision of <b><?php echo smartDate($update_old);?></b> </div> + <?php } ?> - <?php foreach ($diffArray as $label => $text) { ?> + <div class="notebook_insert_link"> + <a title="Back to the history of the page <?php echo $tree_name;?>" href="<?php echo $this->baseUrl."/".$this->controller."/history/$lang/".$id_wiki.$this->viewStatus;?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a> + </div> - <div class="diff_ext_box"> + <div class="wiki_external_box"> - <div class="diff_item_label"> - <?php echo gtext("differences in the entry");?>: <b><?php echo $label;?></b> + <div class="diff_color_notice"> + <b>Notice</b>: the text in <del>red</del> has been deleted from the previous revision, the text in <ins>green</ins> has been added in this revision and the text in <span class="gray_text_notice">gray</span> has not been changed. </div> - <div class="diff_item_text"> - <?php echo in_array($label,$fieldsWithBreaks) ? nl2br($text) : $text;?> - </div> + <?php foreach ($diffArray as $label => $text) { ?> - </div> + <div class="diff_ext_box"> - <?php } ?> + <div class="diff_item_label"> + <?php echo gtext("differences in the entry");?>: <b><?php echo $label;?></b> + </div> + + <div class="diff_item_text"> + <?php echo in_array($label,$fieldsWithBreaks) ? nl2br($text) : $text;?> + </div> + + </div> - </div> + <?php } ?> + + </div> + <?php } ?> |