diff options
86 files changed, 1850 insertions, 488 deletions
@@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1298' ); +define ( 'FRIENDICA_VERSION', '2.3.1299' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1134 ); @@ -293,6 +293,8 @@ class App { public $nav_sel; + public $category; + private $scheme; private $hostname; private $baseurl; @@ -377,6 +379,9 @@ class App { $this->argc = count($this->argv); if((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) { $this->module = str_replace(".", "_", $this->argv[0]); + if(array_key_exists('2',$this->argv)) { + $this->category = $this->argv[2]; + } } else { $this->argc = 1; diff --git a/doc/Home.md b/doc/Home.md index 56abe8075..30efc93f7 100755 --- a/doc/Home.md +++ b/doc/Home.md @@ -5,6 +5,7 @@ Friendica Documentation and Resources **Contents** * [Account Basics](help/Account-Basics) +* [New User Quick Start](help/guide) * [Profiles](help/Profiles) * [Connectors](help/Connectors) * [Making Friends](help/Making-Friends) diff --git a/doc/andfinally.md b/doc/andfinally.md new file mode 100644 index 000000000..cd8a6994b --- /dev/null +++ b/doc/andfinally.md @@ -0,0 +1,24 @@ +And that brings the Quick Start to an end. + +Here are some more things to help get you started: + +**Groups** + + +- <a href = "https://kakste.com/profile/newhere">New Here</a> - a group for people new to Friendica + +- <a href = "http://helpers.pyxis.uberspace.de/profile/helpers">Friendica Support</a> - problems? This is the place to ask. + +- <a href = "https://kakste.com/profile/public_stream">Public Stream</a> - a place to talk about anything to anyone. + +- <a href = "https://letstalk.pyxis.uberspace.de/profile/letstalk">Let's Talk</a> a group for finding people and groups who share similar interests. + +- <a href = "http://newzot.hydra.uberspace.de/profile/newzot">Local Friendica</a> a page for local Friendica groups</a> + + +**Documentation** + +- <a href = "/help/Connectors">Connecting to more networks</a> +- <a href = "/help">Help Index</a> + + diff --git a/doc/groupsandpages.md b/doc/groupsandpages.md new file mode 100644 index 000000000..418e682c8 --- /dev/null +++ b/doc/groupsandpages.md @@ -0,0 +1,11 @@ +This is the global directory. If you get lost, you can <a href = "/help/groupsandpages">click this link</a> to bring yourself back here. + +On this page, you'll find a collection of groups, forums and celebrity pages. Groups are not real people. Connecting to them is similar to "liking" something on Facebook, or signing up for a new forum. You don't have to feel awkward about introducing yourself to a new person, because they're not people! + +When you connect to a group, all messages to that group will start appearing in your network tab. You can comment on these posts, or post to the group yourself without ever having to add any of the groups members. This is a great way to make friends dynamically - you'll find people you like and add each other naturally instead of adding random strangers. Simply find a group you're interested in, and connect to it the same way you did with people in the last section. There are a lot of groups, and you're likely to get lost. Remember the link at the top of this page will bring you back here. + +Once you've added some groups, <a href = "/help/andfinally">move on to the next section</a>. + +<iframe src="http://dir.friendica.com/directory/forum" width="950" height = "600"></iframe> + + diff --git a/doc/guide.md b/doc/guide.md new file mode 100644 index 000000000..178170c4e --- /dev/null +++ b/doc/guide.md @@ -0,0 +1,13 @@ +First things first, let's make sure you're logged in to your account. If you're not already logged in, do so in the frame below. + +Once you've logged in (or if you are already logged in), you'll now be looking at your profile page. + +This is a bit like your Facebook wall. It's where all your status messgages are kept, and where your friends come to post on your wall. To write your status, simply click in the box that says "share". When you do this, the box will expand. You can see some formatting options at the top such as Bold, Italics and Underline, as well as ways to add links and pictures. At the bottom you'll find some more links. You can use these to upload pictures and files from your computer, share websites with a bit of preview text, or embed video and audio files from elsewhere on the web. You can also set your post location here. + +Once you've finished writing your post, click on the padlock icon to select who can see it. If you do not use the padlock icon, your post will be public. This means it will appear to anybody who views your profile, and in the community tab if your site has it enabled, as well as in the network tab of any of your contacts. + +Play around with this a bit, then when you're ready to move on, we'll take a look at the <a href = "/help/network">Network Tab</a> + +<iframe src="/login" width="950" height = "600"></iframe> + + diff --git a/doc/makingnewfriends.md b/doc/makingnewfriends.md new file mode 100644 index 000000000..35befaa36 --- /dev/null +++ b/doc/makingnewfriends.md @@ -0,0 +1,11 @@ +This is your Suggested Friends page. If you get lost, you can <a href = "/help/makenewfriends">click this link</a> to bring yourself back here. + +This is a bit like the Friend Suggestions page of Facebook. Everybody on this list has agreed that they may be suggested as a friend. This means they're unlikely to refuse an introduction you send, and they want to meet new people too! + +See somebody you like the look of? Click the connect button beneath their photograph. This will bring you to the introductions page. Fill in the form as instructed, and add a small note (optional). Now, wait a bit and they'll accept your request - note that these are real people, and it might take a while. Now you've added one, you're probably lost. Click the link at the top of this page to go back to the suggested friends list and add some more. + +Feel uncomfortable adding people you don't know? Don't worry - that's where <a href = "/help/groupsandpages">Groups and Pages</a> come in! + +<iframe src="/suggest" width="950" height = "600"></iframe> + + diff --git a/doc/network.md b/doc/network.md new file mode 100644 index 000000000..f445b0055 --- /dev/null +++ b/doc/network.md @@ -0,0 +1,9 @@ +This is your Network Tab. If you get lost, you can <a href = "/help/network">click this link</a> to bring yourself back here. + +This is a bit like the Newsfeed at Facebook or the Stream at Diaspora. It's where all the posts from your contacts, groups, and feeds will appear. If you're new, you won't see anything in this page, unless you posted your status in the last step. If you've already added a few friends, you'll be able to see their posts. Here, you can comment, like, or dislike posts, or click on somebody's name to visit their profile page where you can write on their wall. + +Now we need to fill it up, the first step, is to <a href = "/help/peopleyouknow"> add people you already know from Facebook</a>. + +<iframe src="/network" width="950" height = "600"></iframe> + + diff --git a/doc/peopleyouknow.md b/doc/peopleyouknow.md new file mode 100644 index 000000000..143c49217 --- /dev/null +++ b/doc/peopleyouknow.md @@ -0,0 +1,13 @@ +This is your connector settings page. If you get lost, you can <a href = "/help/network">click this link</a> to bring yourself back here. + +This is the bit that makes Friendica unique. You can connect to <i>anybody on the internet</i> from your Friendica account using this page! The available connectors varies depending on which plugins you have installed, but for now, we'll walk you through Facebook. Note that not all servers have the Facebook connector installed. If you can't find it in the list below, don't worry, we'll look at ways of connecting to more people in the following pages. + +The biggest of all social networks is Facebook. Fortunately, this connector is really easy. Scroll down the page, and click Facebook Connector Settings. Enter your Facebook user name and password and let the application (the connector) do everything the options suggest. You can <a href = "https://github.com/friendica/friendica/wiki/How-to:-Friendica%E2%80%99s-Facebook-connector" target="new">fine tune this</a> or experiment with the other connectors too. If you need help, you can always ask at <a href = "http://helpers.pyxis.uberspace.de/profile/helpers" target="new">Friendica Support</a> or <a href = "/help/Connectors" target="new">see the instructions here</a>. + +When you're ready, we can move on to <a href = "/help/makingnewfriends">making new friends</a>. + + + +<iframe src="/settings/connectors" width="950" height = "600"></iframe> + + diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 7346b95af..e0f37f078 100755 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -103,3 +103,31 @@ function fileas_widget($baseurl,$selected = '') { )); } +function categories_widget($baseurl,$selected = '') { + $a = get_app(); + + $saved = get_pconfig($a->profile['profile_uid'],'system','filetags'); + if(! strlen($saved)) + return; + + $matches = false; + $terms = array(); + $cnt = preg_match_all('/<(.*?)>/',$saved,$matches,PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + $unescaped = xmlify(file_tag_decode($mtch[1])); + $terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : '')); + } + } + + return replace_macros(get_markup_template('categories_widget.tpl'),array( + '$title' => t('Categories'), + '$desc' => '', + '$sel_all' => (($selected == '') ? 'selected' : ''), + '$all' => t('Everything'), + '$terms' => $terms, + '$base' => $baseurl, + + )); +} + diff --git a/include/conversation.php b/include/conversation.php index 5a922b2b5..df92a40ed 100755 --- a/include/conversation.php +++ b/include/conversation.php @@ -974,6 +974,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$shortnoloc' => t('clear location'), '$title' => "", '$placeholdertitle' => t('Set title'), + '$category' => "", + '$placeholdercategory' => t('Categories (comma-separated list)'), '$wait' => t('Please wait'), '$permset' => t('Permission settings'), '$shortpermset' => t('permissions'), diff --git a/include/diaspora.php b/include/diaspora.php index 104ccadf2..04238f17c 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1920,6 +1920,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { $images = array(); + $title = $item['title']; $body = $item['body']; /* @@ -1944,9 +1945,12 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { } } */ - $body = xmlify(html_entity_decode(bb2diaspora($body))); + if(strlen($title)) + $body = xmlify('**' . html_entity_decode($title) . '**' . "\n") . $body; + + if($item['attach']) { $cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism',$item['attach'],$matches,PREG_SET_ORDER); if(cnt) { diff --git a/include/items.php b/include/items.php index e09b888ca..ee6960534 100755 --- a/include/items.php +++ b/include/items.php @@ -435,8 +435,15 @@ function get_atom_elements($feed,$item) { $res['body'] = @html2bbcode($res['body']); } - else + elseif(! $have_real_body) { + + // it's not one of our messages and it has no tags + // so it's probably just text. We'll escape it just to be safe. + $res['body'] = escape_tags($res['body']); + } + + // this tag is obsolete but we keep it for really old sites $allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow'); if($allow && $allow[0]['data'] == 1) diff --git a/include/text.php b/include/text.php index 191f4fca8..5456b5ad3 100644 --- a/include/text.php +++ b/include/text.php @@ -225,6 +225,9 @@ if(! function_exists('paginate')) { function paginate(&$a) { $o = ''; $stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string); + +// $stripped = preg_replace('/&zrl=(.*?)([\?&]|$)/ism','',$stripped); + $stripped = str_replace('q=','',$stripped); $stripped = trim($stripped,'/'); $pagenum = $a->pager['page']; @@ -725,6 +728,8 @@ function smilies($s, $sample = false) { '\\o/', 'o.O', 'O.o', + 'o_O', + 'O_o', ":'(", ":-!", ":-/", @@ -759,6 +764,8 @@ function smilies($s, $sample = false) { '<img src="' . $a->get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" />', '<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" />', '<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />', + '<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o_O" />', + '<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O_o" />', '<img src="' . $a->get_baseurl() . '/images/smiley-cry.gif" alt=":\'(" />', '<img src="' . $a->get_baseurl() . '/images/smiley-foot-in-mouth.gif" alt=":-!" />', '<img src="' . $a->get_baseurl() . '/images/smiley-undecided.gif" alt=":-/" />', @@ -1314,6 +1321,118 @@ function file_tag_file_query($table,$s,$type = 'file') { return " AND " . (($table) ? dbesc($table) . '.' : '') . "file regexp '" . dbesc($str) . "' "; } +// ex. given music,video return <music><video> or [music][video] +function file_tag_list_to_file($list,$type = 'file') { + $tag_list = ''; + if(strlen($list)) { + $list_array = explode(",",$list); + if($type == 'file') { + $lbracket = '['; + $rbracket = ']'; + } + else { + $lbracket = '<'; + $rbracket = '>'; + } + + foreach($list_array as $item) { + if(strlen($item)) { + $tag_list .= $lbracket . file_tag_encode(trim($item)) . $rbracket; + } + } + } + return $tag_list; +} + +// ex. given <music><video>[friends], return music,video or friends +function file_tag_file_to_list($file,$type = 'file') { + $matches = false; + $list = ''; + if($type == 'file') { + $cnt = preg_match_all('/\[(.*?)\]/',$file,$matches,PREG_SET_ORDER); + } + else { + $cnt = preg_match_all('/<(.*?)>/',$file,$matches,PREG_SET_ORDER); + } + if($cnt) { + foreach($matches as $mtch) { + if(strlen($list)) + $list .= ','; + $list .= file_tag_decode($mtch[1]); + } + } + + return $list; +} + +function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') { + // $file_old - categories previously associated with an item + // $file_new - new list of categories for an item + + if(! intval($uid)) + return false; + + if($file_old == $file_new) + return true; + + $saved = get_pconfig($uid,'system','filetags'); + if(strlen($saved)) { + if($type == 'file') { + $lbracket = '['; + $rbracket = ']'; + } + else { + $lbracket = '<'; + $rbracket = '>'; + } + + $filetags_updated = $saved; + + // check for new tags to be added as filetags in pconfig + $new_tags = array(); + $check_new_tags = explode(",",file_tag_file_to_list($file_new,$type)); + + foreach($check_new_tags as $tag) { + if(! stristr($saved,$lbracket . file_tag_encode($tag) . $rbracket)) + $new_tags[] = $tag; + } + + $filetags_updated .= file_tag_list_to_file(implode(",",$new_tags),$type); + + // check for deleted tags to be removed from filetags in pconfig + $deleted_tags = array(); + $check_deleted_tags = explode(",",file_tag_file_to_list($file_old,$type)); + + foreach($check_deleted_tags as $tag) { + if(! stristr($file_new,$lbracket . file_tag_encode($tag) . $rbracket)) + $deleted_tags[] = $tag; + } + + foreach($deleted_tags as $key => $tag) { + $r = q("select file from item where uid = %d " . file_tag_file_query('item',$tag,$type), + intval($uid) + ); + + if(count($r)) { + unset($deleted_tags[$key]); + } + else { + $filetags_updated = str_replace($lbracket . file_tag_encode($tag) . $rbracket,'',$filetags_updated); + } + } + + if($saved != $filetags_updated) { + set_pconfig($uid,'system','filetags', $filetags_updated); + } + return true; + } + else + if(strlen($file_new)) { + set_pconfig($uid,'system','filetags', $file_new); + } + return true; +} + function file_tag_save_file($uid,$item,$file) { $result = false; if(! intval($uid)) @@ -95,6 +95,7 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) { if(x($_GET,'zrl')) { $_SESSION['my_url'] = $_GET['zrl']; + $a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string); } /** @@ -243,6 +244,8 @@ if (file_exists($theme_info_file)){ if(! x($a->page,'content')) $a->page['content'] = ''; +if(! $install) + call_hooks('page_content_top',$a->page['content']); /** * Call module functions diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index c2d37dac7..5881b7b51 100755 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -664,8 +664,8 @@ function dfrn_request_content(&$a) { else $tpl = get_markup_template('auto_request.tpl'); - $page_desc = sprintf( t('Diaspora members: Please do not use this form. Instead, enter "%s" into your Diaspora search bar.'), - $target_addr) . EOL . EOL; + # $page_desc = sprintf( t('Diaspora members: Please do not use this form. Instead, enter "%s" into your Diaspora search bar.'), + # $target_addr) . EOL . EOL; $page_desc .= t("Please enter your 'Identity Address' from one of the following supported communications networks:"); @@ -699,7 +699,7 @@ function dfrn_request_content(&$a) { '$friendica' => t('Friendica'), '$statusnet' => t('StatusNet/Federated Social Web'), '$diaspora' => t('Diaspora'), - '$diasnote' => t('- please share from your own site as noted above'), + '$diasnote' => sprintf (t(' - please do not use this form. Instead, enter %s into your Diaspora search bar.'),$target_addr), '$your_address' => t('Your Identity Address:'), '$invite_desc' => $invite_desc, '$emailnet' => $emailnet, diff --git a/mod/editpost.php b/mod/editpost.php index 2ddba36aa..4c00201ca 100755 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -115,6 +115,8 @@ function editpost_content(&$a) { '$jotnets' => $jotnets, '$title' => $itm[0]['title'], '$placeholdertitle' => t('Set title'), + '$category' => file_tag_file_to_list($itm[0]['file'], 'category'), + '$placeholdercategory' => t('Categories (comma-separated list)'), '$emtitle' => t('Example: bob@example.com, mary@example.com'), '$lockstate' => $lockstate, '$acl' => '', // populate_acl((($group) ? $group_acl : $a->user), $celeb), diff --git a/mod/events.php b/mod/events.php index 0906d16c2..e66a2dc44 100755 --- a/mod/events.php +++ b/mod/events.php @@ -284,11 +284,11 @@ function events_content(&$a) { if (x($_GET,'id')){ $tpl = get_markup_template("event.tpl"); } else { - if (get_config('experimentals','new_calendar')==1){ +// if (get_config('experimentals','new_calendar')==1){ $tpl = get_markup_template("events-js.tpl"); - } else { - $tpl = get_markup_template("events.tpl"); - } +// } else { +// $tpl = get_markup_template("events.tpl"); +// } } $o = replace_macros($tpl, array( '$baseurl' => $a->get_baseurl(), diff --git a/mod/item.php b/mod/item.php index 24730f53e..72e63865b 100755 --- a/mod/item.php +++ b/mod/item.php @@ -216,8 +216,6 @@ function item_post(&$a) { $emailcc = notags(trim($_REQUEST['emailcc'])); $body = escape_tags(trim($_REQUEST['body'])); - // $categories = TODO - $private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0); if(($parent_item) && @@ -255,6 +253,19 @@ function item_post(&$a) { } } + if(strlen($categories)) { + // get the "fileas" tags for this post + $filedas = file_tag_file_to_list($categories, 'file'); + } + // save old and new categories, so we can determine what needs to be deleted from pconfig + $categories_old = $categories; + $categories = file_tag_list_to_file(trim($_REQUEST['category']), 'category'); + $categories_new = $categories; + if(strlen($filedas)) { + // append the fileas stuff to the new categories list + $categories .= file_tag_list_to_file($filedas, 'file'); + } + // Work around doubled linefeeds in Tinymce 3.5b2 // First figure out if it's a status post that would've been // created using tinymce. Otherwise leave it alone. @@ -572,6 +583,9 @@ function item_post(&$a) { intval($profile_uid) ); + // update filetags in pconfig + file_tag_update_pconfig($uid,$categories_old,$categories_new,'category'); + proc_run('php', "include/notifier.php", 'edit_post', "$post_id"); if((x($_REQUEST,'return')) && strlen($return_path)) { logger('return: ' . $return_path); @@ -585,8 +599,8 @@ function item_post(&$a) { $r = q("INSERT INTO `item` (`guid`, `uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, `author-name`, `author-link`, `author-avatar`, `created`, `edited`, `commented`, `received`, `changed`, `uri`, `thr-parent`, `title`, `body`, `app`, `location`, `coord`, - `tag`, `inform`, `verb`, `postopts`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach`, `bookmark`,`origin`, `moderated` ) - VALUES( '%s', %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d )", + `tag`, `inform`, `verb`, `postopts`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach`, `bookmark`,`origin`, `moderated`, `file` ) + VALUES( '%s', %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, '%s' )", dbesc($datarray['guid']), intval($datarray['uid']), dbesc($datarray['type']), @@ -624,8 +638,9 @@ function item_post(&$a) { dbesc($datarray['attach']), intval($datarray['bookmark']), intval($datarray['origin']), - intval($datarray['moderated']) - ); + intval($datarray['moderated']), + dbesc($datarray['file']) + ); $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($datarray['uri'])); @@ -633,6 +648,9 @@ function item_post(&$a) { $post_id = $r[0]['id']; logger('mod_item: saved item ' . $post_id); + // update filetags in pconfig + file_tag_update_pconfig($uid,$categories_old,$categories_new,'category'); + if($parent) { // This item is the last leaf and gets the comment box, clear any ancestors diff --git a/mod/newmember.php b/mod/newmember.php index 2ecc89024..683463ecb 100755 --- a/mod/newmember.php +++ b/mod/newmember.php @@ -13,6 +13,8 @@ function newmember_content(&$a) { $o .= '<ul>'; + $o .= '<li>' . '<a target="newmember" href="/help/guide">' . t('On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, connect to Facebook, make some new connections, and find some groups to join.') . '</a></li>' . EOL; + $o .= '<li>' . '<a target="newmember" href="settings">' . t('On your <em>Settings</em> page - change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web.') . '</a></li>' . EOL; $o .= '<li>' . '<a target="newmember" href="settings">' . t('Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you.') . '</a></li>' . EOL; diff --git a/mod/profile.php b/mod/profile.php index 782d17d83..26b33d5f1 100755 --- a/mod/profile.php +++ b/mod/profile.php @@ -2,6 +2,11 @@ function profile_init(&$a) { + require_once('include/contact_widgets.php'); + + if(! x($a->page,'aside')) + $a->page['aside'] = ''; + $blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false); if($a->argc > 1) @@ -59,6 +64,13 @@ function profile_init(&$a) { function profile_content(&$a, $update = 0) { + if (x($a->category)) { + $category = $a->category; + } + else { + $category = ((x($_GET,'category')) ? $_GET['category'] : ''); + } + if(get_config('system','block_public') && (! local_user()) && (! remote_user())) { return login(); } @@ -112,7 +124,8 @@ function profile_content(&$a, $update = 0) { return; } - + $a->page['aside'] .= categories_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : '')); + if(! $update) { if(x($_GET,'tab')) $tab = notags(trim($_GET['tab'])); @@ -135,6 +148,7 @@ function profile_content(&$a, $update = 0) { $celeb = ((($a->profile['page-flags'] == PAGE_SOAPBOX) || ($a->profile['page-flags'] == PAGE_COMMUNITY)) ? true : false); + if(can_write_wall($a,$a->profile['profile_uid'])) { $x = array( @@ -178,6 +192,10 @@ function profile_content(&$a, $update = 0) { } else { + if(x($category)) { + $sql_extra .= file_tag_file_query('item',$category,'category'); + } + $r = q("SELECT COUNT(*) AS `total` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 @@ -204,6 +222,7 @@ function profile_content(&$a, $update = 0) { intval($a->profile['profile_uid']) ); + } $parents_arr = array(); diff --git a/mod/view.php b/mod/view.php index 33aa23f44..15b3733b3 100644 --- a/mod/view.php +++ b/mod/view.php @@ -9,7 +9,8 @@ function view_init($a){ if ($a->argc == 4){ $theme = $a->argv[2]; $THEMEPATH = "view/theme/$theme"; - require_once("view/theme/$theme/style.php"); + if(file_exists("view/theme/$theme/style.php")) + require_once("view/theme/$theme/style.php"); } killme(); diff --git a/view/categories_widget.tpl b/view/categories_widget.tpl new file mode 100755 index 000000000..061821beb --- /dev/null +++ b/view/categories_widget.tpl @@ -0,0 +1,13 @@ +<div class="clear"></div> +<div id="categories-sidebar" class="widget"> + <h3>$title</h3> + <div id="nets-desc">$desc</div> + + <ul class="categories-ul"> + <li class="tool"><a href="$base" class="categories-link categories-all{{ if $sel_all }} categories-selected{{ endif }}">$all</a></li> + {{ for $terms as $term }} + <li class="tool"><a href="$base?f=&category=$term.name" class="categories-link{{ if $term.selected }} categories-selected{{ endif }}">$term.name</a></li> + {{ endfor }} + </ul> + +</div> diff --git a/view/jot.tpl b/view/jot.tpl index 5fe1f954e..91de628ac 100755 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -15,6 +15,7 @@ <input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div> + <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div> <div id="jot-text-wrap"> <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea> diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css index 3b395ff2a..12c7d3c25 100755 --- a/view/theme/darkzero/style.css +++ b/view/theme/darkzero/style.css @@ -76,17 +76,21 @@ input#dfrn-url { } -#jot-title { +#jot-title, #jot-category { background-color: #333333; border: 1px solid #333333; } #jot-title::-webkit-input-placeholder{ color: #555555!important;} #jot-title:-moz-placeholder{color: #555555!important;} +#jot-category::-webkit-input-placeholder{ color: #555555!important;} +#jot-category:-moz-placeholder{color: #555555!important;} #jot-title:hover, -#jot-title:focus { +#jot-title:focus, +#jot-category:hover, +#jot-category:focus { border: 1px solid #cccccc; } blockquote { diff --git a/view/theme/diabook-aerith/communityhome.tpl b/view/theme/diabook-aerith/communityhome.tpl index 917af49f1..c26d02dc6 100755 --- a/view/theme/diabook-aerith/communityhome.tpl +++ b/view/theme/diabook-aerith/communityhome.tpl @@ -34,6 +34,7 @@ {{ if $nv }} <h3>Find Friends<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></h3> <a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br> +<a class="$nv.global_directory.2" href="$nv.global_directory.0" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br> <a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br> <a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br> <a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a> diff --git a/view/theme/diabook-aerith/fpostit/fpostit.php b/view/theme/diabook-aerith/fpostit/fpostit.php index 65c43a2b9..4505c9946 100644 --- a/view/theme/diabook-aerith/fpostit/fpostit.php +++ b/view/theme/diabook-aerith/fpostit/fpostit.php @@ -113,12 +113,12 @@ function showForm($error, $content) { echo <<<EOF <div class='wrap1'> <h2><img class='logo' src='friendika-32.png' align='middle';/> - Friendika Bookmarklet</h2> + Friendica Bookmarklet</h2> </div> <div class="wrap2"> <form method="post" action="{$_SERVER['PHP_SELF']}"> - Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)<br /><br /> + Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br /> Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br /> Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br /> <textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br /> diff --git a/view/theme/diabook-aerith/jot.tpl b/view/theme/diabook-aerith/jot.tpl index 59066a19c..ee30da7bf 100755 --- a/view/theme/diabook-aerith/jot.tpl +++ b/view/theme/diabook-aerith/jot.tpl @@ -2,7 +2,6 @@ <div id="profile-jot-wrapper" > <div id="profile-jot-banner-wrapper"> <div id="profile-jot-desc" > </div> - <div id="character-counter" class="grey"></div> </div> <div id="profile-jot-banner-end"></div> @@ -15,6 +14,7 @@ <input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"> + <div id="character-counter" class="grey"></div> <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea> diff --git a/view/theme/diabook-aerith/mail_conv.tpl b/view/theme/diabook-aerith/mail_conv.tpl new file mode 100755 index 000000000..989f17878 --- /dev/null +++ b/view/theme/diabook-aerith/mail_conv.tpl @@ -0,0 +1,60 @@ +<div class="wall-item-container $item.indent"> + <div class="wall-item-item"> + <div class="wall-item-info"> + <div class="contact-photo-wrapper" + <a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id"> + <img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" /> + </a> + </div> + </div> + <div class="wall-item-content"> + $mail.body + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"> + </div> + <div class="wall-item-tags"> + </div> + </div> + <div class="wall-item-bottom"> + <div class=""> + </div> + <div class="wall-item-actions"> + <div class="wall-item-actions-author"> + <a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span> + </div> + + <div class="wall-item-actions-social"> + </div> + + <div class="wall-item-actions-tools"> + <a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a> + </div> + + </div> + </div> + <div class="wall-item-bottom"> + </div> +</div> + + +{# + + +<div class="mail-conv-outside-wrapper"> + <div class="mail-conv-sender" > + <a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a> + </div> + <div class="mail-conv-detail" > + <div class="mail-conv-sender-name" >$mail.from_name</div> + <div class="mail-conv-date">$mail.date</div> + <div class="mail-conv-subject">$mail.subject</div> + <div class="mail-conv-body">$mail.body</div> + <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div> + <div class="mail-conv-outside-wrapper-end"></div> +</div> +</div> +<hr class="mail-conv-break" /> + +#} diff --git a/view/theme/diabook-aerith/mail_display.tpl b/view/theme/diabook-aerith/mail_display.tpl new file mode 100644 index 000000000..8b82e95c6 --- /dev/null +++ b/view/theme/diabook-aerith/mail_display.tpl @@ -0,0 +1,12 @@ +<div id="mail-display-subject"> + <span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span> + <a href="message/dropconv/$thread_id" onclick="return confirmDelete();" title="$delete" class="mail-delete icon s22 delete"></a> +</div> + +{{ for $mails as $mail }} + <div id="tread-wrapper-$mail.id" class="tread-wrapper"> + {{ inc mail_conv.tpl }}{{endinc}} + </div> +{{ endfor }} + +{{ inc prv_message.tpl }}{{ endinc }} diff --git a/view/theme/diabook-aerith/mail_list.tpl b/view/theme/diabook-aerith/mail_list.tpl new file mode 100644 index 000000000..6bc6c84f6 --- /dev/null +++ b/view/theme/diabook-aerith/mail_list.tpl @@ -0,0 +1,8 @@ +<div class="mail-list-wrapper"> + <span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span> + <span class="mail-from">$from_name</span> + <span class="mail-date">$date</span> + <span class="mail-count">$count</span> + + <a href="message/dropconv/$id" onclick="return confirmDelete();" title="$delete" class="mail-delete icon s22 delete"></a> +</div> diff --git a/view/theme/diabook-aerith/message_side.tpl b/view/theme/diabook-aerith/message_side.tpl new file mode 100644 index 000000000..9f1587096 --- /dev/null +++ b/view/theme/diabook-aerith/message_side.tpl @@ -0,0 +1,10 @@ +<div id="message-sidebar" class="widget"> + <div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div> + + <ul class="message-ul"> + {{ for $tabs as $t }} + <li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li> + {{ endfor }} + </ul> + +</div> diff --git a/view/theme/diabook-aerith/profile_vcard.tpl b/view/theme/diabook-aerith/profile_vcard.tpl index 918cfc97c..e28ec2909 100644 --- a/view/theme/diabook-aerith/profile_vcard.tpl +++ b/view/theme/diabook-aerith/profile_vcard.tpl @@ -21,9 +21,9 @@ </div> - {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} - <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> + <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> + {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} {{ if $location }} diff --git a/view/theme/diabook-aerith/search_item.tpl b/view/theme/diabook-aerith/search_item.tpl new file mode 100755 index 000000000..123834064 --- /dev/null +++ b/view/theme/diabook-aerith/search_item.tpl @@ -0,0 +1,100 @@ +{{ if $item.indent }}{{ else }} +<div class="wall-item-decor"> + <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> +</div> +{{ endif }} +<div class="wall-item-container $item.indent"> + <div class="wall-item-item"> + <div class="wall-item-info"> + <div class="contact-photo-wrapper" + onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" + onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> + <a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id"> + <img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" /> + </a> + <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a> + <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id"> + $item.item_photo_menu + </ul> + + </div> + </div> + <div class="wall-item-actions-author"> + <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> + <span class="wall-item-ago">- + {{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }} + {{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }} + </span> + </div> + <div class="wall-item-content"> + {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }} + $item.body + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"> + </div> + <div class="wall-item-tags"> + {{ for $item.tags as $tag }} + <span class='tag'>$tag</span> + {{ endfor }} + </div> + </div> + <div class="wall-item-bottom"> + <div class=""> + + </div> + <div class="wall-item-actions"> + + <div class="wall-item-actions-social"> + + + {{ if $item.vote }} + <a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a> + <a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a> + {{ endif }} + + {{ if $item.vote.share }} + <a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a> + {{ endif }} + + + {{ if $item.star }} + <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"> + <img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a> + <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> + {{ endif }} + + {{ if $item.filer }} + <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a> + {{ endif }} + + {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }} + + + + </div> + + <div class="wall-item-actions-tools"> + + {{ if $item.drop.dropping }} + <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" /> + <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a> + {{ endif }} + {{ if $item.edpost }} + <a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a> + {{ endif }} + </div> + <div class="wall-item-location">$item.location </div> + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"></div> + <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div> + <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div> + </div> +</div> + +<div class="wall-item-comment-wrapper" > + $item.comment +</div> diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css index bcba4c3be..7e2c8f02b 100644 --- a/view/theme/diabook-aerith/style-network.css +++ b/view/theme/diabook-aerith/style-network.css @@ -1198,10 +1198,14 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; + } +.qcomment{ + max-width: 122px; } - #id_username { width: 173px; } @@ -1256,7 +1260,7 @@ right_aside { /* background: #F1F1F1; */ } right_aside a{color: #3465A4;} -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-photo { margin: 0px; } @@ -1451,13 +1455,12 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper textarea { height: 2.0em; - width: 93%; + width: 100%; font-size: 10px; color: #999999; border: 1px solid #DDD; padding: 0.3em; font-size: 14px; - margin-left: 20px; } .wall-item-comment-wrapper .comment-edit-text-full { font-size: 14px; @@ -1614,6 +1617,11 @@ transition: all 0.2s ease-in-out; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; @@ -2122,7 +2130,7 @@ max-width: 85%; padding: 0px; width: 16px; height: 16px; - top: -20px; left:0px; + top: -16px; left:0px; overflow: hidden; text-indent: 40px; display: none; @@ -2501,8 +2509,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css index 9c9f8b4e6..29982c8c5 100644 --- a/view/theme/diabook-aerith/style-profile.css +++ b/view/theme/diabook-aerith/style-profile.css @@ -1193,10 +1193,14 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; + } +.qcomment{ + max-width: 122px; } - #id_username { width: 173px; } @@ -1251,7 +1255,7 @@ right_aside { /* background: #F1F1F1; */ } right_aside a{color: #3465A4;} -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-photo { margin: 0px; } @@ -1603,6 +1607,11 @@ transition: all 0.2s ease-in-out; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; @@ -2076,6 +2085,7 @@ box-shadow: 2px 2px 5px 0px #000000; margin: 2px 5px 2px 5px; max-height: 85%; max-width: 85%; +border-radius: 10px; } .lframe { float: left; @@ -2110,7 +2120,7 @@ max-width: 85%; padding: 0px; width: 16px; height: 16px; - top: -20px; left:0px; + top: -16px; left:0px; overflow: hidden; text-indent: 40px; display: none; @@ -2489,8 +2499,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook-aerith/style-settings.css b/view/theme/diabook-aerith/style-settings.css index 0326dbcfc..8963065ca 100644 --- a/view/theme/diabook-aerith/style-settings.css +++ b/view/theme/diabook-aerith/style-settings.css @@ -1191,8 +1191,10 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; } #id_username { diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index 1802c914d..14bbb6cda 100644 --- a/view/theme/diabook-aerith/style.css +++ b/view/theme/diabook-aerith/style.css @@ -566,6 +566,86 @@ header #banner #logo-text { position: absolute; top: 10%; } +/* messages */ +#message-new { + background: #3465A4; + border: 1px solid #333; + width: 150px; +} +#message-new a { + color: #ffffff; + text-align: center; + display: block; + font-weight: bold; + padding: 1em 0px; + text-decoration: none; +} +.mail-list-wrapper { + background-color: #f6f7f8; + margin-bottom: 5px; + width: 100%; + height: auto; + overflow: hidden; +} +.mail-list-wrapper span { + display: block; + float: left; + width: 20%; + overflow: hidden; +} +.mail-list-wrapper .mail-subject { + width: 30%; + padding: 4px 0px 0px 4px; +} +.mail-list-wrapper .mail-subject a { + display: block; +} +.mail-list-wrapper .mail-subject.unseen a { + font-weight: bold; +} +.mail-list-wrapper .mail-date { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-from { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-count { + padding: 4px 4px 0px 4px; + text-align: right; +} +.mail-list-wrapper .mail-delete { + float: right; +} +#mail-display-subject { + background-color: #f6f7f8; + color: #2d2d2d; + margin-bottom: 10px; + width: 100%; + height: auto; + overflow: hidden; +} +#mail-display-subject span { + float: left; + overflow: hidden; + padding: 4px 0px 0px 10px; +} +#mail-display-subject .mail-delete { + float: right; + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +#mail-display-subject:hover .mail-delete { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} /* nav */ nav { width: 80%; @@ -982,6 +1062,7 @@ aside { float: left; /* background: #F1F1F1; */ } +aside #page-sidebar{display: none;} aside .vcard .fn { font-size: 18px; font-weight: bold; @@ -1174,10 +1255,14 @@ section { } body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; + } +.qcomment{ + max-width: 122px; } - #id_username { width: 173px; } @@ -1233,92 +1318,6 @@ body .pageheader{ .tread-wrapper a{ color: #3465A4; } -.wall-item-photo-menu-button { -display: block; -position: absolute; -background-image: url("../../../view/theme/diabook-aerith/icons/photo-menu.jpg"); -background-position: top left; -background-repeat: no-repeat; -margin: 0px; -padding: 0px; -width: 16px; -height: 16px; -top: 90px; -left: 17px; -overflow: hidden; -text-indent: 40px; -display: none; -} -.wall-item-content-wrapper { -margin-top: 10px; -border: 1px solid #CCC; --moz-border-radius: 3px; -border-radius: 3px; -display: table; -width: 775px; -} -.wall-item-info { -/*display: block; -float: left; -width: 110px; -margin-right: 10px;*/ - display: table-cell; - vertical-align: top; - text-align: left; - width: 80px; -} -.wall-item-content { - font-size: 12.5px; - max-width: 720px; - word-wrap: break-word; - line-height: 1.2; -} -.wrapper-end { - clear: both; -} -.wall-item-photo-wrapper { -margin-top: 10px; -margin-left: 10px; -margin-bottom: 10px; -width: 100px; -} -.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none } -.wall-item-photo-menu li a { display: block; padding: 2px; } -.wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; } -.wall-item-wrapper { -margin-left: 10px; -} -.wall-item-title-end { - clear: both; -} - -.wall-item-body { - float: left; - /*width: 450px;*/ - margin-top: 10px; -} - -.wall-item-tools { - clear: both; - background-image: url("head.jpg"); - background-position: 0 -20px; - background-repeat: repeat-x; - padding: 5px 10px 0px; -} -.wall-item-author { - margin-top: 10px; -} -.wall-item-photo-menu { -width: auto; -border: 2px solid #444; -background: white; -position: absolute; -left: 10px; -top: 90px; -display: none; -z-index: 10000; -} - .wall-item-decor { position: absolute; left: 790px; @@ -1628,6 +1627,11 @@ z-index: 10000; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; @@ -2102,6 +2106,7 @@ box-shadow: 2px 2px 5px 0px #000000; margin: 2px 5px 2px 5px; max-height: 85%; max-width: 85%; +border-radius: 10px; } .lframe { float: left; @@ -2136,7 +2141,7 @@ max-width: 85%; padding: 0px; width: 16px; height: 16px; - top: -20px; left:0px; + top: -16px; left:0px; overflow: hidden; text-indent: 40px; display: none; @@ -2506,8 +2511,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php index 2b135878a..008e80c14 100755 --- a/view/theme/diabook-aerith/theme.php +++ b/view/theme/diabook-aerith/theme.php @@ -3,7 +3,7 @@ /* * Name: Diabook-aerith * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: + * Version: (Version: 1.011) * Author: */ @@ -139,7 +139,8 @@ function diabook_aerith_community_info(){ //nav FIND FRIENDS if(local_user()) { $nv = array(); - $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", ""); + $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); @@ -163,7 +164,8 @@ function diabook_aerith_community_info(){ $pagelist = array(); $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` - WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d", + WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d + ORDER BY `name` ASC", intval($a->user['uid']) ); @@ -310,61 +312,63 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" //load jquery.cookie.js $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" />', $cookieJS); +$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS); //js scripts -$a->page['htmlhead'] .= <<< EOT +$a->page['htmlhead'] .= ' <script> $(function() { - $('a.lightbox').fancybox(); // Select all links with lightbox class - + $("a.lightbox").fancybox(); // Select all links with lightbox class }); + + </script>'; -</script> +if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ +$a->page['htmlhead'] .= ' <script> $("right_aside").ready(function(){ - if($.cookie('close_pages') == '1') + if($.cookie("close_pages") == "1") { document.getElementById( "close_pages" ).style.display = "none"; }; - if($.cookie('close_helpers') == '1') + if($.cookie("close_helpers") == "1") { document.getElementById( "close_helpers" ).style.display = "none"; }; - if($.cookie('close_services') == '1') + if($.cookie("close_services") == "1") { document.getElementById( "close_services" ).style.display = "none"; }; - if($.cookie('close_friends') == '1') + if($.cookie("close_friends") == "1") { document.getElementById( "close_friends" ).style.display = "none"; }; - if($.cookie('close_postit') == '1') + if($.cookie("close_postit") == "1") { document.getElementById( "close_postit" ).style.display = "none"; }; - if($.cookie('close_lastusers') == '1') + if($.cookie("close_lastusers") == "1") { document.getElementById( "close_lastusers" ).style.display = "none"; }; - if($.cookie('close_lastphotos') == '1') + if($.cookie("close_lastphotos") == "1") { document.getElementById( "close_lastphotos" ).style.display = "none"; }; - if($.cookie('close_lastlikes') == '1') + if($.cookie("close_lastlikes") == "1") { document.getElementById( "close_lastlikes" ).style.display = "none"; };} @@ -373,57 +377,55 @@ $("right_aside").ready(function(){ function close_pages(){ document.getElementById( "close_pages" ).style.display = "none"; - $.cookie('close_pages','1', { expires: 365, path: '/' }); + $.cookie("close_pages","1", { expires: 365, path: "/" }); }; function close_helpers(){ document.getElementById( "close_helpers" ).style.display = "none"; - $.cookie('close_helpers','1', { expires: 365, path: '/' }); + $.cookie("close_helpers","1", { expires: 365, path: "/" }); }; function close_services(){ document.getElementById( "close_services" ).style.display = "none"; - $.cookie('close_services','1', { expires: 365, path: '/' }); + $.cookie("close_services","1", { expires: 365, path: "/" }); }; function close_friends(){ document.getElementById( "close_friends" ).style.display = "none"; - $.cookie('close_friends','1', { expires: 365, path: '/' }); + $.cookie("close_friends","1", { expires: 365, path: "/" }); }; function close_postit(){ document.getElementById( "close_postit" ).style.display = "none"; - $.cookie('close_postit','1', { expires: 365, path: '/' }); + $.cookie("close_postit","1", { expires: 365, path: "/" }); }; function close_lastusers(){ document.getElementById( "close_lastusers" ).style.display = "none"; - $.cookie('close_lastusers','1', { expires: 365, path: '/' }); + $.cookie("close_lastusers","1", { expires: 365, path: "/" }); }; function close_lastphotos(){ document.getElementById( "close_lastphotos" ).style.display = "none"; - $.cookie('close_lastphotos','1', { expires: 365, path: '/' }); + $.cookie("close_lastphotos","1", { expires: 365, path: "/" }); }; function close_lastlikes(){ document.getElementById( "close_lastlikes" ).style.display = "none"; - $.cookie('close_lastlikes','1', { expires: 365, path: '/' }); + $.cookie("close_lastlikes","1", { expires: 365, path: "/" }); }; - -function restore_boxes(){ - $.cookie('close_pages','2', { expires: 365, path: '/' }); - $.cookie('close_helpers','2', { expires: 365, path: '/' }); - $.cookie('close_services','2', { expires: 365, path: '/' }); - $.cookie('close_friends','2', { expires: 365, path: '/' }); - $.cookie('close_postit','2', { expires: 365, path: '/' }); - $.cookie('close_lastusers','2', { expires: 365, path: '/' }); - $.cookie('close_lastphotos','2', { expires: 365, path: '/' }); - $.cookie('close_lastlikes','2', { expires: 365, path: '/' }); - alert('Right-hand column was restored. Please refresh your browser'); - }; -</script> - -EOT; + +function restore_boxes(){ + $.cookie("close_pages","2", { expires: 365, path: "/" }); + $.cookie("close_helpers","2", { expires: 365, path: "/" }); + $.cookie("close_services","2", { expires: 365, path: "/" }); + $.cookie("close_friends","2", { expires: 365, path: "/" }); + $.cookie("close_postit","2", { expires: 365, path: "/" }); + $.cookie("close_lastusers","2", { expires: 365, path: "/" }); + $.cookie("close_lastphotos","2", { expires: 365, path: "/" }); + $.cookie("close_lastlikes","2", { expires: 365, path: "/" }); + alert("Right-hand column was restored. Please refresh your browser"); + }; +</script>';}
\ No newline at end of file diff --git a/view/theme/diabook-aerith/wallwall_item.tpl b/view/theme/diabook-aerith/wallwall_item.tpl index c5b6b36b5..6a0c93f88 100644 --- a/view/theme/diabook-aerith/wallwall_item.tpl +++ b/view/theme/diabook-aerith/wallwall_item.tpl @@ -71,6 +71,10 @@ <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> {{ endif }} + {{ if $item.filer }} + <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a> + {{ endif }} + {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }} diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl index cff75cd40..3b95b376e 100755 --- a/view/theme/diabook-blue/communityhome.tpl +++ b/view/theme/diabook-blue/communityhome.tpl @@ -34,6 +34,7 @@ {{ if $nv }} <h3>Find Friends<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></h3> <a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br> +<a class="$nv.global_directory.2" href="$nv.global_directory.0" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br> <a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br> <a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br> <a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a> diff --git a/view/theme/diabook-blue/fpostit/fpostit.php b/view/theme/diabook-blue/fpostit/fpostit.php index 65c43a2b9..4505c9946 100644 --- a/view/theme/diabook-blue/fpostit/fpostit.php +++ b/view/theme/diabook-blue/fpostit/fpostit.php @@ -113,12 +113,12 @@ function showForm($error, $content) { echo <<<EOF <div class='wrap1'> <h2><img class='logo' src='friendika-32.png' align='middle';/> - Friendika Bookmarklet</h2> + Friendica Bookmarklet</h2> </div> <div class="wrap2"> <form method="post" action="{$_SERVER['PHP_SELF']}"> - Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)<br /><br /> + Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br /> Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br /> Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br /> <textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br /> diff --git a/view/theme/diabook-blue/jot.tpl b/view/theme/diabook-blue/jot.tpl index 9aef99787..bd43994b5 100755 --- a/view/theme/diabook-blue/jot.tpl +++ b/view/theme/diabook-blue/jot.tpl @@ -2,7 +2,6 @@ <div id="profile-jot-wrapper" > <div id="profile-jot-banner-wrapper"> <div id="profile-jot-desc" > </div> - <div id="character-counter" class="grey"></div> </div> <div id="profile-jot-banner-end"></div> @@ -15,6 +14,7 @@ <input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"> + <div id="character-counter" class="grey"></div> <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea> diff --git a/view/theme/diabook-blue/mail_conv.tpl b/view/theme/diabook-blue/mail_conv.tpl new file mode 100755 index 000000000..989f17878 --- /dev/null +++ b/view/theme/diabook-blue/mail_conv.tpl @@ -0,0 +1,60 @@ +<div class="wall-item-container $item.indent"> + <div class="wall-item-item"> + <div class="wall-item-info"> + <div class="contact-photo-wrapper" + <a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id"> + <img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" /> + </a> + </div> + </div> + <div class="wall-item-content"> + $mail.body + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"> + </div> + <div class="wall-item-tags"> + </div> + </div> + <div class="wall-item-bottom"> + <div class=""> + </div> + <div class="wall-item-actions"> + <div class="wall-item-actions-author"> + <a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span> + </div> + + <div class="wall-item-actions-social"> + </div> + + <div class="wall-item-actions-tools"> + <a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a> + </div> + + </div> + </div> + <div class="wall-item-bottom"> + </div> +</div> + + +{# + + +<div class="mail-conv-outside-wrapper"> + <div class="mail-conv-sender" > + <a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a> + </div> + <div class="mail-conv-detail" > + <div class="mail-conv-sender-name" >$mail.from_name</div> + <div class="mail-conv-date">$mail.date</div> + <div class="mail-conv-subject">$mail.subject</div> + <div class="mail-conv-body">$mail.body</div> + <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div> + <div class="mail-conv-outside-wrapper-end"></div> +</div> +</div> +<hr class="mail-conv-break" /> + +#} diff --git a/view/theme/diabook-blue/mail_display.tpl b/view/theme/diabook-blue/mail_display.tpl new file mode 100644 index 000000000..8b82e95c6 --- /dev/null +++ b/view/theme/diabook-blue/mail_display.tpl @@ -0,0 +1,12 @@ +<div id="mail-display-subject"> + <span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span> + <a href="message/dropconv/$thread_id" onclick="return confirmDelete();" title="$delete" class="mail-delete icon s22 delete"></a> +</div> + +{{ for $mails as $mail }} + <div id="tread-wrapper-$mail.id" class="tread-wrapper"> + {{ inc mail_conv.tpl }}{{endinc}} + </div> +{{ endfor }} + +{{ inc prv_message.tpl }}{{ endinc }} diff --git a/view/theme/diabook-blue/mail_list.tpl b/view/theme/diabook-blue/mail_list.tpl new file mode 100644 index 000000000..6bc6c84f6 --- /dev/null +++ b/view/theme/diabook-blue/mail_list.tpl @@ -0,0 +1,8 @@ +<div class="mail-list-wrapper"> + <span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span> + <span class="mail-from">$from_name</span> + <span class="mail-date">$date</span> + <span class="mail-count">$count</span> + + <a href="message/dropconv/$id" onclick="return confirmDelete();" title="$delete" class="mail-delete icon s22 delete"></a> +</div> diff --git a/view/theme/diabook-blue/message_side.tpl b/view/theme/diabook-blue/message_side.tpl new file mode 100644 index 000000000..9f1587096 --- /dev/null +++ b/view/theme/diabook-blue/message_side.tpl @@ -0,0 +1,10 @@ +<div id="message-sidebar" class="widget"> + <div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div> + + <ul class="message-ul"> + {{ for $tabs as $t }} + <li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li> + {{ endfor }} + </ul> + +</div> diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl index 511fc73ac..20926656a 100755 --- a/view/theme/diabook-blue/photo_view.tpl +++ b/view/theme/diabook-blue/photo_view.tpl @@ -24,4 +24,5 @@ {{ endif }} {{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }} -{{ if $edit }}$edit{{ endif }}
\ No newline at end of file +{{ if $edit }}$edit{{ endif }} + diff --git a/view/theme/diabook-blue/profile_vcard.tpl b/view/theme/diabook-blue/profile_vcard.tpl index 918cfc97c..e28ec2909 100644 --- a/view/theme/diabook-blue/profile_vcard.tpl +++ b/view/theme/diabook-blue/profile_vcard.tpl @@ -21,9 +21,9 @@ </div> - {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} - <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> + <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> + {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} {{ if $location }} diff --git a/view/theme/diabook-blue/search_item.tpl b/view/theme/diabook-blue/search_item.tpl new file mode 100755 index 000000000..123834064 --- /dev/null +++ b/view/theme/diabook-blue/search_item.tpl @@ -0,0 +1,100 @@ +{{ if $item.indent }}{{ else }} +<div class="wall-item-decor"> + <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> +</div> +{{ endif }} +<div class="wall-item-container $item.indent"> + <div class="wall-item-item"> + <div class="wall-item-info"> + <div class="contact-photo-wrapper" + onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" + onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> + <a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id"> + <img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" /> + </a> + <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a> + <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id"> + $item.item_photo_menu + </ul> + + </div> + </div> + <div class="wall-item-actions-author"> + <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> + <span class="wall-item-ago">- + {{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }} + {{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }} + </span> + </div> + <div class="wall-item-content"> + {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }} + $item.body + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"> + </div> + <div class="wall-item-tags"> + {{ for $item.tags as $tag }} + <span class='tag'>$tag</span> + {{ endfor }} + </div> + </div> + <div class="wall-item-bottom"> + <div class=""> + + </div> + <div class="wall-item-actions"> + + <div class="wall-item-actions-social"> + + + {{ if $item.vote }} + <a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a> + <a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a> + {{ endif }} + + {{ if $item.vote.share }} + <a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a> + {{ endif }} + + + {{ if $item.star }} + <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"> + <img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a> + <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> + {{ endif }} + + {{ if $item.filer }} + <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a> + {{ endif }} + + {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }} + + + + </div> + + <div class="wall-item-actions-tools"> + + {{ if $item.drop.dropping }} + <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" /> + <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a> + {{ endif }} + {{ if $item.edpost }} + <a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a> + {{ endif }} + </div> + <div class="wall-item-location">$item.location </div> + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"></div> + <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div> + <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div> + </div> +</div> + +<div class="wall-item-comment-wrapper" > + $item.comment +</div> diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index 9737670ec..3542dc00c 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -1160,10 +1160,14 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; + } +.qcomment{ + max-width: 122px; } - #id_username { width: 173px; } @@ -1215,7 +1219,7 @@ right_aside { /* background: #F1F1F1; */ } right_aside a{color: #1872A2;} -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-photo { margin: 0px; } @@ -1409,13 +1413,12 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper textarea { height: 2.0em; - width: 93%; + width: 100%; font-size: 10px; color: #999999; border: 1px solid #DDD; padding: 0.3em; font-size: 14px; - margin-left: 20px; } .wall-item-comment-wrapper .comment-edit-text-full { font-size: 14px; @@ -1572,6 +1575,11 @@ transition: all 0.2s ease-in-out; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; @@ -2454,8 +2462,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css index b75ccffb0..0b27e4a77 100644 --- a/view/theme/diabook-blue/style-profile.css +++ b/view/theme/diabook-blue/style-profile.css @@ -1159,10 +1159,14 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; + } +.qcomment{ + max-width: 122px; } - #id_username { width: 173px; } @@ -1214,7 +1218,7 @@ right_aside { /* background: #F1F1F1; */ } right_aside a{color: #1872A2;} -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-photo { margin: 0px; } @@ -1566,6 +1570,11 @@ transition: all 0.2s ease-in-out; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; @@ -2035,6 +2044,7 @@ box-shadow: 2px 2px 5px 0px #000000; margin: 2px 5px 2px 5px; max-height: 85%; max-width: 85%; +border-radius: 10px; } .lframe { float: left; @@ -2448,8 +2458,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook-blue/style-settings.css b/view/theme/diabook-blue/style-settings.css index 197b53d30..2e7db1e1f 100644 --- a/view/theme/diabook-blue/style-settings.css +++ b/view/theme/diabook-blue/style-settings.css @@ -1156,8 +1156,10 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; } #id_username { diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index 21ba66ec7..8d3d854ba 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -551,6 +551,86 @@ header #banner #logo-text { position: absolute; top: 15%; } +/* messages */ +#message-new { + background: #055580; + border: 1px solid #333; + width: 150px; +} +#message-new a { + color: #ffffff; + text-align: center; + display: block; + font-weight: bold; + padding: 1em 0px; + text-decoration: none; +} +.mail-list-wrapper { + background-color: #f6f7f8; + margin-bottom: 5px; + width: 100%; + height: auto; + overflow: hidden; +} +.mail-list-wrapper span { + display: block; + float: left; + width: 20%; + overflow: hidden; +} +.mail-list-wrapper .mail-subject { + width: 30%; + padding: 4px 0px 0px 4px; +} +.mail-list-wrapper .mail-subject a { + display: block; +} +.mail-list-wrapper .mail-subject.unseen a { + font-weight: bold; +} +.mail-list-wrapper .mail-date { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-from { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-count { + padding: 4px 4px 0px 4px; + text-align: right; +} +.mail-list-wrapper .mail-delete { + float: right; +} +#mail-display-subject { + background-color: #f6f7f8; + color: #2d2d2d; + margin-bottom: 10px; + width: 100%; + height: auto; + overflow: hidden; +} +#mail-display-subject span { + float: left; + overflow: hidden; + padding: 4px 0px 0px 10px; +} +#mail-display-subject .mail-delete { + float: right; + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +#mail-display-subject:hover .mail-delete { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} /* nav */ nav { width: 80%; @@ -950,6 +1030,7 @@ aside { float: left; /* background: #F1F1F1; */ } +aside #page-sidebar{display: none;} aside .vcard .fn { font-size: 18px; font-weight: bold; @@ -1130,10 +1211,14 @@ section { } body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; + } +.qcomment{ + max-width: 122px; } - #id_username { width: 173px; } @@ -1495,6 +1580,11 @@ body .pageheader{ padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; @@ -1964,6 +2054,7 @@ box-shadow: 2px 2px 5px 0px #000000; margin: 2px 5px 2px 5px; max-height: 85%; max-width: 85%; +border-radius: 10px; } .lframe { float: left; @@ -2368,8 +2459,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index fb6b44a16..19468779e 100755 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -3,7 +3,7 @@ /* * Name: Diabook-blue * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: + * Version: (Version: 1.011) * Author: */ @@ -139,7 +139,8 @@ function diabook_blue_community_info(){ //nav FIND FRIENDS if(local_user()) { $nv = array(); - $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", ""); + $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); @@ -163,7 +164,8 @@ function diabook_blue_community_info(){ $pagelist = array(); $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` - WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d", + WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d + ORDER BY `name` ASC", intval($a->user['uid']) ); @@ -310,61 +312,63 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" //load jquery.cookie.js $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" />', $cookieJS); +$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS); //js scripts -$a->page['htmlhead'] .= <<< EOT +$a->page['htmlhead'] .= ' <script> $(function() { - $('a.lightbox').fancybox(); // Select all links with lightbox class - + $("a.lightbox").fancybox(); // Select all links with lightbox class }); + + </script>'; -</script> +if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ +$a->page['htmlhead'] .= ' <script> $("right_aside").ready(function(){ - if($.cookie('close_pages') == '1') + if($.cookie("close_pages") == "1") { document.getElementById( "close_pages" ).style.display = "none"; }; - if($.cookie('close_helpers') == '1') + if($.cookie("close_helpers") == "1") { document.getElementById( "close_helpers" ).style.display = "none"; }; - if($.cookie('close_services') == '1') + if($.cookie("close_services") == "1") { document.getElementById( "close_services" ).style.display = "none"; }; - if($.cookie('close_friends') == '1') + if($.cookie("close_friends") == "1") { document.getElementById( "close_friends" ).style.display = "none"; }; - if($.cookie('close_postit') == '1') + if($.cookie("close_postit") == "1") { document.getElementById( "close_postit" ).style.display = "none"; }; - if($.cookie('close_lastusers') == '1') + if($.cookie("close_lastusers") == "1") { document.getElementById( "close_lastusers" ).style.display = "none"; }; - if($.cookie('close_lastphotos') == '1') + if($.cookie("close_lastphotos") == "1") { document.getElementById( "close_lastphotos" ).style.display = "none"; }; - if($.cookie('close_lastlikes') == '1') + if($.cookie("close_lastlikes") == "1") { document.getElementById( "close_lastlikes" ).style.display = "none"; };} @@ -373,57 +377,55 @@ $("right_aside").ready(function(){ function close_pages(){ document.getElementById( "close_pages" ).style.display = "none"; - $.cookie('close_pages','1', { expires: 365, path: '/' }); + $.cookie("close_pages","1", { expires: 365, path: "/" }); }; function close_helpers(){ document.getElementById( "close_helpers" ).style.display = "none"; - $.cookie('close_helpers','1', { expires: 365, path: '/' }); + $.cookie("close_helpers","1", { expires: 365, path: "/" }); }; function close_services(){ document.getElementById( "close_services" ).style.display = "none"; - $.cookie('close_services','1', { expires: 365, path: '/' }); + $.cookie("close_services","1", { expires: 365, path: "/" }); }; function close_friends(){ document.getElementById( "close_friends" ).style.display = "none"; - $.cookie('close_friends','1', { expires: 365, path: '/' }); + $.cookie("close_friends","1", { expires: 365, path: "/" }); }; function close_postit(){ document.getElementById( "close_postit" ).style.display = "none"; - $.cookie('close_postit','1', { expires: 365, path: '/' }); + $.cookie("close_postit","1", { expires: 365, path: "/" }); }; function close_lastusers(){ document.getElementById( "close_lastusers" ).style.display = "none"; - $.cookie('close_lastusers','1', { expires: 365, path: '/' }); + $.cookie("close_lastusers","1", { expires: 365, path: "/" }); }; function close_lastphotos(){ document.getElementById( "close_lastphotos" ).style.display = "none"; - $.cookie('close_lastphotos','1', { expires: 365, path: '/' }); + $.cookie("close_lastphotos","1", { expires: 365, path: "/" }); }; function close_lastlikes(){ document.getElementById( "close_lastlikes" ).style.display = "none"; - $.cookie('close_lastlikes','1', { expires: 365, path: '/' }); + $.cookie("close_lastlikes","1", { expires: 365, path: "/" }); }; - -function restore_boxes(){ - $.cookie('close_pages','2', { expires: 365, path: '/' }); - $.cookie('close_helpers','2', { expires: 365, path: '/' }); - $.cookie('close_services','2', { expires: 365, path: '/' }); - $.cookie('close_friends','2', { expires: 365, path: '/' }); - $.cookie('close_postit','2', { expires: 365, path: '/' }); - $.cookie('close_lastusers','2', { expires: 365, path: '/' }); - $.cookie('close_lastphotos','2', { expires: 365, path: '/' }); - $.cookie('close_lastlikes','2', { expires: 365, path: '/' }); - alert('Right-hand column was restored. Please refresh your browser'); - }; -</script> - -EOT; + +function restore_boxes(){ + $.cookie("close_pages","2", { expires: 365, path: "/" }); + $.cookie("close_helpers","2", { expires: 365, path: "/" }); + $.cookie("close_services","2", { expires: 365, path: "/" }); + $.cookie("close_friends","2", { expires: 365, path: "/" }); + $.cookie("close_postit","2", { expires: 365, path: "/" }); + $.cookie("close_lastusers","2", { expires: 365, path: "/" }); + $.cookie("close_lastphotos","2", { expires: 365, path: "/" }); + $.cookie("close_lastlikes","2", { expires: 365, path: "/" }); + alert("Right-hand column was restored. Please refresh your browser"); + }; +</script>';} diff --git a/view/theme/diabook-blue/wallwall_item.tpl b/view/theme/diabook-blue/wallwall_item.tpl index c5b6b36b5..bee75ad99 100644 --- a/view/theme/diabook-blue/wallwall_item.tpl +++ b/view/theme/diabook-blue/wallwall_item.tpl @@ -71,6 +71,10 @@ <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> {{ endif }} + {{ if $item.filer }} + <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a> + {{ endif }} + {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }} diff --git a/view/theme/diabook-red/communityhome.tpl b/view/theme/diabook-red/communityhome.tpl index 326c766b2..91935a9d3 100755 --- a/view/theme/diabook-red/communityhome.tpl +++ b/view/theme/diabook-red/communityhome.tpl @@ -34,6 +34,7 @@ {{ if $nv }} <h3>Find Friends<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></h3> <a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br> +<a class="$nv.global_directory.2" href="$nv.global_directory.0" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br> <a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br> <a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br> <a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a> diff --git a/view/theme/diabook-red/fpostit/fpostit.php b/view/theme/diabook-red/fpostit/fpostit.php index 65c43a2b9..4505c9946 100644 --- a/view/theme/diabook-red/fpostit/fpostit.php +++ b/view/theme/diabook-red/fpostit/fpostit.php @@ -113,12 +113,12 @@ function showForm($error, $content) { echo <<<EOF <div class='wrap1'> <h2><img class='logo' src='friendika-32.png' align='middle';/> - Friendika Bookmarklet</h2> + Friendica Bookmarklet</h2> </div> <div class="wrap2"> <form method="post" action="{$_SERVER['PHP_SELF']}"> - Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)<br /><br /> + Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br /> Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br /> Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br /> <textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br /> diff --git a/view/theme/diabook-red/jot.tpl b/view/theme/diabook-red/jot.tpl index 9aef99787..bd43994b5 100755 --- a/view/theme/diabook-red/jot.tpl +++ b/view/theme/diabook-red/jot.tpl @@ -2,7 +2,6 @@ <div id="profile-jot-wrapper" > <div id="profile-jot-banner-wrapper"> <div id="profile-jot-desc" > </div> - <div id="character-counter" class="grey"></div> </div> <div id="profile-jot-banner-end"></div> @@ -15,6 +14,7 @@ <input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"> + <div id="character-counter" class="grey"></div> <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea> diff --git a/view/theme/diabook-red/mail_conv.tpl b/view/theme/diabook-red/mail_conv.tpl new file mode 100755 index 000000000..989f17878 --- /dev/null +++ b/view/theme/diabook-red/mail_conv.tpl @@ -0,0 +1,60 @@ +<div class="wall-item-container $item.indent"> + <div class="wall-item-item"> + <div class="wall-item-info"> + <div class="contact-photo-wrapper" + <a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id"> + <img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" /> + </a> + </div> + </div> + <div class="wall-item-content"> + $mail.body + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"> + </div> + <div class="wall-item-tags"> + </div> + </div> + <div class="wall-item-bottom"> + <div class=""> + </div> + <div class="wall-item-actions"> + <div class="wall-item-actions-author"> + <a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span> + </div> + + <div class="wall-item-actions-social"> + </div> + + <div class="wall-item-actions-tools"> + <a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a> + </div> + + </div> + </div> + <div class="wall-item-bottom"> + </div> +</div> + + +{# + + +<div class="mail-conv-outside-wrapper"> + <div class="mail-conv-sender" > + <a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a> + </div> + <div class="mail-conv-detail" > + <div class="mail-conv-sender-name" >$mail.from_name</div> + <div class="mail-conv-date">$mail.date</div> + <div class="mail-conv-subject">$mail.subject</div> + <div class="mail-conv-body">$mail.body</div> + <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div> + <div class="mail-conv-outside-wrapper-end"></div> +</div> +</div> +<hr class="mail-conv-break" /> + +#} diff --git a/view/theme/diabook-red/mail_display.tpl b/view/theme/diabook-red/mail_display.tpl new file mode 100644 index 000000000..8b82e95c6 --- /dev/null +++ b/view/theme/diabook-red/mail_display.tpl @@ -0,0 +1,12 @@ +<div id="mail-display-subject"> + <span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span> + <a href="message/dropconv/$thread_id" onclick="return confirmDelete();" title="$delete" class="mail-delete icon s22 delete"></a> +</div> + +{{ for $mails as $mail }} + <div id="tread-wrapper-$mail.id" class="tread-wrapper"> + {{ inc mail_conv.tpl }}{{endinc}} + </div> +{{ endfor }} + +{{ inc prv_message.tpl }}{{ endinc }} diff --git a/view/theme/diabook-red/mail_list.tpl b/view/theme/diabook-red/mail_list.tpl new file mode 100644 index 000000000..6bc6c84f6 --- /dev/null +++ b/view/theme/diabook-red/mail_list.tpl @@ -0,0 +1,8 @@ +<div class="mail-list-wrapper"> + <span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span> + <span class="mail-from">$from_name</span> + <span class="mail-date">$date</span> + <span class="mail-count">$count</span> + + <a href="message/dropconv/$id" onclick="return confirmDelete();" title="$delete" class="mail-delete icon s22 delete"></a> +</div> diff --git a/view/theme/diabook-red/message_side.tpl b/view/theme/diabook-red/message_side.tpl new file mode 100644 index 000000000..9f1587096 --- /dev/null +++ b/view/theme/diabook-red/message_side.tpl @@ -0,0 +1,10 @@ +<div id="message-sidebar" class="widget"> + <div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div> + + <ul class="message-ul"> + {{ for $tabs as $t }} + <li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li> + {{ endfor }} + </ul> + +</div> diff --git a/view/theme/diabook-red/profile_vcard.tpl b/view/theme/diabook-red/profile_vcard.tpl index 918cfc97c..e28ec2909 100644 --- a/view/theme/diabook-red/profile_vcard.tpl +++ b/view/theme/diabook-red/profile_vcard.tpl @@ -21,9 +21,9 @@ </div> - {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} - <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> + <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> + {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} {{ if $location }} diff --git a/view/theme/diabook-red/search_item.tpl b/view/theme/diabook-red/search_item.tpl new file mode 100755 index 000000000..123834064 --- /dev/null +++ b/view/theme/diabook-red/search_item.tpl @@ -0,0 +1,100 @@ +{{ if $item.indent }}{{ else }} +<div class="wall-item-decor"> + <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> +</div> +{{ endif }} +<div class="wall-item-container $item.indent"> + <div class="wall-item-item"> + <div class="wall-item-info"> + <div class="contact-photo-wrapper" + onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" + onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> + <a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id"> + <img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" /> + </a> + <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a> + <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id"> + $item.item_photo_menu + </ul> + + </div> + </div> + <div class="wall-item-actions-author"> + <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> + <span class="wall-item-ago">- + {{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }} + {{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }} + </span> + </div> + <div class="wall-item-content"> + {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }} + $item.body + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"> + </div> + <div class="wall-item-tags"> + {{ for $item.tags as $tag }} + <span class='tag'>$tag</span> + {{ endfor }} + </div> + </div> + <div class="wall-item-bottom"> + <div class=""> + + </div> + <div class="wall-item-actions"> + + <div class="wall-item-actions-social"> + + + {{ if $item.vote }} + <a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a> + <a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a> + {{ endif }} + + {{ if $item.vote.share }} + <a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a> + {{ endif }} + + + {{ if $item.star }} + <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"> + <img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a> + <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> + {{ endif }} + + {{ if $item.filer }} + <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a> + {{ endif }} + + {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }} + + + + </div> + + <div class="wall-item-actions-tools"> + + {{ if $item.drop.dropping }} + <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" /> + <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a> + {{ endif }} + {{ if $item.edpost }} + <a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a> + {{ endif }} + </div> + <div class="wall-item-location">$item.location </div> + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"></div> + <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div> + <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div> + </div> +</div> + +<div class="wall-item-comment-wrapper" > + $item.comment +</div> diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index 1e10f1216..bbd4ceeee 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -1198,10 +1198,14 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; + } +.qcomment{ + max-width: 122px; } - #id_username { width: 173px; } @@ -1253,7 +1257,7 @@ right_aside { /* background: #F1F1F1; */ } right_aside a{color: red;} -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-photo { margin: 0px; } @@ -1447,13 +1451,12 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper textarea { height: 2.0em; - width: 93%; + width: 100%; font-size: 10px; color: #999999; border: 1px solid #DDD; padding: 0.3em; font-size: 14px; - margin-left: 20px; } .wall-item-comment-wrapper .comment-edit-text-full { font-size: 14px; @@ -1610,6 +1613,11 @@ transition: all 0.2s ease-in-out; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; @@ -2119,7 +2127,7 @@ max-width: 85%; padding: 0px; width: 16px; height: 16px; - top: -20px; left:0px; + top: -16px; left:0px; overflow: hidden; text-indent: 40px; display: none; @@ -2498,8 +2506,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css index c6ba1e4be..74217acf3 100644 --- a/view/theme/diabook-red/style-profile.css +++ b/view/theme/diabook-red/style-profile.css @@ -1176,10 +1176,14 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; + } +.qcomment{ + max-width: 122px; } - #id_username { width: 173px; } @@ -1231,7 +1235,7 @@ right_aside { /* background: #F1F1F1; */ } right_aside a{color: red;} -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-photo { margin: 0px; } @@ -1583,6 +1587,11 @@ transition: all 0.2s ease-in-out; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; @@ -2057,6 +2066,7 @@ box-shadow: 2px 2px 5px 0px #000000; margin: 2px 5px 2px 5px; max-height: 85%; max-width: 85%; +border-radius: 10px; } .lframe { float: left; @@ -2091,7 +2101,7 @@ max-width: 85%; padding: 0px; width: 16px; height: 16px; - top: -20px; left:0px; + top: -16px; left:0px; overflow: hidden; text-indent: 40px; display: none; @@ -2470,8 +2480,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook-red/style-settings.css b/view/theme/diabook-red/style-settings.css index 9407c68f9..43bb3d037 100644 --- a/view/theme/diabook-red/style-settings.css +++ b/view/theme/diabook-red/style-settings.css @@ -1173,8 +1173,10 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; } #id_username { diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index 8d4031329..16c8fe6c5 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -566,6 +566,86 @@ header #banner #logo-text { top: 10%; margin-left: 3px; } +/* messages */ +#message-new { + background: ; + border: 1px solid #333; + width: 150px; +} +#message-new a { + color: #ffffff; + text-align: center; + display: block; + font-weight: bold; + padding: 1em 0px; + text-decoration: none; +} +.mail-list-wrapper { + background-color: #f6f7f8; + margin-bottom: 5px; + width: 100%; + height: auto; + overflow: hidden; +} +.mail-list-wrapper span { + display: block; + float: left; + width: 20%; + overflow: hidden; +} +.mail-list-wrapper .mail-subject { + width: 30%; + padding: 4px 0px 0px 4px; +} +.mail-list-wrapper .mail-subject a { + display: block; +} +.mail-list-wrapper .mail-subject.unseen a { + font-weight: bold; +} +.mail-list-wrapper .mail-date { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-from { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-count { + padding: 4px 4px 0px 4px; + text-align: right; +} +.mail-list-wrapper .mail-delete { + float: right; +} +#mail-display-subject { + background-color: #f6f7f8; + color: #2d2d2d; + margin-bottom: 10px; + width: 100%; + height: auto; + overflow: hidden; +} +#mail-display-subject span { + float: left; + overflow: hidden; + padding: 4px 0px 0px 10px; +} +#mail-display-subject .mail-delete { + float: right; + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +#mail-display-subject:hover .mail-delete { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} /* nav */ nav { width: 80%; @@ -981,6 +1061,7 @@ aside { float: left; /* background: #F1F1F1; */ } +aside #page-sidebar{display: none;} aside .vcard .fn { font-size: 18px; font-weight: bold; @@ -1163,10 +1244,14 @@ section { } body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; + } +.qcomment{ + max-width: 122px; } - #id_username { width: 173px; } @@ -1216,108 +1301,7 @@ body .pageheader{ width: 775px; } .tread-wrapper a{ - color: #1872A2; -} -/*community-plugin*/ -aside #likes a, a:visited, a:link { - color: red; - text-decoration: none; - cursor: pointer; - -} -aside #likes a:hover{ - text-decoration: underline; - } -.wall-item-photo-menu-button { -display: block; -position: absolute; -background-image: url("../../../view/theme/diabook-red/icons/photo-menu.jpg"); -background-position: top left; -background-repeat: no-repeat; -margin: 0px; -padding: 0px; -width: 16px; -height: 16px; -top: 90px; -left: 17px; -overflow: hidden; -text-indent: 40px; -display: none; -} -.wall-item-name { - color: red; - } -.wall-item-conv a{ - color: black; - } -.wall-item-content-wrapper { -margin-top: 10px; -border: 1px solid #CCC; --moz-border-radius: 3px; -border-radius: 3px; -display: table; -width: 775px; -} -.wall-item-info { -/*display: block; -float: left; -width: 110px; -margin-right: 10px;*/ - display: table-cell; - vertical-align: top; - text-align: left; - width: 80px; -} -.wall-item-content { - font-size: 12.5px; - max-width: 720px; - word-wrap: break-word; - line-height: 1.2; -} -.wrapper-end { - clear: both; -} -.wall-item-photo-wrapper { -margin-top: 10px; -margin-left: 10px; -margin-bottom: 10px; -width: 100px; -} -.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none } -.wall-item-photo-menu li a { display: block; padding: 2px; } -.wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; } -.wall-item-wrapper { -margin-left: 10px; -} -.wall-item-title-end { - clear: both; -} - -.wall-item-body { - float: left; - /*width: 450px;*/ - margin-top: 10px; -} - -.wall-item-tools { - clear: both; - background-image: url("head.jpg"); - background-position: 0 -20px; - background-repeat: repeat-x; - padding: 5px 10px 0px; -} -.wall-item-author { - margin-top: 10px; -} -.wall-item-photo-menu { -width: auto; -border: 2px solid #444; -background: white; -position: absolute; -left: 10px; -top: 90px; -display: none; -z-index: 10000; + color: red; } .wall-item-decor { @@ -1629,6 +1613,11 @@ z-index: 10000; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; @@ -2102,6 +2091,7 @@ box-shadow: 2px 2px 5px 0px #000000; margin: 2px 5px 2px 5px; max-height: 85%; max-width: 85%; +border-radius: 10px; } .lframe { float: left; @@ -2136,7 +2126,7 @@ max-width: 85%; padding: 0px; width: 16px; height: 16px; - top: -20px; left:0px; + top: -16px; left:0px; overflow: hidden; text-indent: 40px; display: none; @@ -2506,8 +2496,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index 95af850a2..a6b2ea823 100755 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -3,7 +3,7 @@ /* * Name: Diabook-red * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: + * Version: (Version: 1.011) * Author: */ @@ -139,7 +139,8 @@ function diabook_red_community_info(){ //nav FIND FRIENDS if(local_user()) { $nv = array(); - $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", ""); + $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); @@ -163,7 +164,8 @@ function diabook_red_community_info(){ $pagelist = array(); $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` - WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d", + WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d + ORDER BY `name` ASC", intval($a->user['uid']) ); @@ -311,61 +313,63 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" //load jquery.cookie.js $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" />', $cookieJS); +$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS); //js scripts -$a->page['htmlhead'] .= <<< EOT +$a->page['htmlhead'] .= ' <script> $(function() { - $('a.lightbox').fancybox(); // Select all links with lightbox class - + $("a.lightbox").fancybox(); // Select all links with lightbox class }); + + </script>'; -</script> +if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ +$a->page['htmlhead'] .= ' <script> $("right_aside").ready(function(){ - if($.cookie('close_pages') == '1') + if($.cookie("close_pages") == "1") { document.getElementById( "close_pages" ).style.display = "none"; }; - if($.cookie('close_helpers') == '1') + if($.cookie("close_helpers") == "1") { document.getElementById( "close_helpers" ).style.display = "none"; }; - if($.cookie('close_services') == '1') + if($.cookie("close_services") == "1") { document.getElementById( "close_services" ).style.display = "none"; }; - if($.cookie('close_friends') == '1') + if($.cookie("close_friends") == "1") { document.getElementById( "close_friends" ).style.display = "none"; }; - if($.cookie('close_postit') == '1') + if($.cookie("close_postit") == "1") { document.getElementById( "close_postit" ).style.display = "none"; }; - if($.cookie('close_lastusers') == '1') + if($.cookie("close_lastusers") == "1") { document.getElementById( "close_lastusers" ).style.display = "none"; }; - if($.cookie('close_lastphotos') == '1') + if($.cookie("close_lastphotos") == "1") { document.getElementById( "close_lastphotos" ).style.display = "none"; }; - if($.cookie('close_lastlikes') == '1') + if($.cookie("close_lastlikes") == "1") { document.getElementById( "close_lastlikes" ).style.display = "none"; };} @@ -374,57 +378,55 @@ $("right_aside").ready(function(){ function close_pages(){ document.getElementById( "close_pages" ).style.display = "none"; - $.cookie('close_pages','1', { expires: 365, path: '/' }); + $.cookie("close_pages","1", { expires: 365, path: "/" }); }; function close_helpers(){ document.getElementById( "close_helpers" ).style.display = "none"; - $.cookie('close_helpers','1', { expires: 365, path: '/' }); + $.cookie("close_helpers","1", { expires: 365, path: "/" }); }; function close_services(){ document.getElementById( "close_services" ).style.display = "none"; - $.cookie('close_services','1', { expires: 365, path: '/' }); + $.cookie("close_services","1", { expires: 365, path: "/" }); }; function close_friends(){ document.getElementById( "close_friends" ).style.display = "none"; - $.cookie('close_friends','1', { expires: 365, path: '/' }); + $.cookie("close_friends","1", { expires: 365, path: "/" }); }; function close_postit(){ document.getElementById( "close_postit" ).style.display = "none"; - $.cookie('close_postit','1', { expires: 365, path: '/' }); + $.cookie("close_postit","1", { expires: 365, path: "/" }); }; function close_lastusers(){ document.getElementById( "close_lastusers" ).style.display = "none"; - $.cookie('close_lastusers','1', { expires: 365, path: '/' }); + $.cookie("close_lastusers","1", { expires: 365, path: "/" }); }; function close_lastphotos(){ document.getElementById( "close_lastphotos" ).style.display = "none"; - $.cookie('close_lastphotos','1', { expires: 365, path: '/' }); + $.cookie("close_lastphotos","1", { expires: 365, path: "/" }); }; function close_lastlikes(){ document.getElementById( "close_lastlikes" ).style.display = "none"; - $.cookie('close_lastlikes','1', { expires: 365, path: '/' }); + $.cookie("close_lastlikes","1", { expires: 365, path: "/" }); }; - -function restore_boxes(){ - $.cookie('close_pages','2', { expires: 365, path: '/' }); - $.cookie('close_helpers','2', { expires: 365, path: '/' }); - $.cookie('close_services','2', { expires: 365, path: '/' }); - $.cookie('close_friends','2', { expires: 365, path: '/' }); - $.cookie('close_postit','2', { expires: 365, path: '/' }); - $.cookie('close_lastusers','2', { expires: 365, path: '/' }); - $.cookie('close_lastphotos','2', { expires: 365, path: '/' }); - $.cookie('close_lastlikes','2', { expires: 365, path: '/' }); - alert('Right-hand column was restored. Please refresh your browser'); - }; -</script> - -EOT; + +function restore_boxes(){ + $.cookie("close_pages","2", { expires: 365, path: "/" }); + $.cookie("close_helpers","2", { expires: 365, path: "/" }); + $.cookie("close_services","2", { expires: 365, path: "/" }); + $.cookie("close_friends","2", { expires: 365, path: "/" }); + $.cookie("close_postit","2", { expires: 365, path: "/" }); + $.cookie("close_lastusers","2", { expires: 365, path: "/" }); + $.cookie("close_lastphotos","2", { expires: 365, path: "/" }); + $.cookie("close_lastlikes","2", { expires: 365, path: "/" }); + alert("Right-hand column was restored. Please refresh your browser"); + }; +</script>';} diff --git a/view/theme/diabook-red/wallwall_item.tpl b/view/theme/diabook-red/wallwall_item.tpl index c5b6b36b5..bee75ad99 100644 --- a/view/theme/diabook-red/wallwall_item.tpl +++ b/view/theme/diabook-red/wallwall_item.tpl @@ -71,6 +71,10 @@ <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> {{ endif }} + {{ if $item.filer }} + <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a> + {{ endif }} + {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }} diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index 91871a7b9..d344cad31 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -34,6 +34,7 @@ {{ if $nv }} <h3>Find Friends<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></h3> <a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br> +<a class="$nv.global_directory.2" href="$nv.global_directory.0" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br> <a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br> <a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br> <a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a> diff --git a/view/theme/diabook/fpostit/fpostit.php b/view/theme/diabook/fpostit/fpostit.php index 65c43a2b9..4505c9946 100644 --- a/view/theme/diabook/fpostit/fpostit.php +++ b/view/theme/diabook/fpostit/fpostit.php @@ -113,12 +113,12 @@ function showForm($error, $content) { echo <<<EOF <div class='wrap1'> <h2><img class='logo' src='friendika-32.png' align='middle';/> - Friendika Bookmarklet</h2> + Friendica Bookmarklet</h2> </div> <div class="wrap2"> <form method="post" action="{$_SERVER['PHP_SELF']}"> - Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)<br /><br /> + Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br /> Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br /> Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br /> <textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br /> diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl index 9aef99787..bd43994b5 100755 --- a/view/theme/diabook/jot.tpl +++ b/view/theme/diabook/jot.tpl @@ -2,7 +2,6 @@ <div id="profile-jot-wrapper" > <div id="profile-jot-banner-wrapper"> <div id="profile-jot-desc" > </div> - <div id="character-counter" class="grey"></div> </div> <div id="profile-jot-banner-end"></div> @@ -15,6 +14,7 @@ <input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"> + <div id="character-counter" class="grey"></div> <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea> diff --git a/view/theme/diabook/mail_conv.tpl b/view/theme/diabook/mail_conv.tpl new file mode 100755 index 000000000..989f17878 --- /dev/null +++ b/view/theme/diabook/mail_conv.tpl @@ -0,0 +1,60 @@ +<div class="wall-item-container $item.indent"> + <div class="wall-item-item"> + <div class="wall-item-info"> + <div class="contact-photo-wrapper" + <a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id"> + <img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" /> + </a> + </div> + </div> + <div class="wall-item-content"> + $mail.body + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"> + </div> + <div class="wall-item-tags"> + </div> + </div> + <div class="wall-item-bottom"> + <div class=""> + </div> + <div class="wall-item-actions"> + <div class="wall-item-actions-author"> + <a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span> + </div> + + <div class="wall-item-actions-social"> + </div> + + <div class="wall-item-actions-tools"> + <a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a> + </div> + + </div> + </div> + <div class="wall-item-bottom"> + </div> +</div> + + +{# + + +<div class="mail-conv-outside-wrapper"> + <div class="mail-conv-sender" > + <a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a> + </div> + <div class="mail-conv-detail" > + <div class="mail-conv-sender-name" >$mail.from_name</div> + <div class="mail-conv-date">$mail.date</div> + <div class="mail-conv-subject">$mail.subject</div> + <div class="mail-conv-body">$mail.body</div> + <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div> + <div class="mail-conv-outside-wrapper-end"></div> +</div> +</div> +<hr class="mail-conv-break" /> + +#} diff --git a/view/theme/diabook/mail_display.tpl b/view/theme/diabook/mail_display.tpl new file mode 100644 index 000000000..8b82e95c6 --- /dev/null +++ b/view/theme/diabook/mail_display.tpl @@ -0,0 +1,12 @@ +<div id="mail-display-subject"> + <span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span> + <a href="message/dropconv/$thread_id" onclick="return confirmDelete();" title="$delete" class="mail-delete icon s22 delete"></a> +</div> + +{{ for $mails as $mail }} + <div id="tread-wrapper-$mail.id" class="tread-wrapper"> + {{ inc mail_conv.tpl }}{{endinc}} + </div> +{{ endfor }} + +{{ inc prv_message.tpl }}{{ endinc }} diff --git a/view/theme/diabook/mail_list.tpl b/view/theme/diabook/mail_list.tpl new file mode 100644 index 000000000..6bc6c84f6 --- /dev/null +++ b/view/theme/diabook/mail_list.tpl @@ -0,0 +1,8 @@ +<div class="mail-list-wrapper"> + <span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span> + <span class="mail-from">$from_name</span> + <span class="mail-date">$date</span> + <span class="mail-count">$count</span> + + <a href="message/dropconv/$id" onclick="return confirmDelete();" title="$delete" class="mail-delete icon s22 delete"></a> +</div> diff --git a/view/theme/diabook/message_side.tpl b/view/theme/diabook/message_side.tpl new file mode 100644 index 000000000..9f1587096 --- /dev/null +++ b/view/theme/diabook/message_side.tpl @@ -0,0 +1,10 @@ +<div id="message-sidebar" class="widget"> + <div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div> + + <ul class="message-ul"> + {{ for $tabs as $t }} + <li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li> + {{ endfor }} + </ul> + +</div> diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl index 918cfc97c..e28ec2909 100644 --- a/view/theme/diabook/profile_vcard.tpl +++ b/view/theme/diabook/profile_vcard.tpl @@ -21,9 +21,9 @@ </div> - {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} - <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> + <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> + {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} {{ if $location }} diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl new file mode 100755 index 000000000..123834064 --- /dev/null +++ b/view/theme/diabook/search_item.tpl @@ -0,0 +1,100 @@ +{{ if $item.indent }}{{ else }} +<div class="wall-item-decor"> + <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> +</div> +{{ endif }} +<div class="wall-item-container $item.indent"> + <div class="wall-item-item"> + <div class="wall-item-info"> + <div class="contact-photo-wrapper" + onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" + onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> + <a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id"> + <img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" /> + </a> + <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a> + <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id"> + $item.item_photo_menu + </ul> + + </div> + </div> + <div class="wall-item-actions-author"> + <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> + <span class="wall-item-ago">- + {{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }} + {{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }} + </span> + </div> + <div class="wall-item-content"> + {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }} + $item.body + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"> + </div> + <div class="wall-item-tags"> + {{ for $item.tags as $tag }} + <span class='tag'>$tag</span> + {{ endfor }} + </div> + </div> + <div class="wall-item-bottom"> + <div class=""> + + </div> + <div class="wall-item-actions"> + + <div class="wall-item-actions-social"> + + + {{ if $item.vote }} + <a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a> + <a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a> + {{ endif }} + + {{ if $item.vote.share }} + <a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a> + {{ endif }} + + + {{ if $item.star }} + <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"> + <img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a> + <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> + {{ endif }} + + {{ if $item.filer }} + <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a> + {{ endif }} + + {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }} + + + + </div> + + <div class="wall-item-actions-tools"> + + {{ if $item.drop.dropping }} + <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" /> + <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a> + {{ endif }} + {{ if $item.edpost }} + <a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a> + {{ endif }} + </div> + <div class="wall-item-location">$item.location </div> + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"></div> + <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div> + <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div> + </div> +</div> + +<div class="wall-item-comment-wrapper" > + $item.comment +</div> diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index 282b37161..58d8fb0e8 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -1144,8 +1144,13 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; + } +.qcomment{ + max-width: 122px; } #id_username { @@ -1196,7 +1201,7 @@ right_aside { /* background: #F1F1F1; */ } -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-photo { margin: 0px; } @@ -1544,6 +1549,11 @@ transition: all 0.2s ease-in-out; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; @@ -2041,7 +2051,7 @@ ul.tabs li .active { padding: 0px; width: 16px; height: 16px; - top: -20px; left:0px; + top: -16px; left:0px; overflow: hidden; text-indent: 40px; display: none; @@ -2415,8 +2425,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index 5492c1884..9d462a458 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -1138,10 +1138,14 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; + } +.qcomment{ + max-width: 122px; } - #id_username { width: 173px; } @@ -1191,7 +1195,7 @@ right_aside { /* background: #F1F1F1; */ } -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-photo { margin: 0px; } @@ -1539,6 +1543,11 @@ transition: all 0.2s ease-in-out; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; @@ -2003,6 +2012,9 @@ ul.tabs li .active { float: left; } /* photo */ +.photo { +border-radius: 10px; + } .lframe { float: left; } @@ -2035,7 +2047,7 @@ ul.tabs li .active { padding: 0px; width: 16px; height: 16px; - top: -20px; left:0px; + top: -16px; left:0px; overflow: hidden; text-indent: 40px; display: none; @@ -2409,8 +2421,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook/style-settings.css b/view/theme/diabook/style-settings.css index 2a21795a7..8e7c2dd0b 100644 --- a/view/theme/diabook/style-settings.css +++ b/view/theme/diabook/style-settings.css @@ -1135,8 +1135,11 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + max-width: 575px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; } #id_username { diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index d96d9d989..1d8d05214 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -552,6 +552,86 @@ header #banner #logo-text { position: absolute; top: 15%; } +/* messages */ +#message-new { + background: #19aeff; + border: 1px solid #005c94; + width: 150px; +} +#message-new a { + color: #ffffff; + text-align: center; + display: block; + font-weight: bold; + padding: 1em 0px; + text-decoration: none; +} +.mail-list-wrapper { + background-color: #f6f7f8; + margin-bottom: 5px; + width: 100%; + height: auto; + overflow: hidden; +} +.mail-list-wrapper span { + display: block; + float: left; + width: 20%; + overflow: hidden; +} +.mail-list-wrapper .mail-subject { + width: 30%; + padding: 4px 0px 0px 4px; +} +.mail-list-wrapper .mail-subject a { + display: block; +} +.mail-list-wrapper .mail-subject.unseen a { + font-weight: bold; +} +.mail-list-wrapper .mail-date { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-from { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-count { + padding: 4px 4px 0px 4px; + text-align: right; +} +.mail-list-wrapper .mail-delete { + float: right; +} +#mail-display-subject { + background-color: #f6f7f8; + color: #2d2d2d; + margin-bottom: 10px; + width: 100%; + height: auto; + overflow: hidden; +} +#mail-display-subject span { + float: left; + overflow: hidden; + padding: 4px 0px 0px 10px; +} +#mail-display-subject .mail-delete { + float: right; + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +#mail-display-subject:hover .mail-delete { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} /* nav */ nav { width: 80%; @@ -942,7 +1022,7 @@ aside { float: left; /* background: #F1F1F1; */ } - +aside #page-sidebar{display: none;} aside .vcard .fn { font-size: 18px; font-weight: bold; @@ -1110,10 +1190,14 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; + } +.qcomment{ + max-width: 122px; } - #id_username { width: 173px; } @@ -1470,6 +1554,11 @@ body .pageheader{ padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; @@ -1934,6 +2023,9 @@ ul.tabs li .active { float: left; } /* photo */ +.photo { +border-radius: 10px; + } .lframe { float: left; } @@ -1966,7 +2058,7 @@ ul.tabs li .active { padding: 0px; width: 16px; height: 16px; - top: -20px; left:0px; + top: -16px; left:0px; overflow: hidden; text-indent: 40px; display: none; @@ -2340,8 +2432,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 88944322e..2fe985060 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -3,13 +3,11 @@ /* * Name: Diabook * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: + * Version: (Version: 1.011) * Author: */ -$a->theme_info = array( - 'extends' => 'duepuntozero', -); + //change css on network and profilepages $cssFile = null; @@ -145,7 +143,8 @@ function diabook_community_info(){ //right_aside FIND FRIENDS if(local_user()) { $nv = array(); - $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", ""); + $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); @@ -170,7 +169,8 @@ function diabook_community_info(){ $pagelist = array(); $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` - WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d", + WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d + ORDER BY `name` ASC", intval($a->user['uid']) ); @@ -265,7 +265,7 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ } } -//tabs at right_aside on settings page +//tabs at aside on settings page if ($a->argv[0] === "settings"){ $tabs = array( @@ -320,59 +320,62 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" //load jquery.cookie.js $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" />', $cookieJS); +$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS); //js scripts -$a->page['htmlhead'] .= <<< EOT +$a->page['htmlhead'] .= ' <script> $(function() { - $('a.lightbox').fancybox(); // Select all links with lightbox class + $("a.lightbox").fancybox(); // Select all links with lightbox class }); - </script> + </script>'; + +if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ +$a->page['htmlhead'] .= ' <script> $("right_aside").ready(function(){ - if($.cookie('close_pages') == '1') + if($.cookie("close_pages") == "1") { document.getElementById( "close_pages" ).style.display = "none"; }; - if($.cookie('close_helpers') == '1') + if($.cookie("close_helpers") == "1") { document.getElementById( "close_helpers" ).style.display = "none"; }; - if($.cookie('close_services') == '1') + if($.cookie("close_services") == "1") { document.getElementById( "close_services" ).style.display = "none"; }; - if($.cookie('close_friends') == '1') + if($.cookie("close_friends") == "1") { document.getElementById( "close_friends" ).style.display = "none"; }; - if($.cookie('close_postit') == '1') + if($.cookie("close_postit") == "1") { document.getElementById( "close_postit" ).style.display = "none"; }; - if($.cookie('close_lastusers') == '1') + if($.cookie("close_lastusers") == "1") { document.getElementById( "close_lastusers" ).style.display = "none"; }; - if($.cookie('close_lastphotos') == '1') + if($.cookie("close_lastphotos") == "1") { document.getElementById( "close_lastphotos" ).style.display = "none"; }; - if($.cookie('close_lastlikes') == '1') + if($.cookie("close_lastlikes") == "1") { document.getElementById( "close_lastlikes" ).style.display = "none"; };} @@ -381,60 +384,55 @@ $("right_aside").ready(function(){ function close_pages(){ document.getElementById( "close_pages" ).style.display = "none"; - $.cookie('close_pages','1', { expires: 365, path: '/' }); + $.cookie("close_pages","1", { expires: 365, path: "/" }); }; function close_helpers(){ document.getElementById( "close_helpers" ).style.display = "none"; - $.cookie('close_helpers','1', { expires: 365, path: '/' }); + $.cookie("close_helpers","1", { expires: 365, path: "/" }); }; function close_services(){ document.getElementById( "close_services" ).style.display = "none"; - $.cookie('close_services','1', { expires: 365, path: '/' }); + $.cookie("close_services","1", { expires: 365, path: "/" }); }; function close_friends(){ document.getElementById( "close_friends" ).style.display = "none"; - $.cookie('close_friends','1', { expires: 365, path: '/' }); + $.cookie("close_friends","1", { expires: 365, path: "/" }); }; function close_postit(){ document.getElementById( "close_postit" ).style.display = "none"; - $.cookie('close_postit','1', { expires: 365, path: '/' }); + $.cookie("close_postit","1", { expires: 365, path: "/" }); }; function close_lastusers(){ document.getElementById( "close_lastusers" ).style.display = "none"; - $.cookie('close_lastusers','1', { expires: 365, path: '/' }); + $.cookie("close_lastusers","1", { expires: 365, path: "/" }); }; function close_lastphotos(){ document.getElementById( "close_lastphotos" ).style.display = "none"; - $.cookie('close_lastphotos','1', { expires: 365, path: '/' }); + $.cookie("close_lastphotos","1", { expires: 365, path: "/" }); }; function close_lastlikes(){ document.getElementById( "close_lastlikes" ).style.display = "none"; - $.cookie('close_lastlikes','1', { expires: 365, path: '/' }); + $.cookie("close_lastlikes","1", { expires: 365, path: "/" }); }; function restore_boxes(){ - $.cookie('close_pages','2', { expires: 365, path: '/' }); - $.cookie('close_helpers','2', { expires: 365, path: '/' }); - $.cookie('close_services','2', { expires: 365, path: '/' }); - $.cookie('close_friends','2', { expires: 365, path: '/' }); - $.cookie('close_postit','2', { expires: 365, path: '/' }); - $.cookie('close_lastusers','2', { expires: 365, path: '/' }); - $.cookie('close_lastphotos','2', { expires: 365, path: '/' }); - $.cookie('close_lastlikes','2', { expires: 365, path: '/' }); - alert('Right-hand column was restored. Please refresh your browser'); + $.cookie("close_pages","2", { expires: 365, path: "/" }); + $.cookie("close_helpers","2", { expires: 365, path: "/" }); + $.cookie("close_services","2", { expires: 365, path: "/" }); + $.cookie("close_friends","2", { expires: 365, path: "/" }); + $.cookie("close_postit","2", { expires: 365, path: "/" }); + $.cookie("close_lastusers","2", { expires: 365, path: "/" }); + $.cookie("close_lastphotos","2", { expires: 365, path: "/" }); + $.cookie("close_lastlikes","2", { expires: 365, path: "/" }); + alert("Right-hand column was restored. Please refresh your browser"); }; - - -</script> - - -EOT; +</script>';}
\ No newline at end of file diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl index c5b6b36b5..bee75ad99 100644 --- a/view/theme/diabook/wallwall_item.tpl +++ b/view/theme/diabook/wallwall_item.tpl @@ -71,6 +71,10 @@ <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> {{ endif }} + {{ if $item.filer }} + <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a> + {{ endif }} + {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }} diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 1f897f3b0..38c1fc5bd 100755 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -285,7 +285,7 @@ div.wall-item-content-wrapper.shiny { float: left; } -#jot-title { +#jot-title, #jot-category { border: 0px; margin: 0px; height: 20px; @@ -296,11 +296,15 @@ div.wall-item-content-wrapper.shiny { } #jot-title::-webkit-input-placeholder{font-weight: normal;} +#jot-category::-webkit-input-placeholder{font-weight: normal;} #jot-title:-moz-placeholder{font-weight: normal;} +#jot-category:-moz-placeholder{font-weight: normal;} #jot-title:hover, -#jot-title:focus { +#jot-title:focus, +#jot-category:hover, +#jot-category:focus { border: 1px solid #cccccc; } @@ -322,7 +326,7 @@ div.wall-item-content-wrapper.shiny { margin-bottom: 10px; } -.group-selected, .nets-selected, .fileas-selected { +.group-selected, .nets-selected, .fileas-selected, .categories-selected { padding: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -1881,11 +1885,11 @@ a.mail-list-link { margin-top: 10px; } -.nets-ul, .fileas-ul { +.nets-ul, .fileas-ul, .categories-ul { list-style-type: none; } -.nets-ul li, .fileas-ul li { +.nets-ul li, .fileas-ul li, .categories-ul li { margin-top: 10px; } @@ -1896,11 +1900,11 @@ a.mail-list-link { margin-left: 42px; } -.fileas-link { +.fileas-link, .categories-link { margin-left: 24px; } -.fileas-all { +.fileas-all, .categories-all { margin-left: 0px; } @@ -2628,12 +2632,12 @@ aside input[type='text'] { margin-top: 10px; } -.body-tag, .filesavetags { +.body-tag, .filesavetags, .categorytags { opacity: 0.5; filter:alpha(opacity=50); } -.body-tag:hover, .filesavetags:hover { +.body-tag:hover, .filesavetags:hover, .categorytags:hover { opacity: 1.0 !important; filter:alpha(opacity=100) !important; } |