From 38ac8479a9a46bdcb4aec1a552690465c8be32cd Mon Sep 17 00:00:00 2001 From: Nael Date: Mon, 1 Jul 2013 17:55:49 +0200 Subject: [PATCH] tried to get js working for vote.tpl animation --- uVote/page/default_page/default_page.php | 8 +++++++- uVote/page/default_page/js/loadtexts.js | 19 +++++++++++++++++++ uVote/page/default_page/openvoteinfo.tpl | 3 +++ uVote/page/default_page/vote.tpl | 11 ++++++++--- 4 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 uVote/page/default_page/openvoteinfo.tpl diff --git a/uVote/page/default_page/default_page.php b/uVote/page/default_page/default_page.php index 9a66fe9..efa76c7 100644 --- a/uVote/page/default_page/default_page.php +++ b/uVote/page/default_page/default_page.php @@ -22,7 +22,8 @@ class default_page extends SYSTEM\PAGE\Page { } return $result; } - + + public function getloggedinform(){ return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/loggedinform.tpl'),array());} @@ -35,6 +36,10 @@ class default_page extends SYSTEM\PAGE\Page { public function exchange_loginform(){ return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/loggedinformtop.tpl'),array());} + public function load_openvoteinfo(){ + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/openvoteinfo.tpl'),array());} + + // public function create_account(){ // $result = ""; // $accdata = data::getuserpersonaldata(1); @@ -60,6 +65,7 @@ public function html(){ $vars['js'] = $this->js(); $vars['votelist'] = $this->generate_votelist(); // $vars['personaldata'] = $this->getuserpersonaldata(); + $vars['openvoteinfo'] = $this->load_openvoteinfo(); $vars['registerform'] = \SYSTEM\SECURITY\Security::isLoggedIn() ? $this->getloggedinform() : $this->exchange_registerform(); $vars['loginform'] = \SYSTEM\SECURITY\Security::isLoggedIn() ? $this->exchange_loginform() : $this->getloginform() ; $vars['PIC_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_page/pics/'); diff --git a/uVote/page/default_page/js/loadtexts.js b/uVote/page/default_page/js/loadtexts.js index 52d0cae..8d50878 100644 --- a/uVote/page/default_page/js/loadtexts.js +++ b/uVote/page/default_page/js/loadtexts.js @@ -15,6 +15,10 @@ $(document).ready(function() { $('.btnvote_off').click(function () { vote_click($(this).attr('poll_ID'),3); }); + + $('.btn_openvoteinfo').click(function () { + load_openvoteinfo($(this).attr('url')); + }); // $('#register_btn').click(function () { // account_create ($(this).attr ('#inputEmail')) // }); @@ -73,6 +77,21 @@ function account_create(inputEmail, inputPassword){ }); } +function load_openvoteinfo (url){ + var dataTmp; + $.get(url, function (data) { + dataTmp = data; + bodyelem = $("html,body"); + bodyelem.animate(); + }).complete(function() { + $('#openvoteinfo').slideUp({duration: 'slow', + complete: function(){ + $('#openvoteinfo').html(dataTmp); + $('#openvoteinfo').slideDown('slow'); + site_content_is_visible = true; + }}); + }); +} function vote_click (poll_ID, vote) { $.get('./api.php?call=vote&action=vote&poll_ID=' + poll_ID + '&vote=' + vote, function (data) { diff --git a/uVote/page/default_page/openvoteinfo.tpl b/uVote/page/default_page/openvoteinfo.tpl new file mode 100644 index 0000000..82a17c7 --- /dev/null +++ b/uVote/page/default_page/openvoteinfo.tpl @@ -0,0 +1,3 @@ +
+

${vote_text}

+
\ No newline at end of file diff --git a/uVote/page/default_page/vote.tpl b/uVote/page/default_page/vote.tpl index 487fede..0263b5a 100644 --- a/uVote/page/default_page/vote.tpl +++ b/uVote/page/default_page/vote.tpl @@ -3,8 +3,13 @@ box-shadow: 1px 1px 4px 1px rgba(0, 0, 0, 0.5);">

${vote_title}

-

${vote_text}

- + +
+

${vote_text}

+
+
@@ -20,7 +25,7 @@ box-shadow: 1px 1px 4px 1px rgba(0, 0, 0, 0.5);">
- +
\ No newline at end of file