Browse Source

link events + personal notes to profile tabs

tags/2.3beta1
Friendika 9 years ago
parent
commit
fb92dbf5d6
9 changed files with 87 additions and 18 deletions
  1. BIN
      images/icons.png
  2. +2
    -2
      include/nav.php
  3. +2
    -12
      mod/apps.php
  4. +16
    -1
      mod/events.php
  5. +1
    -1
      mod/notes.php
  6. +3
    -1
      mod/profile.php
  7. +2
    -0
      view/profile_tabs.tpl
  8. +17
    -1
      view/theme/duepuntozero/style.css
  9. +44
    -0
      view/theme/loozah/style.css

BIN
images/icons.png View File

Before After
Width: 160  |  Height: 48  |  Size: 9.2 KiB Width: 160  |  Height: 48  |  Size: 9.9 KiB

+ 2
- 2
include/nav.php View File

@@ -64,8 +64,8 @@ function nav(&$a) {
$nav['help'] = array($help_url, t('Help'), "");


$nav['apps'] = array('apps', t('Apps'), "");
if(count($a->apps))
$nav['apps'] = array('apps', t('Apps'), "");

$nav['search'] = array('search', t('Search'), "");



+ 2
- 12
mod/apps.php View File

@@ -5,19 +5,9 @@ function apps_content(&$a) {

$o .= '<h3>' . t('Applications') . '</h3>';

$apps = false;

if(local_user()) {
$apps = true;
$o .= '<div class="app-title"><a href="notes">' . t('Private Notes') . '</a></div>';
}

if($a->apps) {
$apps = true;
if($a->apps)
$o .= $a->apps;
}

if(! $apps)
else
notice( t('No installed applications.') . EOL);

return $o;


+ 16
- 1
mod/events.php View File

@@ -130,6 +130,14 @@ function events_content(&$a) {
if(! $m)
$m = intval($thismonth);

// Put some limits on dates. The PHP date functions don't seem to do so well before 1900.
// An upper limit was chosen to keep search engines from exploring links endlessly.

if($y < 1901)
$y = 1900;
if($y > 2099)
$y = 2100;

$nextyear = $y;
$nextmonth = $m + 1;
if($nextmonth > 12) {
@@ -144,11 +152,18 @@ function events_content(&$a) {
$prevmonth = 12;
$prevyear --;
}

$o .= '<div id="new-event-link"><a href="' . $a->get_baseurl() . '/events/new' . '" >' . t('Create New Event') . '</a></div>';
$o .= '<a href="' . $a->get_baseurl() . '/events/' . $prevyear . '/' . $prevmonth . '" class="prevcal">' . t('&lt;&lt; Previous') . '</a> | <a href="' . $a->get_baseurl() . '/events/' . $nextyear . '/' . $nextmonth . '" class="nextcal">' . t('Next &gt;&gt;') . '</a>';
$o .= '<div id="event-calendar-wrapper">';

$o .= '<a href="' . $a->get_baseurl() . '/events/' . $prevyear . '/' . $prevmonth . '" class="prevcal"><div id="event-calendar-prev" class="icon prev" title="' . t('Previous') . '"></div></a>';
$o .= cal($y,$m,false, ' eventcal');

$o .= '<a href="' . $a->get_baseurl() . '/events/' . $nextyear . '/' . $nextmonth . '" class="nextcal"><div id="event-calendar-next" class="icon next" title="' . t('Next') . '"></div></a>';
$o .= '</div>';
$o .= '<div class="event-calendar-end"></div>';

$dim = get_dim($y,$m);
$start = sprintf('%d-%d-%d %d:%d:%d',$y,$m,1,0,0,0);
$finish = sprintf('%d-%d-%d %d:%d:%d',$y,$m,$dim,23,59,59);


+ 1
- 1
mod/notes.php View File

@@ -38,7 +38,7 @@ function notes_content(&$a) {
$is_owner = true;

$o .= '<h3>' . t('Private Notes') . '</h3>';
$o .= '<h3>' . t('Personal Notes') . '</h3>';

$commpage = false;
$commvisitor = false;


+ 3
- 1
mod/profile.php View File

@@ -115,7 +115,9 @@ function profile_content(&$a, $update = 0) {
'$phototab' => $a->get_baseurl() . '/photos/' . $a->profile['nickname'],
'$status' => t('Status'),
'$profile' => t('Profile'),
'$photos' => t('Photos')
'$photos' => t('Photos'),
'$events' => (($is_owner) ? '<a href="events" id="profile-tab-events-link" class="profile-tabs" >' . t('Events') . '</a>' : ''),
'$notes' => (($is_owner) ? '<a href="notes" id="profile-tab-notes-link" class="profile-tabs" >' . t('Personal Notes') . '</a>' : '')
));




+ 2
- 0
view/profile_tabs.tpl View File

@@ -3,5 +3,7 @@
<a href="$url" id="profile-tab-status-link" class="profile-tabs" >$status</a>
<a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >$profile</a>
<a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >$photos</a>
$events
$notes
<div id="profile-tabs-end"></div>
</div>

+ 17
- 1
view/theme/duepuntozero/style.css View File

@@ -2224,7 +2224,8 @@ a.mail-list-link {
}

.eventcal {
font-size: 24px;
float: left;
font-size: 20px;
}

#new-event-link {
@@ -2245,6 +2246,17 @@ a.mail-list-link {
.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 @@ a.mail-list-link {
}




#lang-select-icon {
cursor: pointer;
position: absolute;
@@ -2505,6 +2519,8 @@ a.mail-list-link {
.youtube { background-position: -64px -32px;}
.attach { background-position: -80px -32px; }
.language { background-position: -96px -32px; }
.prev { background-position: -112px -32px; }
.next { background-position: -128px -32px; }


.attachtype {


+ 44
- 0
view/theme/loozah/style.css View File

@@ -2423,6 +2423,48 @@ a.mail-list-link {
color: #FF0000;
}

.eventcal {
float: left;
font-size: 20px;
}

#new-event-link {
margin-bottom: 10px;
}

.event-description:before {
content: url('../../../images/calendar.png');
margin-right: 15px;
}

.event-start, .event-end {
margin-left: 10px;
width: 330px;
clear: both;
}

.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;
}
.today {
color: #FF0000;
}


#event-start-text, #event-finish-text {
margin-top: 10px;
margin-bottom: 5px;
@@ -2491,6 +2533,8 @@ a.mail-list-link {
.youtube { background-position: -64px -32px;}
.attach { background-position: -80px -32px; }
.language { background-position: -96px -32px; }
.prev { background-position: -112px -32px; }
.next { background-position: -128px -32px; }

.attachtype {
display: block; width: 20px; height: 23px;


Loading…
Cancel
Save