Merge branch 'development' into h-node

1 files changed, 49 insertions, 0 deletions

diff --git a/Application/Views/Desktop/differences.php b/Application/Views/Desktop/differences.php
new file mode 100644
index 0000000..c634d19
--- /dev/null
+++ b/Application/Views/Desktop/differences.php
@@ -0,0 +1,49 @@
+<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
+
+<?php
+// h-source, a web software to build a community of people that want to share their hardware information.
+// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
+//
+// This file is part of h-source
+//
+// h-source is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// h-source is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
+?>
+
+	<div class="notebooks_viewall">
+
+		<?php if (!$isDeleted) { ?>
+		
+			<div class="diff_color_notice">
+				<?php echo gtext("<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>
+
+			<?php foreach ($diffArray as $label => $text) { ?>
+
+			<div class="diff_ext_box">
+
+				<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>
+
+			<?php } ?>
+
+		<?php } ?>
+		
+	</div>