diff --git a/include/api.php b/include/api.php index 64772d657..065f14cff 100755 --- a/include/api.php +++ b/include/api.php @@ -83,7 +83,7 @@ $record = $r[0]; } else { logger('API_login failure: ' . print_r($_SERVER,true), LOGGER_DEBUG); - header('WWW-Authenticate: Basic realm="Friendika"'); + header('WWW-Authenticate: Basic realm="Friendica"'); header('HTTP/1.0 401 Unauthorized'); die('This api requires login'); } diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl index 2876f936e..340b7216c 100644 --- a/view/theme/dispy-dark/communityhome.tpl +++ b/view/theme/dispy-dark/communityhome.tpl @@ -37,8 +37,10 @@ {{ endif }} +{{ if $lastusers_title }}

PostIt to Friendica

Post to Friendica from anywhere by bookmarking this link.
+{{ endif }} diff --git a/view/theme/dispy-dark/profile_vcard.tpl b/view/theme/dispy-dark/profile_vcard.tpl index 350a6ce4a..f14ea7915 100644 --- a/view/theme/dispy-dark/profile_vcard.tpl +++ b/view/theme/dispy-dark/profile_vcard.tpl @@ -10,9 +10,8 @@ $e.profile_name {{ endfor }} -
  • $profile.menu.chg_photo
  • +
  • $profile.menu.chg_photo
  • $profile.menu.cr_new
  • - {{ endif }} @@ -81,4 +80,3 @@ $contact_block - diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 6f5544a1c..5f9b38f8c 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -1062,6 +1062,8 @@ section { } .tabs li { display: inline; + font-size: smaller; + font-weight: bold; } .tab { border: 1px solid #729fcf; @@ -1120,6 +1122,7 @@ section { } .wall-item-content { overflow-x: auto; + margin: 0px 15px 0px 5px; } /* removing it from here, vs. putting it in .wall-item-content * might break things for people. we shall see ;) */ @@ -1203,6 +1206,7 @@ section { .wall-item-body { margin: 20px 20px 10px 0px; text-align: left; + overflow-x: auto; } .wall-item-lock-wrapper { float: right; @@ -2072,6 +2076,9 @@ div[id$="wrapper"] br { float:left; font-size:20px; } +.event { + background: #2e2f2e; +} .vevent { border:1px solid #ccc; } @@ -2083,15 +2090,14 @@ div[id$="wrapper"] br { margin-left: 10px; margin-right: 10px; } - #new-event-link { margin-bottom: 10px; } .edit-event-link, .plink-event-link { - float: left; - margin-top: 4px; - margin-right: 4px; - margin-bottom: 15px; + /*float: left; */ + /*margin-top: 4px; */ + /*margin-right: 4px;*/ + /*margin-bottom: 15px;*/ } .event-description:before { content: url('../../../images/calendar.png'); @@ -2100,6 +2106,7 @@ div[id$="wrapper"] br { .event-start, .event-end { margin-left: 10px; width: 330px; + font-size: smaller; } .event-start .dtstart, .event-end .dtend { float: right; @@ -2200,6 +2207,10 @@ div[id$="wrapper"] br { #item-delete-selected-desc:hover { text-decoration: underline; } +.fc-state-highlight { + background: #eec; + color: #2e2f2e; +} /** diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index 7115faca1..17d31feda 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -113,6 +113,10 @@ EOT; function dispydark_community_info() { $a = get_app(); + $aside['$lastusers_title'] = t('Last users'); + $aside['$lastusers_items'] = array(); + $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " ); + $fostitJS = "javascript: (function() { the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + @@ -138,6 +142,7 @@ function dispydark_community_info() { } // aside on profile page -if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) { +//if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) { dispydark_community_info(); -} +//} + diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 66f3cc47e..49148eed4 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -146,7 +146,7 @@ a:hover { } .required { display: inline; - color: #ff0; + color: #f00; font-size: 16px; font-weight: bold; margin: 3px; @@ -1062,6 +1062,8 @@ section { } .tabs li { display: inline; + font-size: smaller; + font-weight: bold; } .tab { border: 1px solid #729fcf; @@ -1120,6 +1122,7 @@ section { } .wall-item-content { overflow-x: auto; + margin: 0px 15px 0px 5px; } /* removing it from here, vs. putting it in .wall-item-content * might break things for people. we shall see ;) */ @@ -1203,6 +1206,7 @@ section { .wall-item-body { margin: 20px 20px 10px 0px; text-align: left; + overflow-x: auto; } .wall-item-lock-wrapper { float: right;