Merge remote-tracking branch 'friendika-master/master' into admin

diff --combined include/nav.php
index 5e50a8b,b37863a..238d870
--- 1/include/nav.php
--- 2/include/nav.php
+++ b/include/nav.php
@@@ -64,8 -64,8 +64,8 @@@ function nav(&$a) 
                $nav['help'] = array($help_url, t('Help'), "");
  
  
- 
-       $nav['apps'] = array('apps', t('Apps'), "");
+       if($a->apps)
+               $nav['apps'] = array('apps', t('Apps'), "");
  
        $nav['search'] = array('search', t('Search'), "");
  
@@@ -107,15 -107,10 +107,15 @@@
                $nav['settings'] = array('settings', t('Settings'),"");
                $nav['profiles'] = array('profiles', t('Profiles'),"");
                $nav['contacts'] = array('contacts', t('Contacts'),"");
 -
 -              
        }
  
 +      /**
 +       * Admin page
 +       */
 +       if (is_site_admin()){
 +               $nav['admin'] = array('admin/', t('Admin'), "");
 +       }
 +
  
        /**
         *

diff --combined view/theme/duepuntozero/style.css
index 8799726,9555a1e..5632342
--- 1/view/theme/duepuntozero/style.css
--- 2/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@@ -2224,7 -2224,8 +2224,8 @@@ a.mail-list-link 
  }
  
  .eventcal {
-       font-size: 24px;
+       float: left;
+       font-size: 20px;
  }
  
  #new-event-link {
@@@ -2245,6 -2246,17 +2246,17 @@@
  .event-start .dtstart, .event-end .dtend {
        float: right;
  }
+ 
+ .prevcal, .nextcal {
+       float: left;
+       margin-left: 32px;
+       margin-right: 32px;
+       margin-top: 64px;
+ }
+ .event-calendar-end {
+       clear: both;
+ }
+ 
   
  .calendar {
        font-family: Courier, monospace;
@@@ -2454,6 -2466,8 +2466,8 @@@
  }
  
  
+ 
+ 
  #lang-select-icon {
        cursor: pointer;
        position: absolute;
@@@ -2468,73 -2482,6 +2482,73 @@@
        filter:alpha(opacity=100);
  }
  
 +/**
 + * ADMIN
 + */
 +
 +#adminpage dl {
 +      clear: left;
 +      margin-bottom: 2px;
 +      padding-bottom: 2px;
 +      border-bottom: 1px solid black;
 +}
 +#adminpage dt {
 +      width: 200px;
 +      float: left;
 +      font-weight: bold;
 +}
 +#adminpage dd {
 +      margin-left: 200px;
 +}
 +
 +#adminpage .field {
 +      clear: left;
 +      margin-bottom: 5px;
 +      padding-bottom: 5px;
 +}
 +
 +#adminpage .field label {
 +      float: left;
 +      width: 200px;
 +      font-weight: bold;
 +}
 +
 +#adminpage .field input,
 +#adminpage .field textarea {
 +      width: 400px;
 +}
 +#adminpage .field textarea { height: 100px; }
 +#adminpage .field_help {
 +      display: block;
 +      margin-left: 200px;
 +      color: #666666;
 +      
 +}
 +
 +#adminpage h3 {
 +      border-bottom: 1px solid #cccccc;
 +}
 +
 +#adminpage .submit {
 +      clear:left;
 +      text-align: right;
 +}
 +
 +#adminpage #pluginslist {
 +      margin: 0px; padding: 0px;
 +}
 +#adminpage .plugin {
 +      list-style: none;
 +      display: block;
 +      border: 1px solid #888888;
 +      padding: 1em;
 +      margin-bottom: 5px;
 +      clear: left;
 +}
 +#adminpage .plugin .toggle {
 +      float:left;
 +      margin-right: 1em;
 +}
  
  /**
   * ICONS
@@@ -2572,8 -2519,9 +2586,11 @@@
  .youtube { background-position: -64px -32px;}
  .attach { background-position: -80px -32px; }
  .language { background-position: -96px -32px; }
- .on { background-position: -112px -32px; }
- .off { background-position: -128px -32px; }
+ .prev { background-position: -112px -32px; }
+ .next { background-position: -128px -32px; }
++.on { background-position: -144px -32px; }
+ 
++.off { background-position: 0px -48px; }
  
  .attachtype {
        display: block; width: 20px; height: 23px;