clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #226 from simonlnu/master 

re-factor default.php
This commit is contained in:
Simon 2012-04-10 23:01:57 -07:00
parent 967ed8e23f c79d1deb92
commit cdb6510b9f
4 changed files with 108 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
view/theme/dispy-dark/default.php
View File

@ -6,20 +6,31 @@
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head>
<body>
<?php if(x($page,'nav')) echo $page['nav']; ?>
<aside id="asideleft">
<?php if(x($page,'aside')) echo $page['aside']; ?>
<?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
</aside>
<section>
<?php if(x($page,'content')) echo $page['content']; ?>
<div id="page-footer"></div>
</section>
<aside id="asideright">
<?php if(x($page,'aside_right')) echo $page['aside_right']; ?>
<?php if(x($page,'aside_right_bottom')) echo $page['aside_right_bottom']; ?>
</aside>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
<header>
<!-- header stuff will go here -->
</header>
<article id="articlemain">
<?php if(x($page,'nav')) echo $page['nav']; ?>
<aside id="asideleft">
<?php if(x($page,'aside_left')) echo $page['aside_left']; ?>
<?php if(x($page,'aside_left_bottom')) echo $page['aside_left_bottom']; ?>
</aside>
<section id="sectionmain">
<?php if(x($page,'content')) echo $page['content']; ?>
<footer id="section-footer"></footer>
</section>
<aside id="asidemain">
<?php if(x($page,'aside')) echo $page['aside']; ?>
<?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
</aside>
<aside id="asideright">
<?php if(x($page,'aside_right')) echo $page['aside_right']; ?>
<?php if(x($page,'aside_right_bottom')) echo $page['aside_right_bottom']; ?>
</aside>
</article>
<footer id="page-footer">
<?php if(x($page,'footer')) echo $page['footer']; ?>
</footer>
</body>
</html>

49
view/theme/dispy-dark/style.css
View File

@ -1,7 +1,7 @@
/*
* dispy-dark
*
* modernised, sort of, by simon <http://simon.kisikew.org/>
* author, maintainer: simon <http://simon.kisikew.org/>
*
*/
@ -210,12 +210,17 @@ input[type=submit] {
margin: 5px 0;
list-style: none;
}
#articlemain {
width: 100%;
height: 100%;
margin: 0 auto;
}
/**
* login
*/
aside .field {
#asidemain .field {
overflow: hidden;
width: 200px;
}
@ -247,7 +252,7 @@ aside .field {
#login-submit-button {
margin-left: 0px !important;
}
aside #login_openid {
#asidemain #login_openid {
position: relative !important;
float: none !important;
margin-left: 0px !important;
@ -268,13 +273,10 @@ aside #login_openid {
*/
nav {
height: 60px;
display: block;
background-color: #1d1f1d;
color: #eeeeec;
position: relative;
padding: 20px 20px 10px 95px;
margin-left: auto;
margin-right: auto;
}
nav a {
text-decoration: none;
@ -707,12 +709,16 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
/**
* aside
**/
aside {
position: absolute;
right: 15px;
width: 245px;
padding-top: 15px;
#asidemain {
float: left;
font-size: smaller;
margin: 20px 0 20px 35px;
width: 25%;
display: inline;
}
/* for now, disappear these */
#asideright, #asideleft {
display: none;
}
.vcard .fn {
font-size: 1.7em;
@ -742,10 +748,10 @@ aside {
.vcard #profile-photo-wrapper img {
box-shadow: 3px 3px 10px 0 #000;
}
aside h4 {
#asidemain h4 {
font-size: 1.2em;
}
aside #viewcontacts {
#asidemain #viewcontacts {
text-align: right;
}
.aprofile dt {
@ -1064,12 +1070,13 @@ aside #viewcontacts {
/**
* section
*/
section {
margin: 20px 9% 0 4%;
#sectionmain {
margin: 20px;
font-size: 0.8em;
padding-right: 230px;
min-width: 475px;
width: 65%;
width: 67%;
float: left;
display: inline;
}
/** tabs **/
@ -1333,19 +1340,19 @@ section {
width: 100%;
}
#connect-services-header {
margin: 5px 0 0 0;
}
#connect-services {
margin: 5px 0 0 0;
}
#extra-help-header {
margin: 5px 0 0 0;
}
#extra-help {
margin: 5px 0 0 0;
}
#postit-header {
margin: 5px 0 0 0;
}
#postit {
margin: 5px 0 0 0;
@ -2776,7 +2783,7 @@ div[id$="wrapper"] br {
}
footer {
display: block;
margin: 50px 20%;
/*margin: 50px 20%;*/
clear: both;
}
#profile-jot-text {

39
view/theme/dispy/default.php
View File

@ -6,20 +6,31 @@
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head>
<body>
<?php if(x($page,'nav')) echo $page['nav']; ?>
<aside id="asideleft">
<?php if(x($page,'aside')) echo $page['aside']; ?>
<?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
</aside>
<section>
<?php if(x($page,'content')) echo $page['content']; ?>
<div id="page-footer"></div>
</section>
<aside id="asideright">
<?php if(x($page,'aside_right')) echo $page['aside_right']; ?>
<?php if(x($page,'aside_right_bottom')) echo $page['aside_right_bottom']; ?>
</aside>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
<header>
<!-- header stuff will go here -->
</header>
<article id="articlemain">
<?php if(x($page,'nav')) echo $page['nav']; ?>
<aside id="asideleft">
<?php if(x($page,'aside_left')) echo $page['aside_left']; ?>
<?php if(x($page,'aside_left_bottom')) echo $page['aside_left_bottom']; ?>
</aside>
<section id="sectionmain">
<?php if(x($page,'content')) echo $page['content']; ?>
<footer id="section-footer"></footer>
</section>
<aside id="asidemain">
<?php if(x($page,'aside')) echo $page['aside']; ?>
<?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
</aside>
<aside id="asideright">
<?php if(x($page,'aside_right')) echo $page['aside_right']; ?>
<?php if(x($page,'aside_right_bottom')) echo $page['aside_right_bottom']; ?>
</aside>
</article>
<footer id="page-footer">
<?php if(x($page,'footer')) echo $page['footer']; ?>
</footer>
</body>
</html>

52
view/theme/dispy/style.css
View File

@ -1,7 +1,8 @@
/*
* dispy
*
* modernised, sort of, by simon <http://simon.kisikew.org/>
* maintainer: simon <http://simon.kisikew.org/>
* author: unknown
*
*/
@ -210,12 +211,17 @@ input[type=submit] {
margin: 5px 0;
list-style: none;
}
#articlemain {
width: 100%;
height: 100%;
margin: 0 auto;
}
/**
* login
*/
aside .field {
#asidemain .field {
overflow: hidden;
width: 200px;
}
@ -247,7 +253,7 @@ aside .field {
#login-submit-button {
margin-left: 0px !important;
}
aside #login_openid {
#asidemain #login_openid {
position: relative !important;
float: none !important;
margin-left: 0px !important;
@ -268,13 +274,10 @@ aside #login_openid {
*/
nav {
height: 60px;
display: block;
background-color: #2e3436;
color: #eeeeec;
position: relative;
padding: 20px 20px 10px 95px;
margin-left: auto;
margin-right: auto;
}
nav a {
text-decoration: none;
@ -707,12 +710,16 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
/**
* aside
**/
aside {
position: absolute;
right: 15px;
width: 245px;
padding-top: 15px;
#asidemain {
float: left;
font-size: smaller;
margin: 20px 0 20px 35px;
width: 25%;
display: inline;
}
/* for now, disappear these */
#asideright, #asideleft {
display: none;
}
.vcard .fn {
font-size: 1.7em;
@ -742,15 +749,15 @@ aside {
.vcard #profile-photo-wrapper img {
box-shadow: 3px 3px 10px 0 #000;
}
aside h4 {
#asidemain h4 {
font-size: 1.2em;
}
aside #viewcontacts {
#asidemain #viewcontacts {
text-align: right;
}
.aprofile dt {
color: #666666;
background: transparent;
color: #666666;
font-weight: bold;
box-shadow: 1px 1px 5px 0 #000;
margin: 15px 0 5px;
@ -1064,12 +1071,13 @@ aside #viewcontacts {
/**
* section
*/
section {
margin: 20px 9% 0 4%;
#sectionmain {
margin: 20px;
font-size: 0.8em;
padding-right: 230px;
min-width: 475px;
width: 65%;
width: 67%;
float: left;
display: inline;
}
/** tabs **/
@ -1333,19 +1341,19 @@ section {
width: 100%;
}
#connect-services-header {
margin: 5px 0 0 0;
}
#connect-services {
margin: 5px 0 0 0;
}
#extra-help-header {
margin: 5px 0 0 0;
}
#extra-help {
margin: 5px 0 0 0;
}
#postit-header {
margin: 5px 0 0 0;
}
#postit {
margin: 5px 0 0 0;
@ -2776,7 +2784,7 @@ div[id$="wrapper"] br {
}
footer {
display: block;
margin: 50px 20%;
/*margin: 50px 20%;*/
clear: both;
}
#profile-jot-text {