From 7919d00399e199c34a50f87fd10101d0d8f6f021 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 28 Apr 2012 17:50:28 -0700 Subject: bring back the email and logging of update failures, but without the transactions --- view/en/update_fail_eml.tpl | 11 +++++++++++ view/update_fail_eml.tpl | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 view/en/update_fail_eml.tpl delete mode 100644 view/update_fail_eml.tpl (limited to 'view') diff --git a/view/en/update_fail_eml.tpl b/view/en/update_fail_eml.tpl new file mode 100644 index 000000000..f68a3dece --- /dev/null +++ b/view/en/update_fail_eml.tpl @@ -0,0 +1,11 @@ +Hey, +I'm $sitename. +The friendica developers released update $update recently, +but when I tried to install it, something went terribly wrong. +This needs to be fixed soon and I can't do it alone. Please contact a +friendica developer if you can not help me on your own. My database might be invalid. + +The error message is '$error'. + +I'm sorry, +your friendica server at $siteurl \ No newline at end of file diff --git a/view/update_fail_eml.tpl b/view/update_fail_eml.tpl deleted file mode 100644 index f68a3dece..000000000 --- a/view/update_fail_eml.tpl +++ /dev/null @@ -1,11 +0,0 @@ -Hey, -I'm $sitename. -The friendica developers released update $update recently, -but when I tried to install it, something went terribly wrong. -This needs to be fixed soon and I can't do it alone. Please contact a -friendica developer if you can not help me on your own. My database might be invalid. - -The error message is '$error'. - -I'm sorry, -your friendica server at $siteurl \ No newline at end of file -- cgit v1.2.3 From 3d054341ef3c7598c12b003c0d271910b3349795 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sun, 29 Apr 2012 04:12:04 +0200 Subject: diabook-themes: bug/css-fixes --- view/theme/diabook/diabook-aerith/style-wide.css | 5 +++-- view/theme/diabook/diabook-aerith/style.css | 5 +++-- view/theme/diabook/diabook-blue/style-wide.css | 5 +++-- view/theme/diabook/diabook-blue/style.css | 5 +++-- .../diabook/diabook-green/style-network-wide.css | 6 +++--- view/theme/diabook/diabook-green/style-network.css | 10 +++++----- .../diabook/diabook-green/style-profile-wide.css | 8 ++++---- view/theme/diabook/diabook-green/style-profile.css | 8 ++++---- view/theme/diabook/diabook-green/style-wide.css | 19 +++++++++--------- view/theme/diabook/diabook-green/style.css | 21 ++++++++++---------- .../diabook/diabook-pink/style-network-wide.css | 8 ++++---- view/theme/diabook/diabook-pink/style-network.css | 12 +++++------ .../diabook/diabook-pink/style-profile-wide.css | 10 +++++----- view/theme/diabook/diabook-pink/style-profile.css | 10 +++++----- view/theme/diabook/diabook-pink/style-wide.css | 21 ++++++++++---------- view/theme/diabook/diabook-pink/style.css | 23 +++++++++++----------- view/theme/diabook/diabook-red/style-wide.css | 5 +++-- view/theme/diabook/diabook-red/style.css | 5 +++-- view/theme/diabook/footer.tpl | 3 +-- view/theme/diabook/nav.tpl | 2 +- view/theme/diabook/style-wide.css | 5 +++-- view/theme/diabook/style.css | 5 +++-- view/theme/diabook/theme.php | 23 +++++++++++++++++++--- 23 files changed, 126 insertions(+), 98 deletions(-) (limited to 'view') diff --git a/view/theme/diabook/diabook-aerith/style-wide.css b/view/theme/diabook/diabook-aerith/style-wide.css index b8ff1fe25..5c263154f 100644 --- a/view/theme/diabook/diabook-aerith/style-wide.css +++ b/view/theme/diabook/diabook-aerith/style-wide.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -1014,7 +1015,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1243,7 +1244,7 @@ aside #likes a:hover{ margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ diff --git a/view/theme/diabook/diabook-aerith/style.css b/view/theme/diabook/diabook-aerith/style.css index 01d35b754..e0f38aff6 100644 --- a/view/theme/diabook/diabook-aerith/style.css +++ b/view/theme/diabook/diabook-aerith/style.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -1013,7 +1014,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1241,7 +1242,7 @@ aside #likes a:hover{ margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ diff --git a/view/theme/diabook/diabook-blue/style-wide.css b/view/theme/diabook/diabook-blue/style-wide.css index c8c203347..189f4d559 100644 --- a/view/theme/diabook/diabook-blue/style-wide.css +++ b/view/theme/diabook/diabook-blue/style-wide.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -983,7 +984,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1203,7 +1204,7 @@ aside #side-peoplefind-url { margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ diff --git a/view/theme/diabook/diabook-blue/style.css b/view/theme/diabook/diabook-blue/style.css index 7bf7e8eaa..2b68afc6f 100644 --- a/view/theme/diabook/diabook-blue/style.css +++ b/view/theme/diabook/diabook-blue/style.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -982,7 +983,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1201,7 +1202,7 @@ aside #side-peoplefind-url { margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ diff --git a/view/theme/diabook/diabook-green/style-network-wide.css b/view/theme/diabook/diabook-green/style-network-wide.css index cc598b9fe..38e7e7ae0 100644 --- a/view/theme/diabook/diabook-green/style-network-wide.css +++ b/view/theme/diabook/diabook-green/style-network-wide.css @@ -439,7 +439,7 @@ a:hover { clear: both; } .fakelink { - color: #194719; + color: #2c9936; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -1301,7 +1301,7 @@ transition: all 0.2s ease-in-out; padding-top: 10px; } .tread-wrapper a{ - color: #194719; + color: #2c9936; } /*marker*/ @@ -1840,7 +1840,7 @@ transition: all 0.2s ease-in-out; font-weight: bolder; } .button.creation2 { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-green/style-network.css b/view/theme/diabook/diabook-green/style-network.css index 786547711..3cd6117e1 100644 --- a/view/theme/diabook/diabook-green/style-network.css +++ b/view/theme/diabook/diabook-green/style-network.css @@ -439,7 +439,7 @@ a:hover { clear: both; } .fakelink { - color: #194719; + color: #2c9936; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -493,7 +493,7 @@ code { float: right; } .tool a { - color: #194719; + color: #2c9936; } .tool a:hover { text-decoration: none; @@ -1297,7 +1297,7 @@ transition: all 0.2s ease-in-out; padding-top: 10px; } .tread-wrapper a{ - color: #194719; + color: #2c9936; } .wall-item-decor { @@ -1832,7 +1832,7 @@ transition: all 0.2s ease-in-out; font-weight: bolder; } .button.creation2 { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -1964,7 +1964,7 @@ ul.tabs li { margin-left: 5px; } ul.tabs li .active { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-green/style-profile-wide.css b/view/theme/diabook/diabook-green/style-profile-wide.css index 65b7f2ba3..e7a0fe623 100644 --- a/view/theme/diabook/diabook-green/style-profile-wide.css +++ b/view/theme/diabook/diabook-green/style-profile-wide.css @@ -440,7 +440,7 @@ a:hover { clear: both; } .fakelink { - color: #194719; + color: #2c9936; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -1276,7 +1276,7 @@ transition: all 0.2s ease-in-out; padding-top: 10px; } .tread-wrapper a{ - color: #194719; + color: #2c9936; } /*marker*/ @@ -1811,7 +1811,7 @@ transition: all 0.2s ease-in-out; cursor: pointer; } .button.creation2 { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -1945,7 +1945,7 @@ ul.tabs li { margin-left: 5px; } ul.tabs li .active { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-green/style-profile.css b/view/theme/diabook/diabook-green/style-profile.css index dcc7b373a..051aa9a35 100644 --- a/view/theme/diabook/diabook-green/style-profile.css +++ b/view/theme/diabook/diabook-green/style-profile.css @@ -440,7 +440,7 @@ a:hover { clear: both; } .fakelink { - color: #194719; + color: #2c9936; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -1270,7 +1270,7 @@ transition: all 0.2s ease-in-out; padding-top: 10px; } .tread-wrapper a{ - color: #194719; + color: #2c9936; } .wall-item-decor { @@ -1801,7 +1801,7 @@ transition: all 0.2s ease-in-out; cursor: pointer; } .button.creation2 { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -1933,7 +1933,7 @@ ul.tabs li { margin-left: 5px; } ul.tabs li .active { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-green/style-wide.css b/view/theme/diabook/diabook-green/style-wide.css index d85ea23a6..d98a6c325 100644 --- a/view/theme/diabook/diabook-green/style-wide.css +++ b/view/theme/diabook/diabook-green/style-wide.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -476,7 +477,7 @@ a:hover { clear: both; } .fakelink { - color: #194719; + color: #2c9936; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -614,7 +615,7 @@ header #banner #logo-text { } /* messages */ #message-new { - background: #194719; + background: #2c9936; border: 1px solid #333; width: 150px; } @@ -991,7 +992,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1185,7 +1186,7 @@ aside #side-peoplefind-url { height: auto; } aside #likes a, a:visited, a:link { - color: #194719; + color: #2c9936; text-decoration: none; cursor: pointer; @@ -1220,7 +1221,7 @@ aside #likes a:hover{ margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ @@ -1422,7 +1423,7 @@ body .pageheader{ padding-top: 10px; } .tread-wrapper a{ - color: #194719; + color: #2c9936; } /*marker*/ @@ -2073,7 +2074,7 @@ body .pageheader{ cursor: pointer; } .button.creation2 { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -2207,7 +2208,7 @@ ul.tabs li { margin-left: 5px; } ul.tabs li .active { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -2225,7 +2226,7 @@ ul.rs_tabs li { clear: both; } ul.rs_tabs li .selected { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-green/style.css b/view/theme/diabook/diabook-green/style.css index c83ddd397..6a9d8f7d0 100644 --- a/view/theme/diabook/diabook-green/style.css +++ b/view/theme/diabook/diabook-green/style.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -477,7 +478,7 @@ a:hover { } /*color*/ .fakelink { - color: #194719; + color: #2c9936; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -550,7 +551,7 @@ code { } /*color*/ .tool a { - color: #194719; + color: #2c9936; } .tool a:hover { text-decoration: none; @@ -617,7 +618,7 @@ header #banner #logo-text { /*color*/ /* messages */ #message-new { - background: #194719; + background: #2c9936; border: 1px solid #333; width: 150px; } @@ -994,7 +995,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1189,7 +1190,7 @@ aside #side-peoplefind-url { } /*color*/ aside #likes a, a:visited, a:link { - color: #194719; + color: #2c9936; text-decoration: none; cursor: pointer; @@ -1224,7 +1225,7 @@ aside #likes a:hover{ margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ @@ -1425,7 +1426,7 @@ body .pageheader{ } /*color*/ .tread-wrapper a{ - color: #194719; + color: #2c9936; } .wall-item-decor { position: absolute; @@ -2071,7 +2072,7 @@ body .pageheader{ } /*color*/ .button.creation2 { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -2204,7 +2205,7 @@ ul.tabs li { } /*color*/ ul.tabs li .active { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -2223,7 +2224,7 @@ ul.rs_tabs li { } /*color*/ ul.rs_tabs li .selected { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-pink/style-network-wide.css b/view/theme/diabook/diabook-pink/style-network-wide.css index 0a83955df..4bbab02c7 100644 --- a/view/theme/diabook/diabook-pink/style-network-wide.css +++ b/view/theme/diabook/diabook-pink/style-network-wide.css @@ -439,7 +439,7 @@ a:hover { clear: both; } .fakelink { - color: #996d73; + color: #D02B55; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -807,7 +807,7 @@ ul.menu-popup a { text-decoration: none; } ul.menu-popup a:hover { - background-color: #996d73; /*bdcdd4;*/ + background-color: #D02B55; /*bdcdd4;*/ color: #fff; } ul.menu-popup .menu-sep { @@ -1301,7 +1301,7 @@ transition: all 0.2s ease-in-out; padding-top: 10px; } .tread-wrapper a{ - color: #996d73; + color: #D02B55; } /*marker*/ @@ -1840,7 +1840,7 @@ transition: all 0.2s ease-in-out; font-weight: bolder; } .button.creation2 { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-pink/style-network.css b/view/theme/diabook/diabook-pink/style-network.css index 3a4f49877..3acb608fc 100644 --- a/view/theme/diabook/diabook-pink/style-network.css +++ b/view/theme/diabook/diabook-pink/style-network.css @@ -439,7 +439,7 @@ a:hover { clear: both; } .fakelink { - color: #996d73; + color: #D02B55; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -493,7 +493,7 @@ code { float: right; } .tool a { - color: #996d73; + color: #D02B55; } .tool a:hover { text-decoration: none; @@ -807,7 +807,7 @@ ul.menu-popup a { text-decoration: none; } ul.menu-popup a:hover { - background-color: #996d73; /*bdcdd4;*/ + background-color: #D02B55; /*bdcdd4;*/ color: #fff; } ul.menu-popup .menu-sep { @@ -1297,7 +1297,7 @@ transition: all 0.2s ease-in-out; padding-top: 10px; } .tread-wrapper a{ - color: #996d73; + color: #D02B55; } .wall-item-decor { @@ -1832,7 +1832,7 @@ transition: all 0.2s ease-in-out; font-weight: bolder; } .button.creation2 { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -1964,7 +1964,7 @@ ul.tabs li { margin-left: 5px; } ul.tabs li .active { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-pink/style-profile-wide.css b/view/theme/diabook/diabook-pink/style-profile-wide.css index 080551896..f4b1939ec 100644 --- a/view/theme/diabook/diabook-pink/style-profile-wide.css +++ b/view/theme/diabook/diabook-pink/style-profile-wide.css @@ -440,7 +440,7 @@ a:hover { clear: both; } .fakelink { - color: #996d73; + color: #D02B55; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -807,7 +807,7 @@ ul.menu-popup a { text-decoration: none; } ul.menu-popup a:hover { - background-color: #996d73; /*bdcdd4;*/ + background-color: #D02B55; /*bdcdd4;*/ color: #fff; } ul.menu-popup .menu-sep { @@ -1276,7 +1276,7 @@ transition: all 0.2s ease-in-out; padding-top: 10px; } .tread-wrapper a{ - color: #996d73; + color: #D02B55; } /*marker*/ @@ -1811,7 +1811,7 @@ transition: all 0.2s ease-in-out; cursor: pointer; } .button.creation2 { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -1945,7 +1945,7 @@ ul.tabs li { margin-left: 5px; } ul.tabs li .active { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-pink/style-profile.css b/view/theme/diabook/diabook-pink/style-profile.css index 8f3753061..610fffe3a 100644 --- a/view/theme/diabook/diabook-pink/style-profile.css +++ b/view/theme/diabook/diabook-pink/style-profile.css @@ -440,7 +440,7 @@ a:hover { clear: both; } .fakelink { - color: #996d73; + color: #D02B55; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -806,7 +806,7 @@ ul.menu-popup a { text-decoration: none; } ul.menu-popup a:hover { - background-color: #996d73; /*bdcdd4;*/ + background-color: #D02B55; /*bdcdd4;*/ color: #fff; } ul.menu-popup .menu-sep { @@ -1270,7 +1270,7 @@ transition: all 0.2s ease-in-out; padding-top: 10px; } .tread-wrapper a{ - color: #996d73; + color: #D02B55; } .wall-item-decor { @@ -1801,7 +1801,7 @@ transition: all 0.2s ease-in-out; cursor: pointer; } .button.creation2 { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -1933,7 +1933,7 @@ ul.tabs li { margin-left: 5px; } ul.tabs li .active { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-pink/style-wide.css b/view/theme/diabook/diabook-pink/style-wide.css index a51ca49cc..849566aa0 100644 --- a/view/theme/diabook/diabook-pink/style-wide.css +++ b/view/theme/diabook/diabook-pink/style-wide.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -476,7 +477,7 @@ a:hover { clear: both; } .fakelink { - color: #996d73; + color: #D02B55; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -614,7 +615,7 @@ header #banner #logo-text { } /* messages */ #message-new { - background: #996d73; + background: #D02B55; border: 1px solid #333; width: 150px; } @@ -943,7 +944,7 @@ ul.menu-popup a { text-decoration: none; } ul.menu-popup a:hover { - background-color: #996d73; /*bdcdd4;*/ + background-color: #D02B55; /*bdcdd4;*/ color: #fff; } ul.menu-popup .menu-sep { @@ -991,7 +992,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1185,7 +1186,7 @@ aside #side-peoplefind-url { height: auto; } aside #likes a, a:visited, a:link { - color: #996d73; + color: #D02B55; text-decoration: none; cursor: pointer; @@ -1220,7 +1221,7 @@ aside #likes a:hover{ margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ @@ -1422,7 +1423,7 @@ body .pageheader{ padding-top: 10px; } .tread-wrapper a{ - color: #996d73; + color: #D02B55; } /*marker*/ @@ -2073,7 +2074,7 @@ body .pageheader{ cursor: pointer; } .button.creation2 { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -2207,7 +2208,7 @@ ul.tabs li { margin-left: 5px; } ul.tabs li .active { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -2225,7 +2226,7 @@ ul.rs_tabs li { clear: both; } ul.rs_tabs li .selected { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-pink/style.css b/view/theme/diabook/diabook-pink/style.css index 833e81a5f..798d73979 100644 --- a/view/theme/diabook/diabook-pink/style.css +++ b/view/theme/diabook/diabook-pink/style.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -477,7 +478,7 @@ a:hover { } /*color*/ .fakelink { - color: #996d73; + color: #D02B55; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -550,7 +551,7 @@ code { } /*color*/ .tool a { - color: #996d73; + color: #D02B55; } .tool a:hover { text-decoration: none; @@ -617,7 +618,7 @@ header #banner #logo-text { /* messages */ /*color*/ #message-new { - background: #996d73; + background: #D02B55; border: 1px solid #333; width: 150px; } @@ -946,7 +947,7 @@ ul.menu-popup a { } /*color*/ ul.menu-popup a:hover { - background-color: #996d73; /*bdcdd4;*/ + background-color: #D02B55; /*bdcdd4;*/ color: #fff; } ul.menu-popup .menu-sep { @@ -994,7 +995,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1189,7 +1190,7 @@ aside #side-peoplefind-url { } /*color*/ aside #likes a, a:visited, a:link { - color: #996d73; + color: #D02B55; text-decoration: none; cursor: pointer; @@ -1224,7 +1225,7 @@ aside #likes a:hover{ margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ @@ -1425,7 +1426,7 @@ body .pageheader{ } /*color*/ .tread-wrapper a{ - color: #996d73; + color: #D02B55; } .wall-item-decor { position: absolute; @@ -2071,7 +2072,7 @@ body .pageheader{ } /*color*/ .button.creation2 { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -2204,7 +2205,7 @@ ul.tabs li { } /*color*/ ul.tabs li .active { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -2223,7 +2224,7 @@ ul.rs_tabs li { } /*color*/ ul.rs_tabs li .selected { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-red/style-wide.css b/view/theme/diabook/diabook-red/style-wide.css index 79c5fb1cb..b9ea238e2 100644 --- a/view/theme/diabook/diabook-red/style-wide.css +++ b/view/theme/diabook/diabook-red/style-wide.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -1013,7 +1014,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1232,7 +1233,7 @@ aside #side-peoplefind-url { margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ diff --git a/view/theme/diabook/diabook-red/style.css b/view/theme/diabook/diabook-red/style.css index c7cb1586d..05c802102 100644 --- a/view/theme/diabook/diabook-red/style.css +++ b/view/theme/diabook/diabook-red/style.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -1012,7 +1013,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1230,7 +1231,7 @@ aside #side-peoplefind-url { margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ diff --git a/view/theme/diabook/footer.tpl b/view/theme/diabook/footer.tpl index 8d3c65162..bae5e1056 100644 --- a/view/theme/diabook/footer.tpl +++ b/view/theme/diabook/footer.tpl @@ -1,4 +1,3 @@ -
-
+ \ No newline at end of file diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index ce27400f6..f611de004 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -136,7 +136,7 @@ - +
$langselector
diff --git a/view/theme/diabook/style-wide.css b/view/theme/diabook/style-wide.css index f8dced3e6..71ed4e472 100644 --- a/view/theme/diabook/style-wide.css +++ b/view/theme/diabook/style-wide.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -974,7 +975,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1195,7 +1196,7 @@ aside #side-peoplefind-url { margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 9150ea8cf..e70c72cb2 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -974,7 +975,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1198,7 +1199,7 @@ aside #side-peoplefind-url { margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index c45db9884..fa0d47ece 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -3,13 +3,13 @@ /* * Name: Diabook * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.022) + * Version: (Version: 1.023) * Author: */ //print diabook-version for debugging -$diabook_version = "Diabook (Version: 1.022)"; +$diabook_version = "Diabook (Version: 1.023)"; $a->page['htmlhead'] .= sprintf('', $diabook_version); //change css on network and profilepages @@ -313,6 +313,20 @@ $autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.autogro $a->page['htmlhead'] .= sprintf('', $autogrowJS); //js scripts + +//check if community_home-plugin is activated and change css +$nametocheck = "communityhome"; +$r = q("select id from addon where name = '%s' and installed = 1", dbesc($nametocheck)); +if(count($r) == "1") { + +$a->page['htmlhead'] .= ' +'; +} + //comment-edit-wrapper on photo_view if ($a->argv[0].$a->argv[2] === "photos"."image"){ @@ -324,7 +338,6 @@ $a->page['htmlhead'] .= ' }); '; - } $a->page['htmlhead'] .= ' @@ -334,6 +347,10 @@ $a->page['htmlhead'] .= ' $("a.lightbox").fancybox(); // Select all links with lightbox class }); +$(document).ready(function() { + var footer_top = $(document).height() - 30; + $("div#footerbox").attr("style", "border-top: 1px solid #D2D2D2; width: 70%;right: 15%;position: absolute;top:"+footer_top+"px;"); + }); '; -- cgit v1.2.3 From 920d40acf43adb584a33555bfd73e2e5d5f1ebd0 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sun, 29 Apr 2012 05:58:23 +0200 Subject: diabook-themes: small fix --- view/theme/diabook/footer.tpl | 2 +- view/theme/diabook/theme.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/theme/diabook/footer.tpl b/view/theme/diabook/footer.tpl index bae5e1056..25058a7ff 100644 --- a/view/theme/diabook/footer.tpl +++ b/view/theme/diabook/footer.tpl @@ -1,3 +1,3 @@ -
+ \ No newline at end of file diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index fa0d47ece..9a1ac0f68 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -347,7 +347,7 @@ $a->page['htmlhead'] .= ' $("a.lightbox").fancybox(); // Select all links with lightbox class }); -$(document).ready(function() { +$(window).load(function() { var footer_top = $(document).height() - 30; $("div#footerbox").attr("style", "border-top: 1px solid #D2D2D2; width: 70%;right: 15%;position: absolute;top:"+footer_top+"px;"); }); -- cgit v1.2.3