Browse Source

quattro: move quattro-green inside quattro folder.

Add config option to select quattro color scheme.
pull/188/head
Fabio Comuni 10 years ago
parent
commit
be2005f146
  1. 0
      view/theme/quattro-green/experimental
  2. BIN
      view/theme/quattro-green/screenshot.png
  3. 27
      view/theme/quattro-green/theme.php
  4. 11
      view/theme/quattro-green/theme_settings.tpl
  5. 8
      view/theme/quattro/config.php
  6. 4
      view/theme/quattro/dark/Makefile
  7. 0
      view/theme/quattro/dark/colors.less
  8. 43
      view/theme/quattro/dark/style.css
  9. 4
      view/theme/quattro/dark/style.less
  10. 4
      view/theme/quattro/green/Makefile
  11. 0
      view/theme/quattro/green/colors.less
  12. 43
      view/theme/quattro/green/style.css
  13. 4
      view/theme/quattro/green/style.less
  14. BIN
      view/theme/quattro/screenshot.jpg
  15. 9
      view/theme/quattro/style.php
  16. 2
      view/theme/quattro/theme_settings.tpl

0
view/theme/quattro-green/experimental

BIN
view/theme/quattro-green/screenshot.png

Before

Width: 800  |  Height: 600  |  Size: 144 KiB

27
view/theme/quattro-green/theme.php

@ -1,27 +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',
);
$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>
";
}

11
view/theme/quattro-green/theme_settings.tpl

@ -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>

8
view/theme/quattro/config.php

@ -10,6 +10,11 @@ function theme_content(&$a){
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(
@ -17,6 +22,7 @@ function theme_content(&$a){
'$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;
}
@ -24,8 +30,10 @@ function theme_content(&$a){
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']);
}
}

4
view/theme/quattro/dark/Makefile

@ -0,0 +1,4 @@
##
style.css : style.less colors.less ../icons.less ../quattro.less
lessc style.less > style.css

0
view/theme/quattro/colors.less → view/theme/quattro/dark/colors.less

43
view/theme/quattro/style.css → 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 {

4
view/theme/quattro/style.less → 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";

4
view/theme/quattro/green/Makefile

@ -0,0 +1,4 @@
##
style.css : style.less colors.less ../icons.less ../quattro.less
lessc style.less > style.css

0
view/theme/quattro-green/colors.less → view/theme/quattro/green/colors.less

43
view/theme/quattro-green/style.css → 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 {

4
view/theme/quattro-green/style.less → 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";

BIN
view/theme/quattro/screenshot.jpg

Before

Width: 800  |  Height: 600  |  Size: 70 KiB

After

Width: 752  |  Height: 564  |  Size: 68 KiB

9
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");
}

2
view/theme/quattro/theme_settings.tpl

@ -1,3 +1,5 @@
{{inc field_select.tpl with $field=$color}}{{endinc}}
{{inc field_select.tpl with $field=$align}}{{endinc}}
<div class="settings-submit-wrapper">

Loading…
Cancel
Save