aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-30 15:12:20 -0700
committerfriendica <info@friendica.com>2012-03-30 15:12:20 -0700
commitaace55df0ad279d74c5e612078c3f29d114389dc (patch)
treeec1318b325ec3dc5ab2bc4ded5dae1c657b8fc7b /view
parentcfdfcb37cbed8354e9f6c025a6e9ccadafc2d625 (diff)
parent007d67a998eb8f26228ddd22bb0323d54af9af8c (diff)
downloadvolse-hubzilla-aace55df0ad279d74c5e612078c3f29d114389dc.tar.gz
volse-hubzilla-aace55df0ad279d74c5e612078c3f29d114389dc.tar.bz2
volse-hubzilla-aace55df0ad279d74c5e612078c3f29d114389dc.zip
Merge branch 'pull'
Diffstat (limited to 'view')
-rwxr-xr-xview/settings.tpl5
-rw-r--r--view/settings_display.tpl23
-rwxr-xr-xview/theme/diabook-aerith/communityhome.tpl2
-rw-r--r--view/theme/diabook-aerith/style-network.css16
-rw-r--r--view/theme/diabook-aerith/style-profile.css17
-rw-r--r--view/theme/diabook-aerith/style.css15
-rwxr-xr-xview/theme/diabook-red/communityhome.tpl2
-rw-r--r--view/theme/diabook-red/style-network.css31
-rw-r--r--view/theme/diabook-red/style-profile.css15
-rw-r--r--view/theme/diabook-red/style.css13
-rwxr-xr-xview/theme/quattro-green/experimental0
-rw-r--r--view/theme/quattro-green/screenshot.pngbin147135 -> 0 bytes
-rw-r--r--view/theme/quattro-green/theme.php56
-rw-r--r--view/theme/quattro-green/theme_settings.tpl11
-rw-r--r--view/theme/quattro/config.php39
-rw-r--r--view/theme/quattro/dark/Makefile4
-rwxr-xr-xview/theme/quattro/dark/colors.less (renamed from view/theme/quattro/colors.less)0
-rwxr-xr-xview/theme/quattro/dark/style.css (renamed from view/theme/quattro/style.css)43
-rwxr-xr-xview/theme/quattro/dark/style.less (renamed from view/theme/quattro/style.less)4
-rw-r--r--view/theme/quattro/green/Makefile4
-rwxr-xr-xview/theme/quattro/green/colors.less (renamed from view/theme/quattro-green/colors.less)0
-rwxr-xr-xview/theme/quattro/green/style.css (renamed from view/theme/quattro-green/style.css)43
-rwxr-xr-xview/theme/quattro/green/style.less (renamed from view/theme/quattro-green/style.less)4
-rw-r--r--view/theme/quattro/screenshot.jpgbin71709 -> 69607 bytes
-rw-r--r--view/theme/quattro/style.php9
-rw-r--r--view/theme/quattro/theme.php26
-rw-r--r--view/theme/quattro/theme_settings.tpl15
27 files changed, 211 insertions, 186 deletions
diff --git a/view/settings.tpl b/view/settings.tpl
index 75225a0f1..f0fd70921 100755
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -28,10 +28,7 @@ $nickname_block
{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
{{inc field_input.tpl with $field=$defloc }}{{endinc}}
{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
-{{inc field_themeselect.tpl with $field=$theme }}{{endinc}}
-{{inc field_input.tpl with $field=$ajaxint }}{{endinc}}
-{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}}
+
<div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="$submit" />
diff --git a/view/settings_display.tpl b/view/settings_display.tpl
new file mode 100644
index 000000000..fc7a56c8a
--- /dev/null
+++ b/view/settings_display.tpl
@@ -0,0 +1,23 @@
+$tabs
+
+<h1>$ptitle</h1>
+
+<form action="settings/display" id="settings-form" method="post" autocomplete="off" >
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
+{{inc field_themeselect.tpl with $field=$theme }}{{endinc}}
+{{inc field_input.tpl with $field=$ajaxint }}{{endinc}}
+{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}}
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+{{ if $theme_config }}
+<h2>Theme settings</h2>
+$theme_config
+{{ endif }}
+
+</form>
diff --git a/view/theme/diabook-aerith/communityhome.tpl b/view/theme/diabook-aerith/communityhome.tpl
index cff75cd40..cf8d81335 100755
--- a/view/theme/diabook-aerith/communityhome.tpl
+++ b/view/theme/diabook-aerith/communityhome.tpl
@@ -17,7 +17,7 @@
<div id="close_services">
{{ if $lastusers_title }}
<h3>Connectable Services<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
-<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
+<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-blue/icons/facebook.png" title="Facebook"></a>
<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-blue/icons/StatusNet.png?" title="StatusNet"></a>
<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-blue/icons/livejournal.png?" title="LiveJournal"></a>
diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css
index dd8d62122..b35a70c65 100644
--- a/view/theme/diabook-aerith/style-network.css
+++ b/view/theme/diabook-aerith/style-network.css
@@ -557,13 +557,14 @@ header #banner a:hover {
outline: none;
vertical-align: middle;
font-weight: bolder;
+ margin-left: 3px;
}
header #banner #logo-img {
height: 25px;
margin-top: 3px;
}
header #banner #logo-text {
- font-size: 21px;
+ font-size: 20px;
position: absolute;
top: 10%;
}
@@ -718,7 +719,7 @@ nav .nav-menu.selected {
nav .nav-notify {
display: none;
position: absolute;
- background-color: #ff0000;
+ background-color: #fff;
/* background-color: #19aeff; */
-moz-border-radius: 5px 5px 5px 5px;
-webkit-border-radius: 5px 5px 5px 5px;
@@ -730,6 +731,7 @@ nav .nav-notify {
right: -6px;
min-width: 10px;
text-align: center;
+ border: 1px solid black;
}
nav .nav-notify.show {
display: block;
@@ -752,7 +754,7 @@ nav #nav-home-link, #nav-directory-link, #nav-apps-link{
margin-right: 0px;
font-weight: bold;
margin: 3px 5px;
- font-size: 15px;
+ font-size: 14px;
}
nav #nav-directory-link{
margin-right: 0px;
@@ -1037,6 +1039,8 @@ aside #profiles-menu {
}
aside #search-text {
width: 150px;
+ height: 17px;
+ padding-left: 10px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
@@ -1259,6 +1263,7 @@ right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow:
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
right_aside .icon {width: 10px; height: 10px;}
.close_box {
background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png");
@@ -1744,6 +1749,7 @@ transition: all 0.2s ease-in-out;
#profile-jot-submit {
float: right;
margin-top: 2px;
+ font-size: 14px;
}
#profile-upload-wrapper {
@@ -1796,7 +1802,7 @@ transition: all 0.2s ease-in-out;
float: right;
margin-left: 10px;
margin-top: 2px;
- font-size: 10px;
+ font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
@@ -1809,7 +1815,6 @@ transition: all 0.2s ease-in-out;
.button.creation1 {
background-color: #fff;
border: 1px solid #777777;
- background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
cursor: pointer;
@@ -1817,7 +1822,6 @@ transition: all 0.2s ease-in-out;
}
.button.creation2 {
background-color: #3465A4;
- background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css
index e350db93e..9c9f8b4e6 100644
--- a/view/theme/diabook-aerith/style-profile.css
+++ b/view/theme/diabook-aerith/style-profile.css
@@ -558,13 +558,14 @@ header #banner a:hover {
outline: none;
vertical-align: middle;
font-weight: bolder;
+ margin-left: 3px;
}
header #banner #logo-img {
height: 25px;
margin-top: 3px;
}
header #banner #logo-text {
- font-size: 21px;
+ font-size: 20px;
position: absolute;
top: 10%;
}
@@ -719,7 +720,7 @@ nav .nav-menu.selected {
nav .nav-notify {
display: none;
position: absolute;
- background-color: #ff0000;
+ background-color: #fff;
/* background-color: #19aeff; */
-moz-border-radius: 5px 5px 5px 5px;
-webkit-border-radius: 5px 5px 5px 5px;
@@ -731,6 +732,7 @@ nav .nav-notify {
right: -6px;
min-width: 10px;
text-align: center;
+ border: 1px solid black;
}
nav .nav-notify.show {
display: block;
@@ -753,7 +755,7 @@ nav #nav-home-link, #nav-directory-link, #nav-apps-link{
margin-right: 0px;
font-weight: bold;
margin: 3px 5px;
- font-size: 15px;
+ font-size: 14px;
}
nav #nav-directory-link{
margin-right: 0px;
@@ -1036,6 +1038,8 @@ aside #profiles-menu {
}
aside #search-text {
width: 150px;
+ height: 17px;
+ padding-left: 10px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
@@ -1258,6 +1262,7 @@ right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow:
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
right_aside .icon {width: 10px; height: 10px;}
.close_box {
background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png");
@@ -1738,7 +1743,7 @@ transition: all 0.2s ease-in-out;
#profile-jot-submit {
float: right;
margin-top: 2px;
-
+ font-size: 14px;
}
#profile-upload-wrapper {
float: left;
@@ -1790,7 +1795,7 @@ transition: all 0.2s ease-in-out;
float: right;
margin-left: 10px;
margin-top: 2px;
- font-size: 10px;
+ font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
@@ -1803,7 +1808,6 @@ transition: all 0.2s ease-in-out;
.button.creation1 {
background-color: #fff;
border: 1px solid #777777;
- background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
font-weight: bolder;
@@ -1811,7 +1815,6 @@ transition: all 0.2s ease-in-out;
}
.button.creation2 {
background-color: #3465A4;
- background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css
index 9eca0ab4d..fbcca699f 100644
--- a/view/theme/diabook-aerith/style.css
+++ b/view/theme/diabook-aerith/style.css
@@ -555,13 +555,14 @@ header #banner a:hover {
outline: none;
vertical-align: middle;
font-weight: bolder;
+ margin-left: 3px;
}
header #banner #logo-img {
height: 25px;
margin-top: 3px;
}
header #banner #logo-text {
- font-size: 21px;
+ font-size: 20px;
position: absolute;
top: 10%;
}
@@ -716,7 +717,7 @@ nav .nav-menu.selected {
nav .nav-notify {
display: none;
position: absolute;
- background-color: #ff0000;
+ background-color: #fff;
/* background-color: #19aeff; */
-moz-border-radius: 5px 5px 5px 5px;
-webkit-border-radius: 5px 5px 5px 5px;
@@ -728,6 +729,7 @@ nav .nav-notify {
right: -6px;
min-width: 10px;
text-align: center;
+ border: 1px solid black;
}
nav .nav-notify.show {
display: block;
@@ -750,7 +752,7 @@ nav #nav-home-link, #nav-directory-link, #nav-apps-link{
margin-right: 0px;
font-weight: bold;
margin: 3px 5px;
- font-size: 15px;
+ font-size: 14px;
}
nav #nav-directory-link{
margin-right: 0px;
@@ -1034,6 +1036,8 @@ aside #profiles-menu {
}
aside #search-text {
width: 173px;
+ height: 17px;
+ padding-left: 10px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
@@ -1669,6 +1673,7 @@ body .pageheader{
#profile-jot-submit {
float: right;
margin-top: 2px;
+ font-size: 14px;
}
#profile-upload-wrapper {
@@ -1721,7 +1726,7 @@ body .pageheader{
float: right;
margin-left: 10px;
margin-top: 2px;
- font-size: 10px;
+ font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
@@ -1734,7 +1739,6 @@ body .pageheader{
.button.creation1 {
background-color: #fff;
border: 1px solid #777777;
- background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
font-weight: bolder;
@@ -1742,7 +1746,6 @@ body .pageheader{
}
.button.creation2 {
background-color: #3465A4;
- background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
diff --git a/view/theme/diabook-red/communityhome.tpl b/view/theme/diabook-red/communityhome.tpl
index cff75cd40..cf8d81335 100755
--- a/view/theme/diabook-red/communityhome.tpl
+++ b/view/theme/diabook-red/communityhome.tpl
@@ -17,7 +17,7 @@
<div id="close_services">
{{ if $lastusers_title }}
<h3>Connectable Services<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
-<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
+<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-blue/icons/facebook.png" title="Facebook"></a>
<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-blue/icons/StatusNet.png?" title="StatusNet"></a>
<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-blue/icons/livejournal.png?" title="LiveJournal"></a>
diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css
index c649c185c..d3e080bf5 100644
--- a/view/theme/diabook-red/style-network.css
+++ b/view/theme/diabook-red/style-network.css
@@ -557,15 +557,17 @@ header #banner a:hover {
outline: none;
vertical-align: middle;
font-weight: bolder;
+
}
header #banner #logo-img {
height: 25px;
margin-top: 3px;
}
header #banner #logo-text {
- font-size: 21px;
+ font-size: 20px;
position: absolute;
top: 10%;
+ margin-left: 3px;
}
/* nav */
nav {
@@ -657,7 +659,7 @@ nav #logo-text {
nav .nav-menu-search {
position: relative;
- margin: 3px 17px;
+ margin: 4px 17px;
margin-right: 0px;
height: 17px;
width: 180px;
@@ -1037,6 +1039,8 @@ aside #profiles-menu {
}
aside #search-text {
width: 150px;
+ height: 17px;
+ padding-left: 10px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
@@ -1244,7 +1248,7 @@ right_aside {
/* background: #F1F1F1; */
}
-right_aside a{color: #ff500f;}
+right_aside a{color: red;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
@@ -1256,6 +1260,7 @@ right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow:
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
right_aside .icon {width: 10px; height: 10px;}
.close_box {
background-image: url("../../../view/theme/diabook-red/icons/close_box.png");
@@ -1741,7 +1746,7 @@ transition: all 0.2s ease-in-out;
#profile-jot-submit {
float: right;
margin-top: 2px;
-
+ font-size: 14px;
}
#profile-upload-wrapper {
float: left;
@@ -1793,7 +1798,7 @@ transition: all 0.2s ease-in-out;
float: right;
margin-left: 10px;
margin-top: 2px;
- font-size: 10px;
+ font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
@@ -1806,7 +1811,6 @@ transition: all 0.2s ease-in-out;
.button.creation1 {
background-color: #fff;
border: 1px solid #777777;
- background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
cursor: pointer;
@@ -1814,7 +1818,6 @@ transition: all 0.2s ease-in-out;
}
.button.creation2 {
background-color: #FF500F;
- background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
@@ -1824,12 +1827,14 @@ transition: all 0.2s ease-in-out;
font-weight: bolder;
}
/*input[type="submit"] {
- border: 0px;
- background-color: @ButtonBackgroundColor;
- color: @ButtonColor;
- padding: 0px 10px;
- .rounded(5px);
- height: 18px;
+ background-color: #FF500F;
+ border: 1px solid #777777;
+ color: white;
+ border-radius: 3px 3px 3px 3px;
+ box-shadow: 0 1px 1px #CFCFCF;
+ margin-left: 5px;
+ cursor: pointer;
+ font-weight: bolder;
}*/
/** acl **/
#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css
index 8c13db995..5af75f2b5 100644
--- a/view/theme/diabook-red/style-profile.css
+++ b/view/theme/diabook-red/style-profile.css
@@ -556,9 +556,10 @@ header #banner #logo-img {
margin-top: 3px;
}
header #banner #logo-text {
- font-size: 21px;
+ font-size: 20px;
position: absolute;
top: 10%;
+ margin-left: 3px;
}
/* nav */
nav {
@@ -642,7 +643,7 @@ nav #logo-text {
nav .nav-menu-search {
position: relative;
- margin: 3px 17px;
+ margin: 4px 17px;
margin-right: 0px;
height: 17px;
width: 180px;
@@ -1020,6 +1021,8 @@ aside #profiles-menu {
}
aside #search-text {
width: 150px;
+ height: 17px;
+ padding-left: 10px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
@@ -1227,7 +1230,7 @@ right_aside {
/* background: #F1F1F1; */
}
-right_aside a{color: #ff500f;}
+right_aside a{color: red;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
@@ -1239,6 +1242,7 @@ right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow:
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
right_aside .icon {width: 10px; height: 10px;}
.close_box {
background-image: url("../../../view/theme/diabook-red/icons/close_box.png");
@@ -1719,6 +1723,7 @@ transition: all 0.2s ease-in-out;
#profile-jot-submit {
float: right;
margin-top: 2px;
+ font-size: 14px;
}
#profile-upload-wrapper {
@@ -1771,7 +1776,7 @@ transition: all 0.2s ease-in-out;
float: right;
margin-left: 10px;
margin-top: 2px;
- font-size: 10px;
+ font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
@@ -1784,7 +1789,6 @@ transition: all 0.2s ease-in-out;
.button.creation1 {
background-color: #fff;
border: 1px solid #777777;
- background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
font-weight: bolder;
@@ -1792,7 +1796,6 @@ transition: all 0.2s ease-in-out;
}
.button.creation2 {
background-color: #FF500F;
- background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css
index f74104cb7..40b5b2ec3 100644
--- a/view/theme/diabook-red/style.css
+++ b/view/theme/diabook-red/style.css
@@ -561,9 +561,10 @@ header #banner #logo-img {
margin-top: 3px;
}
header #banner #logo-text {
- font-size: 21px;
+ font-size: 20px;
position: absolute;
top: 10%;
+ margin-left: 3px;
}
/* nav */
nav {
@@ -655,7 +656,7 @@ nav #logo-text {
nav .nav-menu-search {
position: relative;
- margin: 3px 17px;
+ margin: 4px 17px;
margin-right: 0px;
height: 17px;
width: 180px;
@@ -1034,6 +1035,8 @@ aside #profiles-menu {
}
aside #search-text {
width: 173px;
+ height: 17px;
+ padding-left: 10px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
@@ -1665,7 +1668,7 @@ body .pageheader{
#profile-jot-submit {
float: right;
margin-top: 2px;
-
+ font-size: 14px;
}
#profile-upload-wrapper {
float: left;
@@ -1717,7 +1720,7 @@ body .pageheader{
float: right;
margin-left: 10px;
margin-top: 2px;
- font-size: 10px;
+ font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
@@ -1730,7 +1733,6 @@ body .pageheader{
.button.creation1 {
background-color: #fff;
border: 1px solid #777777;
- background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
font-weight: bolder;
@@ -1738,7 +1740,6 @@ body .pageheader{
}
.button.creation2 {
background-color: #FF500F;
- background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
diff --git a/view/theme/quattro-green/experimental b/view/theme/quattro-green/experimental
deleted file mode 100755
index e69de29bb..000000000
--- a/view/theme/quattro-green/experimental
+++ /dev/null
diff --git a/view/theme/quattro-green/screenshot.png b/view/theme/quattro-green/screenshot.png
deleted file mode 100644
index a764f4f9a..000000000
--- a/view/theme/quattro-green/screenshot.png
+++ /dev/null
Binary files differ
diff --git a/view/theme/quattro-green/theme.php b/view/theme/quattro-green/theme.php
deleted file mode 100644
index 47a5c6333..000000000
--- a/view/theme/quattro-green/theme.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/*
- * Name: quattro-green
- * Description: Green variation of the quattro theme
- * Version: 1.0
- * Author: Fabio Communi <fabrix.xm@gmail.com>
- * Maintainer: Tobias Diekershoff
- */
-$a->theme_info = array(
- 'extends' => 'quattro',
-);
-
-$a->hooks[] = array('plugin_settings', 'view/theme/quattro-green/theme.php', 'quattro_green_settings');
-$a->hooks[] = array('plugin_settings_post', 'view/theme/quattro-green/theme.php', 'quattro_green_settings_post');
-
-
-function quattro_green_settings(&$a, &$o){
- if(!local_user())
- return;
-
- $align = get_pconfig(local_user(), 'quattro', 'align' );
-
- $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
- $o .= replace_macros($t, array(
- '$submit' => t('Submit'),
- '$baseurl' => $a->get_baseurl(),
- '$title' => t("Theme settings"),
- '$align' => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))),
- ));
-}
-
-function quattro_green_settings_post(&$a){
- if(! local_user())
- return;
- if (isset($_POST['quattro-settings-submit'])){
- set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']);
- }
- goaway($a->get_baseurl()."/settings/addon");
-}
-
-
-$quattro_align = get_pconfig(local_user(), 'quattro', 'align' );
-
-if(local_user() && $quattro_align=="center"){
-
- $a->page['htmlhead'].="
- <style>
- html { width: 100%; margin:0px; padding:0px; }
- body {
- margin: 50px auto;
- width: 900px;
- }
- </style>
- ";
-
-}
diff --git a/view/theme/quattro-green/theme_settings.tpl b/view/theme/quattro-green/theme_settings.tpl
deleted file mode 100644
index 25af04253..000000000
--- a/view/theme/quattro-green/theme_settings.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="settings-block">
- <h3 class="settings-heading">$title</h3>
-
- {{inc field_select.tpl with $field=$align}}{{endinc}}
-
- <div class="settings-submit-wrapper">
- <input type="submit" value="$submit" class="settings-submit" name="quattro-settings-submit" />
- </div>
-
-
-</div>
diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php
new file mode 100644
index 000000000..c9ab3a4a1
--- /dev/null
+++ b/view/theme/quattro/config.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Theme settings
+ */
+
+
+
+function theme_content(&$a){
+ if(!local_user())
+ return;
+
+ $align = get_pconfig(local_user(), 'quattro', 'align' );
+ $color = get_pconfig(local_user(), 'quattro', 'color' );
+ $colors = array(
+ "dark"=>"Quattro",
+ "green"=>"Green"
+ );
+
+ $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
+ $o .= replace_macros($t, array(
+ '$submit' => t('Submit'),
+ '$baseurl' => $a->get_baseurl(),
+ '$title' => t("Theme settings"),
+ '$align' => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))),
+ '$color' => array('quattro_color', t('Color scheme'), $color, '', $colors),
+ ));
+ return $o;
+}
+
+function theme_post(&$a){
+ if(! local_user())
+ return;
+
+ if (isset($_POST['quattro-settings-submit'])){
+ set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']);
+ set_pconfig(local_user(), 'quattro', 'color', $_POST['quattro_color']);
+ }
+}
+
diff --git a/view/theme/quattro/dark/Makefile b/view/theme/quattro/dark/Makefile
new file mode 100644
index 000000000..989da60c7
--- /dev/null
+++ b/view/theme/quattro/dark/Makefile
@@ -0,0 +1,4 @@
+##
+
+style.css : style.less colors.less ../icons.less ../quattro.less
+ lessc style.less > style.css
diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/dark/colors.less
index b6d487f92..b6d487f92 100755
--- a/view/theme/quattro/colors.less
+++ b/view/theme/quattro/dark/colors.less
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/dark/style.css
index 7d7444e48..1d951aba8 100755
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -231,7 +231,8 @@ body {
h4 {
font-size: 1.1em;
}
-a, a:link {
+a,
+a:link {
color: #005c94;
text-decoration: none;
}
@@ -449,7 +450,8 @@ nav #nav-site-linkmenu .menu-popup {
right: 0px;
left: auto;
}
-nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
+nav #nav-notifications-linkmenu.on .icon.s22.notify,
+nav #nav-notifications-linkmenu.selected .icon.s22.notify {
background-image: url("../../../images/icons/22/notify_on.png");
}
nav #nav-apps-link.selected {
@@ -627,11 +629,15 @@ aside #profiles-menu {
height: 48px;
}
/* group member */
-#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper {
+#contact-edit-drop-link,
+.mail-list-delete-wrapper,
+.group-delete-wrapper {
float: right;
margin-right: 50px;
}
-#contact-edit-drop-link .drophide, .mail-list-delete-wrapper .drophide, .group-delete-wrapper .drophide {
+#contact-edit-drop-link .drophide,
+.mail-list-delete-wrapper .drophide,
+.group-delete-wrapper .drophide {
background-image: url('../../../images/icons/22/delete.png');
display: block;
width: 22px;
@@ -640,7 +646,9 @@ aside #profiles-menu {
position: relative;
top: -50px;
}
-#contact-edit-drop-link .drop, .mail-list-delete-wrapper .drop, .group-delete-wrapper .drop {
+#contact-edit-drop-link .drop,
+.mail-list-delete-wrapper .drop,
+.group-delete-wrapper .drop {
background-image: url('../../../images/icons/22/delete.png');
display: block;
width: 22px;
@@ -769,7 +777,8 @@ section {
display: table;
width: 780px;
}
-.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+.wall-item-container .wall-item-item,
+.wall-item-container .wall-item-bottom {
display: table-row;
}
.wall-item-container .wall-item-bottom {
@@ -807,11 +816,13 @@ section {
.wall-item-container .wall-item-content img {
max-width: 710px;
}
-.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+.wall-item-container .wall-item-links,
+.wall-item-container .wall-item-actions {
display: table-cell;
vertical-align: middle;
}
-.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+.wall-item-container .wall-item-links .icon,
+.wall-item-container .wall-item-actions .icon {
opacity: 0.5;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
@@ -819,7 +830,8 @@ section {
-ms-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
}
-.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
+.wall-item-container .wall-item-links .icon:hover,
+.wall-item-container .wall-item-actions .icon:hover {
opacity: 1;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
@@ -944,9 +956,6 @@ section {
opacity: 0.5;
}
.wwto {
- position: absolute !important;
- width: 25px;
- height: 25px;
background: #FFFFFF;
border: 2px solid #364e59;
height: 25px;
@@ -1164,7 +1173,9 @@ section {
height: 18px;
}*/
/** acl **/
-#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+#photo-edit-perms-select,
+#photos-upload-permissions-wrapper,
+#profile-jot-acl-wrapper {
display: block!important;
}
#acl-wrapper {
@@ -1323,10 +1334,12 @@ ul.tabs li .active {
float: left;
width: 200px;
}
-.field input, .field textarea {
+.field input,
+.field textarea {
width: 400px;
}
-.field input[type="checkbox"], .field input[type="radio"] {
+.field input[type="checkbox"],
+.field input[type="radio"] {
width: auto;
}
.field textarea {
diff --git a/view/theme/quattro/style.less b/view/theme/quattro/dark/style.less
index c3dbae777..7d81e788a 100755
--- a/view/theme/quattro/style.less
+++ b/view/theme/quattro/dark/style.less
@@ -6,8 +6,8 @@
// $ lessc style.less > style.css
@import "colors";
-@import "icons";
-@import "quattro";
+@import "../icons";
+@import "../quattro";
diff --git a/view/theme/quattro/green/Makefile b/view/theme/quattro/green/Makefile
new file mode 100644
index 000000000..989da60c7
--- /dev/null
+++ b/view/theme/quattro/green/Makefile
@@ -0,0 +1,4 @@
+##
+
+style.css : style.less colors.less ../icons.less ../quattro.less
+ lessc style.less > style.css
diff --git a/view/theme/quattro-green/colors.less b/view/theme/quattro/green/colors.less
index bc78c3fda..bc78c3fda 100755
--- a/view/theme/quattro-green/colors.less
+++ b/view/theme/quattro/green/colors.less
diff --git a/view/theme/quattro-green/style.css b/view/theme/quattro/green/style.css
index 8e3ddd9b8..e7cc549d0 100755
--- a/view/theme/quattro-green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -231,7 +231,8 @@ body {
h4 {
font-size: 1.1em;
}
-a, a:link {
+a,
+a:link {
color: #009100;
text-decoration: none;
}
@@ -449,7 +450,8 @@ nav #nav-site-linkmenu .menu-popup {
right: 0px;
left: auto;
}
-nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
+nav #nav-notifications-linkmenu.on .icon.s22.notify,
+nav #nav-notifications-linkmenu.selected .icon.s22.notify {
background-image: url("../../../images/icons/22/notify_on.png");
}
nav #nav-apps-link.selected {
@@ -627,11 +629,15 @@ aside #profiles-menu {
height: 48px;
}
/* group member */
-#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper {
+#contact-edit-drop-link,
+.mail-list-delete-wrapper,
+.group-delete-wrapper {
float: right;
margin-right: 50px;
}
-#contact-edit-drop-link .drophide, .mail-list-delete-wrapper .drophide, .group-delete-wrapper .drophide {
+#contact-edit-drop-link .drophide,
+.mail-list-delete-wrapper .drophide,
+.group-delete-wrapper .drophide {
background-image: url('../../../images/icons/22/delete.png');
display: block;
width: 22px;
@@ -640,7 +646,9 @@ aside #profiles-menu {
position: relative;
top: -50px;
}
-#contact-edit-drop-link .drop, .mail-list-delete-wrapper .drop, .group-delete-wrapper .drop {
+#contact-edit-drop-link .drop,
+.mail-list-delete-wrapper .drop,
+.group-delete-wrapper .drop {
background-image: url('../../../images/icons/22/delete.png');
display: block;
width: 22px;
@@ -769,7 +777,8 @@ section {
display: table;
width: 780px;
}
-.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+.wall-item-container .wall-item-item,
+.wall-item-container .wall-item-bottom {
display: table-row;
}
.wall-item-container .wall-item-bottom {
@@ -807,11 +816,13 @@ section {
.wall-item-container .wall-item-content img {
max-width: 710px;
}
-.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+.wall-item-container .wall-item-links,
+.wall-item-container .wall-item-actions {
display: table-cell;
vertical-align: middle;
}
-.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+.wall-item-container .wall-item-links .icon,
+.wall-item-container .wall-item-actions .icon {
opacity: 0.5;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
@@ -819,7 +830,8 @@ section {
-ms-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
}
-.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
+.wall-item-container .wall-item-links .icon:hover,
+.wall-item-container .wall-item-actions .icon:hover {
opacity: 1;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
@@ -944,9 +956,6 @@ section {
opacity: 0.5;
}
.wwto {
- position: absolute !important;
- width: 25px;
- height: 25px;
background: #FFFFFF;
border: 2px solid #364e59;
height: 25px;
@@ -1164,7 +1173,9 @@ section {
height: 18px;
}*/
/** acl **/
-#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+#photo-edit-perms-select,
+#photos-upload-permissions-wrapper,
+#profile-jot-acl-wrapper {
display: block!important;
}
#acl-wrapper {
@@ -1323,10 +1334,12 @@ ul.tabs li .active {
float: left;
width: 200px;
}
-.field input, .field textarea {
+.field input,
+.field textarea {
width: 400px;
}
-.field input[type="checkbox"], .field input[type="radio"] {
+.field input[type="checkbox"],
+.field input[type="radio"] {
width: auto;
}
.field textarea {
diff --git a/view/theme/quattro-green/style.less b/view/theme/quattro/green/style.less
index f8b0bb31c..7d81e788a 100755
--- a/view/theme/quattro-green/style.less
+++ b/view/theme/quattro/green/style.less
@@ -6,8 +6,8 @@
// $ lessc style.less > style.css
@import "colors";
-@import "../quattro/icons";
-@import "../quattro/quattro";
+@import "../icons";
+@import "../quattro";
diff --git a/view/theme/quattro/screenshot.jpg b/view/theme/quattro/screenshot.jpg
index 7f50ec70e..98fbfe2ea 100644
--- a/view/theme/quattro/screenshot.jpg
+++ b/view/theme/quattro/screenshot.jpg
Binary files differ
diff --git a/view/theme/quattro/style.php b/view/theme/quattro/style.php
new file mode 100644
index 000000000..889ec1530
--- /dev/null
+++ b/view/theme/quattro/style.php
@@ -0,0 +1,9 @@
+<?php
+ $color = get_pconfig(local_user(), "quattro","color");
+
+ if ($color===false) $color="dark";
+
+ if (file_exists("$THEMEPATH/$color/style.css")){
+ echo file_get_contents("$THEMEPATH/$color/style.css");
+ }
+
diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php
index 7e5ab1e62..be47a401c 100644
--- a/view/theme/quattro/theme.php
+++ b/view/theme/quattro/theme.php
@@ -1,33 +1,7 @@
<?php
-$a->hooks[] = array('plugin_settings', 'view/theme/quattro/theme.php', 'quattro_settings');
-$a->hooks[] = array('plugin_settings_post', 'view/theme/quattro/theme.php', 'quattro_settings_post');
-function quattro_settings(&$a, &$o){
- if(!local_user())
- return;
-
- $align = get_pconfig(local_user(), 'quattro', 'align' );
-
- $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
- $o .= replace_macros($t, array(
- '$submit' => t('Submit'),
- '$baseurl' => $a->get_baseurl(),
- '$title' => t("Theme settings"),
- '$align' => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))),
- ));
-}
-
-function quattro_settings_post(&$a){
- if(! local_user())
- return;
- if (isset($_POST['quattro-settings-submit'])){
- set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']);
- }
- goaway($a->get_baseurl()."/settings/addon");
-}
-
$quattro_align = get_pconfig(local_user(), 'quattro', 'align' );
diff --git a/view/theme/quattro/theme_settings.tpl b/view/theme/quattro/theme_settings.tpl
index 25af04253..9771ae162 100644
--- a/view/theme/quattro/theme_settings.tpl
+++ b/view/theme/quattro/theme_settings.tpl
@@ -1,11 +1,8 @@
-<div class="settings-block">
- <h3 class="settings-heading">$title</h3>
-
- {{inc field_select.tpl with $field=$align}}{{endinc}}
-
- <div class="settings-submit-wrapper">
- <input type="submit" value="$submit" class="settings-submit" name="quattro-settings-submit" />
- </div>
+{{inc field_select.tpl with $field=$color}}{{endinc}}
-
+{{inc field_select.tpl with $field=$align}}{{endinc}}
+
+<div class="settings-submit-wrapper">
+ <input type="submit" value="$submit" class="settings-submit" name="quattro-settings-submit" />
</div>
+