From 68c09b87b23a0462e5ad8e106c4a0d7578c80533 Mon Sep 17 00:00:00 2001
From: Nael <t.rechel@gmx.de>
Date: Mon, 24 Jun 2013 20:45:10 +0200
Subject: [PATCH] tidied up a bit, included register tpl

---
 uVote/api/acc/account.create.php            | 22 -------------------
 uVote/page/default_page/default_page.php    |  8 +++++++
 uVote/page/default_page/js/vote_positive.js | 14 ------------
 uVote/page/default_page/page.html           |  3 +++
 uVote/page/default_page/register_form.tpl   | 24 +++++++++++++++++++++
 uVote/page/default_page/vote.tpl            |  2 +-
 6 files changed, 36 insertions(+), 37 deletions(-)
 delete mode 100644 uVote/api/acc/account.create.php
 delete mode 100644 uVote/page/default_page/js/vote_positive.js
 create mode 100644 uVote/page/default_page/register_form.tpl

diff --git a/uVote/api/acc/account.create.php b/uVote/api/acc/account.create.php
deleted file mode 100644
index 032e1a8..0000000
--- a/uVote/api/acc/account.create.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-class account {
-    public static function createNewAccount($newacc){
-        $con = new \SYSTEM\DB\Connection(new \DBD\uVote());
-
-//Variablen zuweisen
-$user_ID = $_POST['vorname'];
-$password = $_POST['passwort'];
-$email = $_POST['email'];
-
-//Daten in DB speichern
-$sql_befehl = "INSERT INTO table VALUES ($vorname,$nachname,$email)";
- if (("" == $password) OR (""== $email)) {
-        echo "Fehler: Eintrag unvollständig. ";
-    } else {
-
-  echo "Ihr Eintrag wurde hinzugefügt. ";
-}
-
-    }
-}
\ No newline at end of file
diff --git a/uVote/page/default_page/default_page.php b/uVote/page/default_page/default_page.php
index 12a7cc0..9314559 100644
--- a/uVote/page/default_page/default_page.php
+++ b/uVote/page/default_page/default_page.php
@@ -19,10 +19,18 @@ class default_page extends SYSTEM\PAGE\Page {
         return $result;
     }
     
+    public function exchange_registerform(){
+        $result= "";
+        $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/register_form.tpl'),array());
+    
+    return $result;
+}
+    
     public function html(){
         $vars = array();               
         $vars['js'] = $this->js(); 
         $vars['votelist'] = $this->generate_votelist();
+        $vars['registerform'] = $this->exchange_registerform();
         $vars['PIC_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_page/pics/');
         return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/page.html'), $vars);
         
diff --git a/uVote/page/default_page/js/vote_positive.js b/uVote/page/default_page/js/vote_positive.js
deleted file mode 100644
index 94f0cc7..0000000
--- a/uVote/page/default_page/js/vote_positive.js
+++ /dev/null
@@ -1,14 +0,0 @@
-         
-                $(function(){
-
-                $('#btn btn-large btn-green').on('click', function (e) {
-                            
-                var poll_ID = "15";
-                var vote = "4";
-
-                document.write('href="mojotrollz.eu/web/uVote/api.php?call=vote&action=vote&poll_ID=' + poll_ID + '&vote=' + vote + '"');
-                });
-    
-
-});
-
diff --git a/uVote/page/default_page/page.html b/uVote/page/default_page/page.html
index 4953ae8..6da16a7 100644
--- a/uVote/page/default_page/page.html
+++ b/uVote/page/default_page/page.html
@@ -72,6 +72,9 @@
           <div class="row">
             <img src="${PIC_PATH}logo2.png" width="600" style="margin-top: -40px;" />
           </div>
+            <div class="hero_unit" style="margin-left: 600px; margin-top: -220px; padding: 5px;">           
+            ${registerform}
+            </div>
 <!--          <div class="hero-unit" style="height: 300px; padding: 5px; padding-top: 50px; width: 400px; margin-left: 700px; margin-top: -260px; background: white;">           
               <i class="icon-tags" style="margin-left: 20px; margin-top: -30px;" ></i>Informieren
               <p></p>
diff --git a/uVote/page/default_page/register_form.tpl b/uVote/page/default_page/register_form.tpl
new file mode 100644
index 0000000..a6bf400
--- /dev/null
+++ b/uVote/page/default_page/register_form.tpl
@@ -0,0 +1,24 @@
+
+<form class="form-horizontal">
+
+  <div class="control-group">
+    <label class="control-label" for="inputEmail">Email</label>
+    <div class="controls">
+      <input type="text" id="inputEmail" placeholder="Email">
+    </div>
+  </div>
+  <div class="control-group">
+    <label class="control-label" for="inputPassword">Password</label>
+    <div class="controls">
+      <input type="password" id="inputPassword" placeholder="Password">
+    </div>
+  </div>
+  <div class="control-group">
+    <div class="controls">
+      <label class="checkbox">
+        <input type="checkbox"> Remember me
+      </label>
+      <button type="submit" class="btn">Sign in</button>
+    </div>
+  </div>
+</form>
diff --git a/uVote/page/default_page/vote.tpl b/uVote/page/default_page/vote.tpl
index 07a80bb..22aec71 100644
--- a/uVote/page/default_page/vote.tpl
+++ b/uVote/page/default_page/vote.tpl
@@ -8,7 +8,7 @@
 
         <div class="span5" style="">
             <h2>Abstimmung</h2>             
-            <a class="btn btn-large btn-green btnvote_yes" style="width: 110px;" poll_ID="${ID}">Pro &raquo;
+            <a class="btn btn-large btn-green btnvote_yes" style="width: 110px;" poll_ID="${poll_ID}">Pro &raquo;
 
             </a>