diff --git a/uVote/page/PageApi.php b/uVote/page/PageApi.php index 48f662f..d6eb19c 100644 --- a/uVote/page/PageApi.php +++ b/uVote/page/PageApi.php @@ -5,8 +5,8 @@ class PageApi extends \SYSTEM\PAGE\PageClass { public static function default_page(){ return new default_page();} - public static function default_myVote(){ - return new default_myVote();} + public static function action_myvote(){ + return new default_myvote();} public static function action_media(){ throw new ERROR("test"); diff --git a/uVote/page/default_myVote/default_myvote.html b/uVote/page/default_myVote/default_myvote.html deleted file mode 100644 index a27c3af..0000000 --- a/uVote/page/default_myVote/default_myvote.html +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - myVote - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - myVote -
- -
- - - -
-
-
-
-
- -
- - - -
-
-
- -
- -
-
-
-
- -
-
-
- ${comparelist} -
-
- - diff --git a/uVote/page/default_myvote/default_myvote.php b/uVote/page/default_myvote/default_myvote.php new file mode 100644 index 0000000..8fbba7d --- /dev/null +++ b/uVote/page/default_myvote/default_myvote.php @@ -0,0 +1,25 @@ + $vote['title'], 'vote_text' => $vote['text']); + $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote.tpl'), $vars); + } + return $result; + } + + public function html(){ + $vars = array(); + $vars['js'] = $this->js(); + $vars['PIC_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_myvote/pics/'); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_myvote/myvote.html'), $vars); + + } +} \ No newline at end of file diff --git a/uVote/page/default_myVote/lib/bootstrap/css/bootstrap-responsive.css b/uVote/page/default_myvote/lib/bootstrap/css/bootstrap-responsive.css similarity index 100% rename from uVote/page/default_myVote/lib/bootstrap/css/bootstrap-responsive.css rename to uVote/page/default_myvote/lib/bootstrap/css/bootstrap-responsive.css diff --git a/uVote/page/default_myVote/lib/bootstrap/css/bootstrap-responsive.min.css b/uVote/page/default_myvote/lib/bootstrap/css/bootstrap-responsive.min.css similarity index 100% rename from uVote/page/default_myVote/lib/bootstrap/css/bootstrap-responsive.min.css rename to uVote/page/default_myvote/lib/bootstrap/css/bootstrap-responsive.min.css diff --git a/uVote/page/default_myVote/lib/bootstrap/css/bootstrap.css b/uVote/page/default_myvote/lib/bootstrap/css/bootstrap.css similarity index 100% rename from uVote/page/default_myVote/lib/bootstrap/css/bootstrap.css rename to uVote/page/default_myvote/lib/bootstrap/css/bootstrap.css diff --git a/uVote/page/default_myVote/lib/bootstrap/css/bootstrap.min.css b/uVote/page/default_myvote/lib/bootstrap/css/bootstrap.min.css similarity index 100% rename from uVote/page/default_myVote/lib/bootstrap/css/bootstrap.min.css rename to uVote/page/default_myvote/lib/bootstrap/css/bootstrap.min.css diff --git a/uVote/page/default_myVote/lib/bootstrap/img/glyphicons-halflings-white.png b/uVote/page/default_myvote/lib/bootstrap/img/glyphicons-halflings-white.png similarity index 100% rename from uVote/page/default_myVote/lib/bootstrap/img/glyphicons-halflings-white.png rename to uVote/page/default_myvote/lib/bootstrap/img/glyphicons-halflings-white.png diff --git a/uVote/page/default_myVote/lib/bootstrap/img/glyphicons-halflings.png b/uVote/page/default_myvote/lib/bootstrap/img/glyphicons-halflings.png similarity index 100% rename from uVote/page/default_myVote/lib/bootstrap/img/glyphicons-halflings.png rename to uVote/page/default_myvote/lib/bootstrap/img/glyphicons-halflings.png diff --git a/uVote/page/default_myVote/lib/bootstrap/js/bootstrap.js b/uVote/page/default_myvote/lib/bootstrap/js/bootstrap.js similarity index 100% rename from uVote/page/default_myVote/lib/bootstrap/js/bootstrap.js rename to uVote/page/default_myvote/lib/bootstrap/js/bootstrap.js diff --git a/uVote/page/default_myVote/lib/bootstrap/js/bootstrap.min.js b/uVote/page/default_myvote/lib/bootstrap/js/bootstrap.min.js similarity index 100% rename from uVote/page/default_myVote/lib/bootstrap/js/bootstrap.min.js rename to uVote/page/default_myvote/lib/bootstrap/js/bootstrap.min.js diff --git a/uVote/page/default_myVote/lib/bootstrap/js/jquery-1.9.1.min.js b/uVote/page/default_myvote/lib/bootstrap/js/jquery-1.9.1.min.js similarity index 100% rename from uVote/page/default_myVote/lib/bootstrap/js/jquery-1.9.1.min.js rename to uVote/page/default_myvote/lib/bootstrap/js/jquery-1.9.1.min.js diff --git a/uVote/page/default_myVote/lib/font-awesome/css/font-awesome-ie7.css b/uVote/page/default_myvote/lib/font-awesome/css/font-awesome-ie7.css similarity index 100% rename from uVote/page/default_myVote/lib/font-awesome/css/font-awesome-ie7.css rename to uVote/page/default_myvote/lib/font-awesome/css/font-awesome-ie7.css diff --git a/uVote/page/default_myVote/lib/font-awesome/css/font-awesome-ie7.min.css b/uVote/page/default_myvote/lib/font-awesome/css/font-awesome-ie7.min.css similarity index 100% rename from uVote/page/default_myVote/lib/font-awesome/css/font-awesome-ie7.min.css rename to uVote/page/default_myvote/lib/font-awesome/css/font-awesome-ie7.min.css diff --git a/uVote/page/default_myVote/lib/font-awesome/css/font-awesome.css b/uVote/page/default_myvote/lib/font-awesome/css/font-awesome.css similarity index 100% rename from uVote/page/default_myVote/lib/font-awesome/css/font-awesome.css rename to uVote/page/default_myvote/lib/font-awesome/css/font-awesome.css diff --git a/uVote/page/default_myVote/lib/font-awesome/css/font-awesome.min.css b/uVote/page/default_myvote/lib/font-awesome/css/font-awesome.min.css similarity index 100% rename from uVote/page/default_myVote/lib/font-awesome/css/font-awesome.min.css rename to uVote/page/default_myvote/lib/font-awesome/css/font-awesome.min.css diff --git a/uVote/page/default_myVote/lib/font-awesome/font/FontAwesome.otf b/uVote/page/default_myvote/lib/font-awesome/font/FontAwesome.otf similarity index 100% rename from uVote/page/default_myVote/lib/font-awesome/font/FontAwesome.otf rename to uVote/page/default_myvote/lib/font-awesome/font/FontAwesome.otf diff --git a/uVote/page/default_myVote/lib/font-awesome/font/fontawesome-webfont.eot b/uVote/page/default_myvote/lib/font-awesome/font/fontawesome-webfont.eot similarity index 100% rename from uVote/page/default_myVote/lib/font-awesome/font/fontawesome-webfont.eot rename to uVote/page/default_myvote/lib/font-awesome/font/fontawesome-webfont.eot diff --git a/uVote/page/default_myVote/lib/font-awesome/font/fontawesome-webfont.svg b/uVote/page/default_myvote/lib/font-awesome/font/fontawesome-webfont.svg similarity index 100% rename from uVote/page/default_myVote/lib/font-awesome/font/fontawesome-webfont.svg rename to uVote/page/default_myvote/lib/font-awesome/font/fontawesome-webfont.svg diff --git a/uVote/page/default_myVote/lib/font-awesome/font/fontawesome-webfont.ttf b/uVote/page/default_myvote/lib/font-awesome/font/fontawesome-webfont.ttf similarity index 100% rename from uVote/page/default_myVote/lib/font-awesome/font/fontawesome-webfont.ttf rename to uVote/page/default_myvote/lib/font-awesome/font/fontawesome-webfont.ttf diff --git a/uVote/page/default_myVote/lib/font-awesome/font/fontawesome-webfont.woff b/uVote/page/default_myvote/lib/font-awesome/font/fontawesome-webfont.woff similarity index 100% rename from uVote/page/default_myVote/lib/font-awesome/font/fontawesome-webfont.woff rename to uVote/page/default_myvote/lib/font-awesome/font/fontawesome-webfont.woff diff --git a/uVote/page/default_myVote/lib/font-awesome/less/bootstrap.less b/uVote/page/default_myvote/lib/font-awesome/less/bootstrap.less similarity index 100% rename from uVote/page/default_myVote/lib/font-awesome/less/bootstrap.less rename to uVote/page/default_myvote/lib/font-awesome/less/bootstrap.less diff --git a/uVote/page/default_myVote/lib/font-awesome/less/core.less b/uVote/page/default_myvote/lib/font-awesome/less/core.less similarity index 100% rename from uVote/page/default_myVote/lib/font-awesome/less/core.less rename to uVote/page/default_myvote/lib/font-awesome/less/core.less diff --git a/uVote/page/default_myVote/lib/font-awesome/less/extras.less b/uVote/page/default_myvote/lib/font-awesome/less/extras.less similarity index 100% rename from uVote/page/default_myVote/lib/font-awesome/less/extras.less rename to uVote/page/default_myvote/lib/font-awesome/less/extras.less diff --git a/uVote/page/default_myVote/lib/font-awesome/less/font-awesome-ie7.less b/uVote/page/default_myvote/lib/font-awesome/less/font-awesome-ie7.less similarity index 100% rename from uVote/page/default_myVote/lib/font-awesome/less/font-awesome-ie7.less rename to uVote/page/default_myvote/lib/font-awesome/less/font-awesome-ie7.less diff --git a/uVote/page/default_myVote/lib/font-awesome/less/font-awesome.less b/uVote/page/default_myvote/lib/font-awesome/less/font-awesome.less similarity index 100% rename from uVote/page/default_myVote/lib/font-awesome/less/font-awesome.less rename to uVote/page/default_myvote/lib/font-awesome/less/font-awesome.less diff --git a/uVote/page/default_myVote/lib/font-awesome/less/icons.less b/uVote/page/default_myvote/lib/font-awesome/less/icons.less similarity index 100% rename from uVote/page/default_myVote/lib/font-awesome/less/icons.less rename to uVote/page/default_myvote/lib/font-awesome/less/icons.less diff --git a/uVote/page/default_myVote/lib/font-awesome/less/mixins.less b/uVote/page/default_myvote/lib/font-awesome/less/mixins.less similarity index 100% rename from uVote/page/default_myVote/lib/font-awesome/less/mixins.less rename to uVote/page/default_myvote/lib/font-awesome/less/mixins.less diff --git a/uVote/page/default_myVote/lib/font-awesome/less/path.less b/uVote/page/default_myvote/lib/font-awesome/less/path.less similarity index 100% rename from uVote/page/default_myVote/lib/font-awesome/less/path.less rename to uVote/page/default_myvote/lib/font-awesome/less/path.less diff --git a/uVote/page/default_myVote/lib/font-awesome/less/variables.less b/uVote/page/default_myvote/lib/font-awesome/less/variables.less similarity index 100% rename from uVote/page/default_myVote/lib/font-awesome/less/variables.less rename to uVote/page/default_myvote/lib/font-awesome/less/variables.less diff --git a/uVote/page/default_myVote/lib/jquery/jquery-1.9.1.min.js b/uVote/page/default_myvote/lib/jquery/jquery-1.9.1.min.js similarity index 100% rename from uVote/page/default_myVote/lib/jquery/jquery-1.9.1.min.js rename to uVote/page/default_myvote/lib/jquery/jquery-1.9.1.min.js diff --git a/uVote/page/default_myvote/myvote.html b/uVote/page/default_myvote/myvote.html new file mode 100644 index 0000000..d1b723f --- /dev/null +++ b/uVote/page/default_myvote/myvote.html @@ -0,0 +1,30 @@ + +
+
+
+ +
+ +
+
+
+
+ +
+
+
+ ${comparelist} +
+ + diff --git a/uVote/page/default_myVote/pics/logo2.png b/uVote/page/default_myvote/pics/logo2.png similarity index 100% rename from uVote/page/default_myVote/pics/logo2.png rename to uVote/page/default_myvote/pics/logo2.png diff --git a/uVote/page/default_myVote/pics/myVote.png b/uVote/page/default_myvote/pics/myVote.png similarity index 100% rename from uVote/page/default_myVote/pics/myVote.png rename to uVote/page/default_myvote/pics/myVote.png diff --git a/uVote/page/default_page/default_page.php b/uVote/page/default_page/default_page.php index 7ea74f3..fae52e5 100644 --- a/uVote/page/default_page/default_page.php +++ b/uVote/page/default_page/default_page.php @@ -3,14 +3,17 @@ class default_page extends SYSTEM\PAGE\Page { private function js(){ - return ''; + return ''. + ''. + ''. + ''; } public function generate_votelist(){ $result = ""; $votes = votes::getAllVotesOfGroup(1); foreach($votes as $vote){ - $vars = array('vote_title' => $vote['title'], 'vote_text' => $vote['text']); + $vars = array('vote_title' => $vote['title'], 'vote_text' => $vote['text'], 'poll_ID' => rand(1, 100)); $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote.tpl'), $vars); } return $result; diff --git a/uVote/page/default_page/js/loadtexts.js b/uVote/page/default_page/js/loadtexts.js new file mode 100644 index 0000000..6ede851 --- /dev/null +++ b/uVote/page/default_page/js/loadtexts.js @@ -0,0 +1,67 @@ +/* jQuery on document ready */ +$(document).ready(function() { + // handle navigation link click + $('.navbar ul li a').not('#menu_uvote').click(function () { + loadAjaxContent($(this).attr('url')); + + //loadUrlPic($(this).attr('url')); + }); + $('.btnvote_yes').click(function () { + vote_click($(this).attr('poll_ID'),1); + }); + $('.btnvote_no').click(function () { + vote_click($(this).attr('poll_ID'),2); + }); + $('.btnvote_off').click(function () { + vote_click($(this).attr('poll_ID'),3); + }); +}); +function vote_click (poll_ID, vote) { + $.get('./api.php?call=vote&action=vote&poll_ID=' + poll_ID + '&vote=' + vote, function (data) { + dataTmp = data; + }).complete(function() { + alert (poll_ID); + }); +} + +function loadAjaxContent(url) { + var dataTmp; + $.get(url, function (data) { + dataTmp = data; + bodyelem = $("html,body"); + bodyelem.animate(); + }).complete(function() { + $('#site-content-wrapper').slideUp({duration: 'slow', + complete: function(){ + $('#site-content').html(dataTmp); + $('#site-content-wrapper').slideDown('slow'); + site_content_is_visible = true; + }}); + }); +} +function loadUrlPic(url_pic) { + var dataTmp; + $.get(url_pic, function (data) { + dataTmp = data; + bodyelem = $("html,body"); + bodyelem.animate(); + }).complete(function() { + $('.carousel-inner').slideUp({duration: 'slow', + complete: function(){ + $('#pic').html(dataTmp); + $('.carousel-inner').slideDown('slow'); + site_content_is_visible = true; + }}); + }); +} + +function loadApiPic(id) { + var dataTmp; + $.get('./api.php?call=img&id='+id, function (data) { + dataTmp = data; + bodyelem = $("html,body"); + bodyelem.animate(); + }).complete(function() { + + }); +} \ No newline at end of file diff --git a/uVote/page/default_page/js/vote_positive.js b/uVote/page/default_page/js/vote_positive.js new file mode 100644 index 0000000..94f0cc7 --- /dev/null +++ b/uVote/page/default_page/js/vote_positive.js @@ -0,0 +1,14 @@ + + $(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 5ffd564..4953ae8 100644 --- a/uVote/page/default_page/page.html +++ b/uVote/page/default_page/page.html @@ -1,8 +1,9 @@ - + iVote + @@ -43,13 +44,13 @@ - uVote + uVote
@@ -62,10 +63,10 @@
-
+
- +
@@ -101,7 +102,7 @@

Entwurf der Seite von Tobias Rechel, Mojotrollz.eu

- +
\ No newline at end of file diff --git a/uVote/page/default_page/vote.tpl b/uVote/page/default_page/vote.tpl index 87fa068..22aec71 100644 --- a/uVote/page/default_page/vote.tpl +++ b/uVote/page/default_page/vote.tpl @@ -8,25 +8,12 @@

Abstimmung

- Pro » - - Contra » - Enthaltung » + Contra » + Enthaltung » diff --git a/uVote/page/register_page_classes.php b/uVote/page/register_page_classes.php index da16e1b..30ebe87 100644 --- a/uVote/page/register_page_classes.php +++ b/uVote/page/register_page_classes.php @@ -4,6 +4,5 @@ $autoload = SYSTEM\autoload::getInstance(); $autoload->registerFolder(dirname(__FILE__),''); $autoload->registerFolder(dirname(__FILE__).'/default_page',''); - -$autoload->registerFolder(dirname(__FILE__),''); +$autoload->registerFolder(dirname(__FILE__).'/default_myvote',''); $autoload->registerFolder(dirname(__FILE__).'/default_register','');