diff --git a/uVote/page/default_page/closedvoteinfo.tpl b/uVote/page/default_page/closedvoteinfo.tpl new file mode 100644 index 0000000..b5c6982 --- /dev/null +++ b/uVote/page/default_page/closedvoteinfo.tpl @@ -0,0 +1,7 @@ +
+
${text}

+
  • +

    ${text}

    +
    +
    \ 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 efa76c7..b1bb03a 100644 --- a/uVote/page/default_page/default_page.php +++ b/uVote/page/default_page/default_page.php @@ -17,7 +17,7 @@ class default_page extends SYSTEM\PAGE\Page { $result = ""; $votes = votes::getAllVotesOfGroup(1); foreach($votes as $vote){ - $vars = array('vote_title' => $vote['title'], 'vote_text' => $vote['text'], 'poll_ID' => $vote['ID']); + $vars = array('vote_title' => $vote['title'], 'vote_text' => $vote['text'], 'poll_ID' => $vote['ID'], 'time_end' => $vote['time_end']); $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 index 0a0905c..a8b4998 100644 --- a/uVote/page/default_page/js/loadtexts.js +++ b/uVote/page/default_page/js/loadtexts.js @@ -17,7 +17,7 @@ $(document).ready(function() { }); $('.btn_openvoteinfo').click(function () { - alert ("#openvoteinfo"+$(this).attr('poll_ID')); + alert ("#openvoteinfo"+$(this).attr('poll_ID')('time_end')); if($("#openvoteinfo"+$(this).attr('poll_ID')).not(":visible")){ load_openvoteinfo($(this).attr('poll_ID')); } diff --git a/uVote/page/default_page/openvoteinfo.tpl b/uVote/page/default_page/openvoteinfo.tpl index a62c6da..bab18a4 100644 --- a/uVote/page/default_page/openvoteinfo.tpl +++ b/uVote/page/default_page/openvoteinfo.tpl @@ -1,3 +1,7 @@ -
    +
    +
    ${text}

    -
    \ No newline at end of file +
  • +

    ${text}

    +
    +
    diff --git a/uVote/page/default_page/page.html b/uVote/page/default_page/page.html index 22c8ea8..6dab143 100644 --- a/uVote/page/default_page/page.html +++ b/uVote/page/default_page/page.html @@ -66,7 +66,7 @@
    -
    +
    ${registerform} diff --git a/uVote/page/default_page/vote.tpl b/uVote/page/default_page/vote.tpl index 08df630..7a6aec1 100644 --- a/uVote/page/default_page/vote.tpl +++ b/uVote/page/default_page/vote.tpl @@ -1,16 +1,18 @@ -
    -
    +
    +

    ${vote_title}

    + -