diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2013-10-11 00:24:25 -0700 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2013-10-11 00:24:25 -0700 |
| commit | 7a63d5e50b0ae16a38e673867abd6043d4becc07 (patch) | |
| tree | 6d174d12a0de707ed8f875801a8dbc0c35f70d3f /view/php | |
| parent | c2a88c3e4858e3eb2c553bdc775d2f684b0d46b4 (diff) | |
| parent | 89fc319c900873be58fa677707518646f6c79eec (diff) | |
| download | volse-hubzilla-7a63d5e50b0ae16a38e673867abd6043d4becc07.tar.gz volse-hubzilla-7a63d5e50b0ae16a38e673867abd6043d4becc07.tar.bz2 volse-hubzilla-7a63d5e50b0ae16a38e673867abd6043d4becc07.zip | |
Merge pull request #2 from friendica/master
Upgraded to latest red
Diffstat (limited to 'view/php')
| -rw-r--r-- | view/php/default.php | 6 | ||||
| -rw-r--r-- | view/php/theme_init.php | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/view/php/default.php b/view/php/default.php index ae4da50b4..3573bf829 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -7,12 +7,12 @@ </head>
<body>
<?php if(x($page,'nav')) echo $page['nav']; ?>
- <aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
- <section><?php if(x($page,'content')) echo $page['content']; ?>
+ <aside id="region_1"><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
+ <section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
<div id="page-footer"></div>
<div id="pause"></div>
</section>
- <right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
+ <aside id="region_3"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
</body>
</html>
diff --git a/view/php/theme_init.php b/view/php/theme_init.php index e4a56acc3..8b75bc940 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -10,6 +10,7 @@ head_add_css('library/jgrowl/jquery.jgrowl.css'); head_add_css('library/jslider/css/jslider.css'); head_add_css('library/prettyphoto/css/prettyPhoto.css'); head_add_css('library/colorbox/colorbox.css'); +head_add_css('library/font_awesome/css/font-awesome.min.css'); head_add_js('js/jquery.js'); head_add_js('js/jquery-migrate-1.1.1.js'); |