MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #126 from fabrixxm/dispy

Browse source 
Dispy
This commit is contained in:
Friendika 2011-06-23 04:10:12 -07:00
commit fa778e0040
9 changed files with 1625 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
mod/events.php
View file

@ -103,8 +103,23 @@ function events_content(&$a) {
return;
}
$o ="";
// tabs
$tpl = get_markup_template('profile_tabs.tpl');
$o .= replace_macros($tpl,array(
'$url' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
'$phototab' => $a->get_baseurl() . '/photos/' . $a->user['nickname'],
'$status' => t('Status'),
'$profile' => t('Profile'),
'$photos' => t('Photos'),
'$events' => t('Events') ,
'$notes' => t('Personal Notes'),
'$activetab' => "events",
));
$o .= '<h2>' . t('Events') . '</h2>';
$mode = 'view';
$y = 0;
$m = 0;
@ -318,4 +333,4 @@ function events_content(&$a) {
return $o;
}
}
}

14
mod/notes.php
View file

@ -36,6 +36,20 @@ function notes_content(&$a) {
$contact = $a->contact;
$is_owner = true;
$o ="";
// tabs
$tpl = get_markup_template('profile_tabs.tpl');
$o .= replace_macros($tpl,array(
'$url' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
'$phototab' => $a->get_baseurl() . '/photos/' . $a->user['nickname'],
'$status' => t('Status'),
'$profile' => t('Profile'),
'$photos' => t('Photos'),
'$events' => t('Events') ,
'$notes' => t('Personal Notes'),
'$activetab' => "notes",
));
$o .= '<h3>' . t('Personal Notes') . '</h3>';

34
mod/photos.php
View file

@ -80,15 +80,15 @@ EOT;
function photos_post(&$a) {
logger('mod/photos.php: photos_post(): begin' , 'LOGGER_DEBUG');
logger('mod/photos.php: photos_post(): begin' , 'LOGGER_DEBUG');
foreach($_REQUEST AS $key => $val) {
logger('mod/photos.php: photos_post(): $_REQUEST key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG');
}
foreach($_REQUEST AS $key => $val) {
logger('mod/photos.php: photos_post(): $_REQUEST key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG');
}
foreach($_FILES AS $key => $val) {
logger('mod/photos.php: photos_post(): $_FILES key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG');
}
foreach($_FILES AS $key => $val) {
logger('mod/photos.php: photos_post(): $_FILES key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG');
}
$can_post = false;
$visitor = 0;
@ -836,6 +836,22 @@ function photos_content(&$a) {
);
}
$o = "";
// tabs
$tpl = get_markup_template('profile_tabs.tpl');
$_is_owner = (local_user() && (local_user() == $owner_uid));
$o .= replace_macros($tpl,array(
'$url' => $a->get_baseurl() . '/profile/' .$a->data['user']['nickname'],
'$phototab' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'],
'$status' => t('Status'),
'$profile' => t('Profile'),
'$photos' => t('Photos'),
'$events' => (($_is_owner) ? t('Events') : ''),
'$notes' => (($_is_owner) ? t('Personal Notes') : ''),
'$activetab' => "photos",
));
//
// dispatch request
//
@ -968,7 +984,7 @@ function photos_content(&$a) {
$o = '';
//$o = '';
// fetch image, item containing image, then comments
$ph = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'
@ -1319,7 +1335,7 @@ function photos_content(&$a) {
}
// Default - show recent photos with upload link (if applicable)
$o = '';
//$o = '';
$r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s'
$sql_extra GROUP BY `resource-id`",

5
mod/profile.php
View file

@ -116,8 +116,9 @@ function profile_content(&$a, $update = 0) {
'$status' => t('Status'),
'$profile' => t('Profile'),
'$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>' : '')
'$events' => (($is_owner) ? t('Events') : ''),
'$notes' => (($is_owner) ? t('Personal Notes') : ''),
'$activetab' => $tab,
));

6
view/profile_tabs.tpl
View file

@ -3,7 +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
{{ if $events }}<a href="events" id="profile-tab-events-link" class="profile-tabs" >$events</a>{{ endif }}
{{ if $notes }}<a href="notes" id="profile-tab-notes-link" class="profile-tabs" >$notes</a>{{ endif }}
<div id="profile-tabs-end"></div>
</div>
</div>

BIN
view/theme/dispy/icons.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 20 KiB

1442
view/theme/dispy/icons.svg Normal file
View file

File diff suppressed because it is too large Load diff
Side by side

After

Width:  |  Height:  |  Size: 81 KiB

10
view/theme/dispy/profile_tabs.tpl
View file

@ -1,7 +1,9 @@
<div class="tabs-wrapper" >
<a href="$url" id="profile-tab-status-link" class="tabs" >$status</a>
<a href="$url?tab=profile" id="profile-tab-profile-link" class="tabs" >$profile</a>
<a href="$phototab" id="profile-tab-photos-link" class="tabs" >$photos</a>
<a href="$url" id="profile-tab-status-link" class="tabs {{if $activetab==posts}}active{{endif}}" >$status</a>
<a href="$url?tab=profile" id="profile-tab-profile-link" class="tabs {{if $activetab==profile}}active{{endif}}" >$profile</a>
<a href="$phototab" id="profile-tab-photos-link" class="tabs {{if $activetab==photos}}active{{endif}}" >$photos</a>
{{ if $events }}<a href="events" id="profile-tab-events-link" class="tabs {{if $activetab==events}}active{{endif}}" >$events</a>{{ endif }}
{{ if $notes }}<a href="notes" id="profile-tab-notes-link" class="tabs {{if $activetab==notes}}active{{endif}}" >$notes</a>{{ endif }}
<div class="tabs-end"></div>
</div>
</div>

118
view/theme/dispy/style.css
View file

@ -371,6 +371,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
.tabs-wrapper li { display: inline;}
.tabs { padding: 0px 5px; margin-right: 10px; }
.tabs:hover { background-color: #729fcf; color: #eeeeec; border: 0px; }
.tabs.active { background-color: #729fcf; color: #eeeeec; border: 0px; }
/**
@ -559,7 +560,14 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
padding-left: 10px;
}
/**
* profile
**/
div[id$="text"] { font-weight: bold; float: left; width: 200px; }
div[id$="wrapper"] { height: 100%; margin-bottom: 1em; }
div[id$="wrapper"] br { clear: left; }
#advanced-profile-with { margin-left: 200px; }
/**
* photos
@ -642,6 +650,9 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
transition: all 0.2s ease-in-out;
}
#photo-next-link .icon,
#photo-prev-link .icon { display: none }
#photos-upload-spacer,
#photos-upload-new-wrapper,
#photos-upload-exist-wrapper { margin-bottom: 1em; }
@ -794,6 +805,108 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
#cropimage-wrapper { float:left; }
#crop-image-form { clear:both; }
/**
* events
**/
.clear { clear: both; }
.eventcal {
float: left;
font-size: 20px;
}
.vevent {
border: 1px solid #CCCCCC;
}
.vevent .event-description, .vevent .event-location {
margin-left: 10px;
margin-right: 10px;
}
.vevent .event-start {
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;
}
.event-description:before {
content: url('../../../images/calendar.png');
margin-right: 15px;
}
.event-start, .event-end {
margin-left: 10px;
width: 330px;
}
.event-start .dtstart, .event-end .dtend {
float: right;
}
.event-list-date {
margin-bottom: 10px;
}
.prevcal, .nextcal {
float: left;
margin-left: 32px;
margin-right: 32px;
margin-top: 64px;
}
.event-calendar-end {
clear: both;
}
.calendar {
font-family: Courier, monospace;
}
.today {
font-weight: bold;
color: #FF0000;
}
#event-start-text,
#event-finish-text {
margin-top: 10px;
margin-bottom: 5px;
}
#event-nofinish-checkbox,
#event-nofinish-text,
#event-adjust-checkbox,
#event-adjust-text,
#event-share-checkbox
{
float: left;
}
#event-datetime-break {
margin-bottom: 10px;
}
#event-nofinish-break,
#event-adjust-break,
#event-share-break {
clear: both;
}
#event-desc-text,
#event-location-text {
margin-top: 10px;
margin-bottom: 5px;
}
#event-submit {
margin-top: 10px;
}
/**
* directory
@ -940,7 +1053,8 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
.on { background-position: -50px -60px;}
.off { background-position: -70px -60px;}
.prev { background-position: -90px -60px;}
.next { background-position: -110px -60px;}
.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }