webcraftmedia/u-vote.eu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup step 1

Browse Source
This commit is contained in:
Naeltard 2015-10-02 00:55:34 +02:00
parent eadca2f936
commit 203a1d1caa
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
uvote/page/default_page/default_page.php
View File

@ -131,9 +131,6 @@ class default_page extends SYSTEM\PAGE\Page {
return $result[0].$result[1];
}
public function get_coverpage(){
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/cover.tpl'), array());}
public function getloggedinform(){
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/loggedinform.tpl'),array());}
@ -154,7 +151,7 @@ class default_page extends SYSTEM\PAGE\Page {
$vars['registerform'] = \SYSTEM\SECURITY\Security::isLoggedIn() ? $this->getloggedinform() : $this->exchange_registerform();
$vars['loginform'] = \SYSTEM\SECURITY\Security::isLoggedIn() ? $this->exchange_loginform() : $this->getloginform() ;
$vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=frontend_logos&id=';
$vars['votelist'] = $this->generate_votelist();
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote'));
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote_register'));

4
uvote/page/default_page/tpl/page.tpl
View File

@ -38,10 +38,6 @@
<nav class="navbar navbar-default navbar-inverse navbar-fixed-top">
<div class="container-fluid">
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li><a class="brand" href="" id="menu_uvote">uVote</a></li>
<li><a data-toggle="modal" class="brand" href="#impressum" id="impressum"><font size="2">impressum</font></a></li>
</ul>
${loginform}
</div>
<!--<div class="navbar-inner">-->

3
uvote/page/user_main/main_menu.tpl
View File

@ -2,7 +2,8 @@
<ul class="nav nav-tabs" id="tabs_user_main">
<li class="active"><a href="#!start(user_main(u))">Abstimmen</a></li>
<li><a href="#!start(user_main(ur))">Auswerten</a></li>
<li><a href="#!start(user_main(my))">Mithelfen</a></li>
<li><a href="#!start(user_main(my))">Mithelfen</a></li>
<li><a data-toggle="modal" class="brand" href="#impressum" id="impressum"><font size="2">Impressum</font></a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="tab_main"></div>