From 1c0b439bebe217aa119bf2300e24ad56d6e9c3ff Mon Sep 17 00:00:00 2001
From: Antonio Gallo <tonicucoz@gmail.com>
Date: Sun, 3 Apr 2011 16:53:59 +0000
Subject: h-source: added the ClientController and the license.phpfile

---
 h-source/Application/Views/Client/info.php    | 30 +++++++++++++++++++++++++++
 h-source/Application/Views/Client/license.php | 25 ++++++++++++++++++++++
 h-source/Application/Views/Wiki/form.php      |  4 ++--
 h-source/Application/Views/bottom_left.php    |  2 +-
 h-source/Application/Views/info.php           | 30 ---------------------------
 h-source/Application/Views/license_notice.php |  4 ++--
 6 files changed, 60 insertions(+), 35 deletions(-)
 create mode 100644 h-source/Application/Views/Client/info.php
 create mode 100644 h-source/Application/Views/Client/license.php
 delete mode 100644 h-source/Application/Views/info.php

(limited to 'h-source/Application/Views')

diff --git a/h-source/Application/Views/Client/info.php b/h-source/Application/Views/Client/info.php
new file mode 100644
index 0000000..00d2927
--- /dev/null
+++ b/h-source/Application/Views/Client/info.php
@@ -0,0 +1,30 @@
+<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
+<?php echo "<?xml version='1.0' encoding='UTF-8'?>\n";?>
+<user_info>
+	<status><?php echo $user_status;?></status>
+	<info>
+		<username><?php echo $username;?></username>
+		<token><?php echo $token;?></token>
+		<groups><?php echo $user_groups;?></groups>
+	</info>
+</user_info>
+
+<?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/>.
+?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Client/license.php b/h-source/Application/Views/Client/license.php
new file mode 100644
index 0000000..387fb6e
--- /dev/null
+++ b/h-source/Application/Views/Client/license.php
@@ -0,0 +1,25 @@
+<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
+<?php echo "<?xml version='1.0' encoding='UTF-8'?>\n";?>
+<license_info>
+	<?php echo License::getSubmissionNotice();?>
+</license_info>
+
+<?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/>.
+?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Wiki/form.php b/h-source/Application/Views/Wiki/form.php
index b3f7578..5949cf0 100644
--- a/h-source/Application/Views/Wiki/form.php
+++ b/h-source/Application/Views/Wiki/form.php
@@ -63,8 +63,8 @@
 		<?php } ?>
 
 		<div class="top_licence_notice">
-			<div><b>License Informations:</b></div>
-			Any text submitted by you will be put in the Public Domain (see the <a href="http://creativecommons.org/publicdomain/zero/1.0/">CC0 page</a> for detailed information).
+			<div><b><?php echo gtext("License information");?>:</b></div>
+			<?php echo License::getSubmissionNotice();?>
 		</div>
 		
 		<?php echo $notice;?>
diff --git a/h-source/Application/Views/bottom_left.php b/h-source/Application/Views/bottom_left.php
index 62bf77e..545a6ea 100644
--- a/h-source/Application/Views/bottom_left.php
+++ b/h-source/Application/Views/bottom_left.php
@@ -22,7 +22,7 @@
 
 	<?php if (strcmp($this->action,'talk') !== 0) { ?>
 	<div class="bottom_licence_notice">
-		The contents of this page are in the Public Domain. (see the <a href="http://creativecommons.org/publicdomain/zero/1.0/">CC0 page</a> for detailed information). Anyone is free to copy, modify, publish, use, sell, or distribute the text for any purpose, commercial or non-commercial, and by any means.
+		<?php echo License::getBottom();?>
 	</div>
 	<?php } ?>
 	
diff --git a/h-source/Application/Views/info.php b/h-source/Application/Views/info.php
deleted file mode 100644
index 00d2927..0000000
--- a/h-source/Application/Views/info.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-<?php echo "<?xml version='1.0' encoding='UTF-8'?>\n";?>
-<user_info>
-	<status><?php echo $user_status;?></status>
-	<info>
-		<username><?php echo $username;?></username>
-		<token><?php echo $token;?></token>
-		<groups><?php echo $user_groups;?></groups>
-	</info>
-</user_info>
-
-<?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/>.
-?>
\ No newline at end of file
diff --git a/h-source/Application/Views/license_notice.php b/h-source/Application/Views/license_notice.php
index 6d42465..85f5420 100644
--- a/h-source/Application/Views/license_notice.php
+++ b/h-source/Application/Views/license_notice.php
@@ -21,6 +21,6 @@
 ?>
 
 	<div class="top_licence_notice">
-		<div><b>License Informations:</b></div>
-		Any text submitted by you will be put in the Public Domain (see the <a href="http://creativecommons.org/publicdomain/zero/1.0/">CC0 page</a> for detailed information).
+		<div><b><?php echo gtext("License information");?>:</b></div>
+		<?php echo License::getSubmissionNotice();?>
 	</div>
\ No newline at end of file
-- 
cgit v1.2.3