Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  the heart should really be red.
  fix location change notification
  enhanced profile reporting for single values
  add db field for removed account, which will also be the first test of update error checking
  toggle to archive unfriends, though render them useless
  indicate successful updates
  diabook-themes: small fix
  diabook-themes: bug/css-fixes
  some constants for the db update failure possibilities
  bring back the email and logging of update failures, but without the transactions

* master:

diff --git a/boot.php b/boot.php
index 105180c23170a0f9b5c33cb95fd91c1ecef3c8be..100662a8f8b77231780672ca5baa902d45bf43fe 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_VERSION',      '2.3.1326' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1139      );
+define ( 'DB_UPDATE_VERSION',      1140      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -73,6 +73,14 @@ define ( 'HOOK_HOOK',      0);
 define ( 'HOOK_FILE',      1);
 define ( 'HOOK_FUNCTION',  2);
 
+/**
+ * DB update return values
+ */
+
+define ( 'UPDATE_SUCCESS', 0);
+define ( 'UPDATE_FAILED',  1);
+
+
 /**
  *
  * page/profile types
@@ -658,32 +666,29 @@ if(! function_exists('check_config')) {
 
                                                        // call the specific update
 
-//                                                     global $db;
-//                                                     $db->excep(TRUE);
-//                                                     try {
-//                                                             $db->beginTransaction();
-                                                               $func = 'update_' . $x;
-                                                               $func($a);
-//                                                             $db->commit();
-//                                                     } catch(Exception $ex) {
-//                                                             $db->rollback();
-//                                                             //send the administrator an e-mail
-//                                                             $email_tpl = get_intltext_template("update_fail_eml.tpl");
-//                                                             $email_tpl = replace_macros($email_tpl, array(
-//                                                                     '$sitename' => $a->config['sitename'],
-//                                                                     '$siteurl' =>  $a->get_baseurl(),
-//                                                                     '$update' => $x,
-//                                                                     '$error' => $ex->getMessage()));
-//                                                             $subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
+                                                       $func = 'update_' . $x;
+                                                       $retval = $func($a);
+                                                       if($retval) {
+                                                               //send the administrator an e-mail
+                                                               $email_tpl = get_intltext_template("update_fail_eml.tpl");
+                                                               $email_msg = replace_macros($email_tpl, array(
+                                                                       '$sitename' => $a->config['sitename'],
+                                                                       '$siteurl' =>  $a->get_baseurl(),
+                                                                       '$update' => $x,
+                                                                       '$error' => sprintf( t('Update %s failed. See error logs.'), $x)
+                                                               ));
+                                                               $subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
                                                                        
-//                                                             mail($a->config['admin_email'], $subject, $text,
-//                                                                             'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
-//                                                                             . 'Content-type: text/plain; charset=UTF-8' . "\n"
-//                                                                             . 'Content-transfer-encoding: 8bit' );
-//                                                             //try the logger
-//                                                             logger('update failed: '.$ex->getMessage().EOL);
-//                                                     }
-//                                                     $db->excep(FALSE);
+                                                               mail($a->config['admin_email'], $subject, $email_msg,
+                                                                       'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+                                                                       . 'Content-type: text/plain; charset=UTF-8' . "\n"
+                                                                       . 'Content-transfer-encoding: 8bit' );
+                                                               //try the logger
+                                                               logger('CRITICAL: Update Failed: '. $x);
+                                                       }
+                                                       else
+                                                               set_config('database','update_' . $x, 'success');
+                                                               
                                                }
                                        }
                                        set_config('system','build', DB_UPDATE_VERSION);
@@ -725,9 +730,10 @@ if(! function_exists('check_config')) {
                        foreach($installed as $i) {
                                if(! in_array($i['name'],$plugins_arr)) {
                                        uninstall_plugin($i['name']);
-                       }
-                               else
+                               }
+                               else {
                                        $installed_arr[] = $i['name'];
+                               }
                        }
                }
 

diff --git a/database.sql b/database.sql
index 78b26922bd11dc0c61ea19c484d9769f87a26cb6..80a9197fa5dd7da178960652079d9f80ee8d505e 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1019,6 +1019,7 @@ CREATE TABLE IF NOT EXISTS `user` (
   `pwdreset` char(255) NOT NULL,
   `maxreq` int(11) NOT NULL DEFAULT '10',
   `expire` int(10) unsigned NOT NULL DEFAULT '0',
+  `account_removed` tinyint(1) NOT NULL DEFAULT '0',
   `account_expired` tinyint(1) NOT NULL DEFAULT '0',
   `account_expires_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `expire_notification_sent` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -1036,7 +1037,8 @@ CREATE TABLE IF NOT EXISTS `user` (
   KEY `blocked` (`blocked`),
   KEY `verified` (`verified`),
   KEY `unkmail` (`unkmail`),
-  KEY `cntunkmail` (`cntunkmail`)
+  KEY `cntunkmail` (`cntunkmail`),
+  KEY `account_removed` (`account_removed`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------

diff --git a/include/Contact.php b/include/Contact.php
index 537850e007400144028a13bf708d13030c9b03af..2523fc0231a594189b057738873140a3e331b748 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -51,6 +51,21 @@ function user_remove($uid) {
 
 
 function contact_remove($id) {
+
+       $r = q("select uid from contact where id = %d limit 1",
+               intval($id)
+       );
+       if((! count($r)) || (! intval($r[0]['uid'])))
+               return;
+
+       $archive = get_pconfig($r[0]['uid'], 'system','archive_removed_contacts');
+       if($archive) {
+               q("update contact set `archive` = 1, `network` = 'none', `writable` = 0 where id = %d limit 1",
+                       intval($id)
+               );
+               return;
+       }
+
        q("DELETE FROM `contact` WHERE `id` = %d LIMIT 1",
                intval($id)
        );

diff --git a/mod/profiles.php b/mod/profiles.php
index 7a33a03e44852a84b3a8c7419e2c192a153a9085..3a52c8fa5ee00f9fce921b449772f3e379ce8eb9 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -139,21 +139,49 @@ function profiles_post(&$a) {
 
 
                $changes = array();
+               $value = '';
                if($is_default) {
-                       if($marital != $orig[0]['marital']) $changes[] = '♥ ' . t('Marital Status');
-                       if($withchanged) $changes[] = '♥ ' . t('Romantic Partner');                      
-                       if($work != $orig[0]['work']) $changes[] = t('Work/Employment');
-                       if($religion != $orig[0]['religion']) $changes[] = t('Religion');
-                       if($politic != $orig[0]['politic']) $changes[] = t('Political Views');
-                       if($gender != $orig[0]['gender']) $changes[] = t('Gender');
-                       if($sexual != $orig[0]['sexual']) $changes[] = t('Sexual Preference');
-                       if($homepage != $orig[0]['homepage']) $changes[] = t('Homepage');
-                       if($interest != $orig[0]['interest']) $changes[] = t('Interests');
+                       if($marital != $orig[0]['marital']) {
+                               $changes[] = '[color=#ff0000]♥[/color] ' . t('Marital Status');
+                               $value = $marital;
+                       }
+                       if($withchanged) {
+                               $changes[] = '♥ ' . t('Romantic Partner');
+                               $value = strip_tags($with);
+                       }                                                       
+                       if($work != $orig[0]['work']) {
+                               $changes[] = t('Work/Employment');
+                       }
+                       if($religion != $orig[0]['religion']) {
+                               $changes[] = t('Religion');
+                               $value = $religion;
+                       }
+                       if($politic != $orig[0]['politic']) {
+                               $changes[] = t('Political Views');
+                               $value = $politic;
+                       }
+                       if($gender != $orig[0]['gender']) {
+                               $changes[] = t('Gender');
+                               $value = $gender;
+                       }
+                       if($sexual != $orig[0]['sexual']) {
+                               $changes[] = t('Sexual Preference');
+                               $value = $sexual;
+                       }
+                       if($homepage != $orig[0]['homepage']) {
+                               $changes[] = t('Homepage');
+                               $value = $homepage;
+                       }
+                       if($interest != $orig[0]['interest']) {
+                               $changes[] = t('Interests');
+                               $value = $interest;
+                       }
                        if($address != $orig[0]['address'] || $locality != $orig[0]['locality'] || $region != $orig[0]['region']
-                               || $country_name != $orig[0]['country_name'])
-                               $changes[] = t('Location');
+                               || $country_name != $orig[0]['country-name']) {
+                               $changes[] = t('Location');
+                       }
 
-                       profile_activity($changes);
+                       profile_activity($changes,$value);
 
                }                       
                        
@@ -245,7 +273,7 @@ function profiles_post(&$a) {
 }
 
 
-function profile_activity($changed) {
+function profile_activity($changed, $value) {
        $a = get_app();
 
        if(! local_user() || ! is_array($changed) || ! count($changed))
@@ -289,7 +317,7 @@ function profile_activity($changed) {
        foreach($changed as $ch) {
                if(strlen($changes)) {
                        if ($z == ($t - 1))
-                               $changes .= ' and ';
+                               $changes .= t(' and ');
                        else
                                $changes .= ', ';
                }
@@ -299,7 +327,15 @@ function profile_activity($changed) {
 
        $prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . t('public profile') . '[/url]';      
 
-       $arr['body'] =  sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes);
+       if($t == 1 && strlen($value)) {
+               $message = sprintf( t('%1$s changed %2$s to %3$s'), $A, $changes, $value);
+               $message .= "\n\n" . sprintf( t(' - Visit %1$s\'s %2$s'), $A, $prof);
+       }
+       else
+               $message =      sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes);
+ 
+
+       $arr['body'] = $message;  
 
        $arr['object'] = '<object><type>' . ACTIVITY_OBJ_PROFILE . '</type><title>' . $self[0]['name'] . '</title>'
        . '<id>' . $self[0]['url'] . '/' . $self[0]['name'] . '</id>';

diff --git a/update.php b/update.php
index 2758f5906672d127694e8cb7c941d9c4fb4d6cb9..3c2ecebb6b3b053f6ff2d0b3adbc4b3ae61d0fe9 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1139 );
+define( 'UPDATE_VERSION' , 1140 );
 
 /**
  *
@@ -1215,4 +1215,11 @@ function update_1137() {
 
 function update_1138() {
        q("alter table contact add archive tinyint(1) not null default '0' after hidden, add index (archive)");
-}
\ No newline at end of file
+}
+
+function update_1139() {
+       $r = q("alter table user add account_removed tinyint(1) not null default '0' after expire, add index(account_removed) ");
+       if(! $r)
+               return UPDATE_FAILED ;
+       return UPDATE_SUCCESS ;
+}

diff --git a/view/en/update_fail_eml.tpl b/view/en/update_fail_eml.tpl
new file mode 100644 (file)
index 0000000..f68a3de
--- /dev/null
+++ b/view/en/update_fail_eml.tpl
@@ -0,0 +1,11 @@
+Hey, \r
+I'm $sitename.   \r
+The friendica developers released update $update recently, \r
+but when I tried to install it, something went terribly wrong.  \r
+This needs to be fixed soon and I can't do it alone. Please contact a \r
+friendica developer if you can not help me on your own. My database might be invalid. \r
+\r
+The error message is '$error'.   \r
+\r
+I'm sorry, \r
+your friendica server at $siteurl
\ No newline at end of file

diff --git a/view/theme/diabook/diabook-aerith/style-wide.css b/view/theme/diabook/diabook-aerith/style-wide.css
index b8ff1fe250c74dc9cbb256e708d12502385ad01c..5c263154f17d10404430ab303a5f14a14b0e071a 100644 (file)
--- 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 01d35b754108d714f31e4e443e13f6db52411d1b..e0f38aff6adb5481e8ebe2498de271d1f71273f6 100644 (file)
--- 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 c8c2033473d6c6bb46098d5a6aff9b7ead031299..189f4d55992d37b04d5ca4844f05654924d66691 100644 (file)
--- 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 7bf7e8eaa714d3f6b9c1e748c19740b2cb52785d..2b68afc6f5892bb7ef2c5c3bebadbee4b51e55b7 100644 (file)
--- 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 cc598b9fe4074d4610d429c33fe892f1934481d5..38e7e7ae05ac758c1cc90ec130dbc03bfb6a1f3c 100644 (file)
--- 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 7865477112eb52e670c9dfd0099f85d1bccc0192..3cd6117e13e25bb1912a4d008f3714c92e9a1323 100644 (file)
--- 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 65b7f2ba3f5be1666d1133f3917b770c89d913c8..e7a0fe623a70e90bb2dbf6eb56ecd46d5e692dec 100644 (file)
--- 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 dcc7b373a1e21851b640b120dc5244a779f48d8c..051aa9a35138db054caf83859f60c85ce5442710 100644 (file)
--- 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 d85ea23a6858332ce16c2362c6322ccf99db7f81..d98a6c3256d75be9a858b2ab020b8abab5c0bc03 100644 (file)
--- 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 c83ddd3972f340b194ca8644d55b8381f0a34af9..6a9d8f7d0c8a76137dbe0a31aa5b705815324044 100644 (file)
--- 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 0a83955dfa668e5c931ea2a637ce842b5b333115..4bbab02c7b33c520091eedfa8873a40d317e55ed 100644 (file)
--- 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 3a4f49877ef531c476aae120919a772803ace6f5..3acb608fc7449f51bb731190c4eb21e09c9da0ab 100644 (file)
--- 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 0805518963f485a71831d7b2c1fc9e06f2131e00..f4b1939ec2491a9b50509f5e524d836859391950 100644 (file)
--- 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 8f3753061446f6c98339f6ad41c9a6fb17940673..610fffe3afb8c4ade4cc1849e2c5c6d2f2ea78e9 100644 (file)
--- 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 a51ca49cc28445e108838098bd1fb1dad214cb90..849566aa01f1c7490fb20ce93f000da00e8c9097 100644 (file)
--- 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 833e81a5f3260f79c875d4af8aea4da768a5f48e..798d739794a16aa9ae75c1c924769559aff0c48a 100644 (file)
--- 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 79c5fb1cbed41244283e0bb15d98b83180859aea..b9ea238e2e4f55dfdcc744281f4fa18271fcf451 100644 (file)
--- 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 c7cb1586d0349a36d0d4323468ffc7d188e103cc..05c802102cacf42bf4ea14357eca663a78b9689d 100644 (file)
--- 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 8d3c6516216d20adbfe5b2520d3e6b0c0a0c4540..25058a7ff7f9c5aec11bd3cd234f4b3459857cae 100644 (file)
--- a/view/theme/diabook/footer.tpl
+++ b/view/theme/diabook/footer.tpl
@@ -1,4 +1,3 @@
-<div style="display: table-cell"></div>
-<div style="border-top: 1px solid #D2D2D2; width: 100%;margin-top: 30px;">
+<div id="footerbox" style="display:none">
 <a style="float:right; color:#333;margin-right:10px;display: table;margin-top: 5px;" href="friendica" title="Site Info / Impressum" >Info / Impressum</a>
 </div>
\ No newline at end of file

diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index ce27400f64a95c4c836ef9499ba28db6479d0181..f611de0043631014abe99804fbf99925960e8b3f 100644 (file)
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -136,7 +136,7 @@
 </nav>
 
 
-<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a id="down" onclick="scrolldown()" ><img id="scroll_top_bottom" src="view/theme/diabook/icons/scroll_bottom.png" style="display:cursor !important;" alt="back to top" title="Back to top"></a></div>
+<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;z-index: 97;"><a id="down" onclick="scrolldown()" ><img id="scroll_top_bottom" src="view/theme/diabook/icons/scroll_bottom.png" style="display:cursor !important;" alt="back to top" title="Back to top"></a></div>
 <div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
 <div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
 

diff --git a/view/theme/diabook/style-wide.css b/view/theme/diabook/style-wide.css
index f8dced3e69492e24f526c8fc0a75648128556a53..71ed4e4720e211147a64a2c62f94bf4ad9e5651b 100644 (file)
--- 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 9150ea8cf807648529563d5f9657b8303f9e76ef..e70c72cb2bfe0db72f9c616cbbc0b9e1db9c3fd2 100644 (file)
--- 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 c45db9884d756ef20393881c6a103c8af1b35b7a..9a1ac0f68a85b8db582453feea533806291f9efe 100755 (executable)
--- 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('<script "%s" ></script>', $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('<script language="JavaScript" src="%s" ></script>', $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'] .= '
+<script>
+$(document).ready(function() {
+       $("div#login-submit-wrapper").attr("style","padding-top: 120px;");
+       });
+</script>';    
+}
+
 //comment-edit-wrapper on photo_view
 if ($a->argv[0].$a->argv[2] === "photos"."image"){
 
@@ -324,7 +338,6 @@ $a->page['htmlhead'] .= '
                        
                        });
     </script>';
-       
 }
 
 $a->page['htmlhead'] .= '
@@ -334,6 +347,10 @@ $a->page['htmlhead'] .= '
        $("a.lightbox").fancybox(); // Select all links with lightbox class
  });
    
+$(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;");
+ });
  </script>';
  
  

diff --git a/view/update_fail_eml.tpl b/view/update_fail_eml.tpl
deleted file mode 100644 (file)
index f68a3de..0000000
--- a/view/update_fail_eml.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-Hey, \r
-I'm $sitename.   \r
-The friendica developers released update $update recently, \r
-but when I tried to install it, something went terribly wrong.  \r
-This needs to be fixed soon and I can't do it alone. Please contact a \r
-friendica developer if you can not help me on your own. My database might be invalid. \r
-\r
-The error message is '$error'.   \r
-\r
-I'm sorry, \r
-your friendica server at $siteurl
\ No newline at end of file