Merge branch 'master' of mojotrollz.eu:hosting
This commit is contained in:
parent
5048989456
commit
3ad6ac284a
@ -5,6 +5,9 @@ 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_media(){
|
||||
throw new ERROR("test");
|
||||
}
|
||||
|
||||
@ -93,40 +93,7 @@ and open the template in the editor.
|
||||
</div>
|
||||
</div>
|
||||
<div class="hero-unit" style="padding: 5px;">
|
||||
<div class="hero-unit" style="padding: 5px; background: white;">
|
||||
<div class="row" style="width: 100%; margin: auto;">
|
||||
<div class="span6">
|
||||
<h2>Title</h2>
|
||||
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper.</p>
|
||||
<i class="icon-chevron-sign-down"></i>
|
||||
</div>
|
||||
|
||||
<div class="span5" style="">
|
||||
<h2>Abstimmung</h2>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="hero-unit" style="padding: 5px; background: white; margin-top: -20px;">
|
||||
<div class="row" style="width: 100%; margin: auto;">
|
||||
<div class="span6">
|
||||
<h2>Title</h2>
|
||||
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper.</p>
|
||||
<i class="icon-chevron-sign-down"></i>
|
||||
</div>
|
||||
|
||||
<div class="span5" style="">
|
||||
<h2>Abstimmung</h2>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
${comparelist}
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
@ -8,7 +8,7 @@ class default_page extends SYSTEM\PAGE\Page {
|
||||
|
||||
public function html(){
|
||||
$vars = array();
|
||||
$vars['js'] = $this->js();
|
||||
$vars['js'] = $this->js();
|
||||
$vars['PIC_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'uVote/page/default_page/pics/');
|
||||
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_register/register.html'), $vars);
|
||||
}
|
||||
|
||||
@ -6,4 +6,4 @@ $autoload->registerFolder(dirname(__FILE__),'');
|
||||
$autoload->registerFolder(dirname(__FILE__).'/default_page','');
|
||||
|
||||
$autoload->registerFolder(dirname(__FILE__),'');
|
||||
$autoload->registerFolder(dirname(__FILE__).'/default_register','');
|
||||
$autoload->registerFolder(dirname(__FILE__).'/default_myVote','');
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user