diff options
| -rw-r--r-- | include/Import/import_diaspora.php | 148 | ||||
| -rw-r--r-- | include/RedDAV/RedBrowser.php | 7 | ||||
| -rw-r--r-- | mod/import.php | 18 | ||||
| -rw-r--r-- | util/messages.po | 220 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 14 | ||||
| -rw-r--r-- | view/tpl/blocklist.tpl | 126 | ||||
| -rw-r--r-- | view/tpl/cloud.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/cloud_directory.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/conv_list.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/conversation.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/layoutlist.tpl | 130 | ||||
| -rw-r--r-- | view/tpl/menulist.tpl | 70 | ||||
| -rwxr-xr-x | view/tpl/photo_album.tpl | 44 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 17 | ||||
| -rwxr-xr-x | view/tpl/photos_recent.tpl | 28 | ||||
| -rwxr-xr-x | view/tpl/search_item.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/sharedwithme.tpl | 48 | ||||
| -rw-r--r-- | view/tpl/webpagelist.tpl | 140 |
20 files changed, 608 insertions, 418 deletions
diff --git a/include/Import/import_diaspora.php b/include/Import/import_diaspora.php new file mode 100644 index 000000000..f755c39e2 --- /dev/null +++ b/include/Import/import_diaspora.php @@ -0,0 +1,148 @@ +<?php + +require_once('include/bb2diaspora.php'); +require_once('include/group.php'); +require_once('include/follow.php'); +require_once('include/photo/photo_driver.php'); + +function import_diaspora($data) { + $a = get_app(); + + $account = $a->get_account(); + if(! $account) + return false; + + $address = escape_tags($data['user']['username']); + if(! $address) { + notice( t('No username found in import file.') . EOL); + return false; + } + + $r = q("select * from channel where channel_address = '%s' limit 1", + dbesc($address) + ); + if($r) { + // try at most ten times to generate a unique address. + $x = 0; + $found_unique = false; + do { + $tmp = $address . mt_rand(1000,9999); + $r = q("select * from channel where channel_address = '%s' limit 1", + dbesc($tmp) + ); + if(! $r) { + $address = $tmp; + $found_unique = true; + break; + } + $x ++; + } while ($x < 10); + if(! $found_unique) { + logger('import_diaspora: duplicate channel address. randomisation failed.'); + notice( t('Unable to create a unique channel address. Import failed.') . EOL); + return; + } + } + + + $c = create_identity(array( + 'name' => escape_tags($data['user']['name']), + 'nickname' => $address, + 'account_id' => $account['account_id'], + 'permissions_role' => 'social' + )); + + + if(! $c['success']) + return; + + $channel_id = $c['channel']['channel_id']; + + // todo - add auto follow settings, (and strip exif in hubzilla) + + $location = escape_tags($data['user']['profile']['location']); + if(! $location) + $location = ''; + + + q("update channel set channel_location = '%s' where channel_id = %d", + dbesc($location), + intval($channel_id) + ); + + if($data['user']['profile']['nsfw']) { + // fixme for hubzilla which doesn't use pageflags any more + q("update channel set channel_pageflags = (channel_pageflags | %d) where channel_id = %d", + intval(PAGE_ADULT), + intval($channel_id) + ); + } + + if($data['user']['profile']['image_url']) { + $p = z_fetch_url($data['user']['profile']['image_url'],true); + if($p['success']) { + $rawbytes = $p['body']; + $type = guess_image_type('dummyfile',$p['header']); + import_channel_photo($rawbytes,$type,$c['channel']['channel_account_id'],$channel_id); + } + } + + $gender = escape_tags($data['user']['profile']['gender']); + $about = diaspora2bb($data['user']['profile']['bio']); + $publish = intval($data['user']['profile']['searchable']); + if($data['user']['profile']['birthday']) + $dob = datetime_convert('UTC','UTC',$data['user']['profile']['birthday'],'Y-m-d'); + else + $dob = '0000-00-00'; + + // we're relying on the fact that this channel was just created and will only + // have the default profile currently + + $r = q("update profile set gender = '%s', about = '%s', dob = '%s', publish = %d where uid = %d", + dbesc($gender), + dbesc($about), + dbesc($dob), + dbesc($publish), + intval($channel_id) + ); + + if($data['aspects']) { + foreach($data['aspects'] as $aspect) { + group_add($channel_id,escape_tags($aspect['name']),intval($aspect['contacts_visible'])); + } + } + + // now add connections and send friend requests + + + if($data['contacts']) { + foreach($data['contacts'] as $contact) { + $result = new_contact($channel_id, $contact['person_diaspora_handle'], $c['channel']); + if($result['success']) { + if($contact['aspects']) { + foreach($contact['aspects'] as $aspect) { + group_add_member($channel_id,$aspect['name'],$result['abook']['xchan_hash']); + } + } + } + } + } + + + // Then add items - note this can't be done until Diaspora adds guids to exported + // items and comments + + + proc_run('php','include/notifier.php','location',$channel_id); + + // This will indirectly perform a refresh_all *and* update the directory + + proc_run('php', 'include/directory.php', $channel_id); + + notice( t('Import completed.') . EOL); + + change_channel($channel_id); + + goaway(z_root() . '/network' ); + +}
\ No newline at end of file diff --git a/include/RedDAV/RedBrowser.php b/include/RedDAV/RedBrowser.php index a0330d7cc..d74bba220 100644 --- a/include/RedDAV/RedBrowser.php +++ b/include/RedDAV/RedBrowser.php @@ -247,7 +247,7 @@ class RedBrowser extends DAV\Browser\Plugin { $this->server->broadcastEvent('onHTMLActionsPanel', array($parent, &$output)); } - $html .= replace_macros(get_markup_template('cloud_header.tpl'), array( + $html .= replace_macros(get_markup_template('cloud.tpl'), array( '$header' => t('Files') . ": " . $this->escapeHTML($path) . "/", '$quota' => $quota, '$total' => t('Total'), @@ -255,10 +255,7 @@ class RedBrowser extends DAV\Browser\Plugin { '$shared' => t('Shared'), '$create' => t('Create'), '$upload' => t('Upload'), - '$is_owner' => $is_owner - )); - - $html .= replace_macros(get_markup_template('cloud_directory.tpl'), array( + '$is_owner' => $is_owner, '$parentpath' => $parentpath, '$entries' => $f, '$name' => t('Name'), diff --git a/mod/import.php b/mod/import.php index 088c5cb61..02f4133d5 100644 --- a/mod/import.php +++ b/mod/import.php @@ -38,6 +38,15 @@ function import_post(&$a) { if($src) { + + // This is OS specific and could also fail if your tmpdir isn't very large + // mostly used for Diaspora which exports gzipped files. + + if(strpos($filename,'.gz')){ + @rename($src,$src . '.gz'); + @system('gunzip ' . escapeshellarg($src . '.gz')); + } + if($filesize) { $data = @file_get_contents($src); } @@ -84,6 +93,13 @@ function import_post(&$a) { $data = json_decode($data,true); + if(array_key_exists('user',$data) && array_key_exists('aspects',$data)) { + require_once('include/Import/import_diaspora.php'); + import_diaspora($data); + return; + } + + // logger('import: data: ' . print_r($data,true)); // print_r($data); @@ -308,7 +324,7 @@ function import_post(&$a) { dbesc($photos[2]), dbesc($photos[3]), dbesc($photodate), - dbesc($xchan_hash) + dbesc($xchan['xchan_hash']) ); } diff --git a/util/messages.po b/util/messages.po index ee32a9a8c..85b5108b2 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2015-06-12.1061\n" +"Project-Id-Version: 2015-06-19.1068\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-12 00:04-0700\n" +"POT-Creation-Date: 2015-06-19 00:04-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -24,7 +24,7 @@ msgstr "" #: ../../include/photo/photo_driver.php:687 ../../mod/profile_photo.php:143 #: ../../mod/profile_photo.php:302 ../../mod/profile_photo.php:424 -#: ../../mod/photos.php:91 ../../mod/photos.php:625 +#: ../../mod/photos.php:92 ../../mod/photos.php:637 msgid "Profile Photos" msgstr "" @@ -654,7 +654,7 @@ msgstr "" #: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677 #: ../../include/conversation.php:1155 ../../mod/webpages.php:188 -#: ../../mod/events.php:653 ../../mod/photos.php:970 +#: ../../mod/events.php:653 ../../mod/photos.php:982 #: ../../mod/editwebpage.php:214 ../../mod/editpost.php:150 #: ../../mod/editblock.php:176 msgid "Preview" @@ -727,19 +727,19 @@ msgstr "" msgid "This Website Only" msgstr "" -#: ../../include/event.php:19 ../../include/bb2diaspora.php:451 +#: ../../include/event.php:19 ../../include/bb2diaspora.php:459 msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/event.php:27 ../../include/bb2diaspora.php:457 +#: ../../include/event.php:27 ../../include/bb2diaspora.php:465 msgid "Starts:" msgstr "" -#: ../../include/event.php:37 ../../include/bb2diaspora.php:465 +#: ../../include/event.php:37 ../../include/bb2diaspora.php:473 msgid "Finishes:" msgstr "" -#: ../../include/event.php:47 ../../include/bb2diaspora.php:473 +#: ../../include/event.php:47 ../../include/bb2diaspora.php:481 #: ../../include/identity.php:879 ../../mod/events.php:647 #: ../../mod/directory.php:234 msgid "Location:" @@ -754,7 +754,7 @@ msgid "Delete this item?" msgstr "" #: ../../include/js_strings.php:6 ../../include/ItemObject.php:667 -#: ../../mod/photos.php:968 ../../mod/photos.php:1086 +#: ../../mod/photos.php:980 ../../mod/photos.php:1098 msgid "Comment" msgstr "" @@ -782,7 +782,7 @@ msgstr "" msgid "Passwords do not match" msgstr "" -#: ../../include/js_strings.php:13 ../../mod/photos.php:39 +#: ../../include/js_strings.php:13 ../../mod/photos.php:40 msgid "everybody" msgstr "" @@ -821,8 +821,8 @@ msgstr "" #: ../../include/js_strings.php:22 ../../include/ItemObject.php:668 #: ../../mod/xchan.php:11 ../../mod/connect.php:93 ../../mod/thing.php:275 #: ../../mod/thing.php:318 ../../mod/events.php:656 ../../mod/group.php:81 -#: ../../mod/photos.php:565 ../../mod/photos.php:642 ../../mod/photos.php:929 -#: ../../mod/photos.php:969 ../../mod/photos.php:1087 ../../mod/pdledit.php:58 +#: ../../mod/photos.php:577 ../../mod/photos.php:654 ../../mod/photos.php:941 +#: ../../mod/photos.php:981 ../../mod/photos.php:1099 ../../mod/pdledit.php:58 #: ../../mod/import.php:504 ../../mod/chat.php:177 ../../mod/chat.php:211 #: ../../mod/rate.php:167 ../../mod/invite.php:142 ../../mod/locs.php:105 #: ../../mod/sources.php:104 ../../mod/sources.php:138 @@ -949,7 +949,7 @@ msgstr "" #: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1019 #: ../../include/apps.php:336 ../../include/apps.php:387 -#: ../../mod/photos.php:681 ../../mod/photos.php:1119 +#: ../../mod/photos.php:693 ../../mod/photos.php:1131 msgid "Unknown" msgstr "" @@ -986,7 +986,7 @@ msgstr "" #: ../../include/RedDAV/RedBrowser.php:257 #: ../../include/RedDAV/RedBrowser.php:308 ../../mod/profile_photo.php:362 -#: ../../mod/photos.php:706 ../../mod/photos.php:1236 +#: ../../mod/photos.php:718 ../../mod/photos.php:1248 msgid "Upload" msgstr "" @@ -1011,7 +1011,7 @@ msgstr "" #: ../../include/RedDAV/RedBrowser.php:270 ../../include/ItemObject.php:120 #: ../../include/conversation.php:660 ../../include/apps.php:255 #: ../../mod/webpages.php:183 ../../mod/thing.php:228 ../../mod/group.php:176 -#: ../../mod/blocks.php:155 ../../mod/photos.php:1050 +#: ../../mod/blocks.php:155 ../../mod/photos.php:1062 #: ../../mod/editlayout.php:107 ../../mod/editwebpage.php:225 #: ../../mod/admin.php:826 ../../mod/admin.php:988 ../../mod/editblock.php:113 #: ../../mod/settings.php:651 ../../mod/connedit.php:543 @@ -1288,7 +1288,7 @@ msgid "Categories" msgstr "" #: ../../include/widgets.php:91 ../../include/nav.php:163 -#: ../../mod/apps.php:34 +#: ../../mod/apps.php:36 msgid "Apps" msgstr "" @@ -1820,14 +1820,14 @@ msgid "I abstain" msgstr "" #: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187 -#: ../../include/conversation.php:1677 ../../mod/photos.php:1003 -#: ../../mod/photos.php:1015 +#: ../../include/conversation.php:1677 ../../mod/photos.php:1015 +#: ../../mod/photos.php:1027 msgid "View all" msgstr "" #: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396 #: ../../include/conversation.php:1701 ../../include/identity.php:1138 -#: ../../mod/photos.php:1007 +#: ../../mod/photos.php:1019 msgctxt "noun" msgid "Like" msgid_plural "Likes" @@ -1835,7 +1835,7 @@ msgstr[0] "" msgstr[1] "" #: ../../include/ItemObject.php:184 ../../include/conversation.php:1704 -#: ../../mod/photos.php:1012 +#: ../../mod/photos.php:1024 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" @@ -1870,7 +1870,7 @@ msgstr "" msgid "Add Tag" msgstr "" -#: ../../include/ItemObject.php:254 ../../mod/photos.php:947 +#: ../../include/ItemObject.php:254 ../../mod/photos.php:959 msgid "I like this (toggle)" msgstr "" @@ -1878,7 +1878,7 @@ msgstr "" msgid "like" msgstr "" -#: ../../include/ItemObject.php:255 ../../mod/photos.php:948 +#: ../../include/ItemObject.php:255 ../../mod/photos.php:960 msgid "I don't like this (toggle)" msgstr "" @@ -1949,31 +1949,31 @@ msgstr "" msgid "Mark all seen" msgstr "" -#: ../../include/ItemObject.php:353 ../../mod/photos.php:1133 +#: ../../include/ItemObject.php:353 ../../mod/photos.php:1145 msgctxt "noun" msgid "Likes" msgstr "" -#: ../../include/ItemObject.php:354 ../../mod/photos.php:1134 +#: ../../include/ItemObject.php:354 ../../mod/photos.php:1146 msgctxt "noun" msgid "Dislikes" msgstr "" #: ../../include/ItemObject.php:359 ../../include/acl_selectors.php:249 -#: ../../mod/photos.php:1139 +#: ../../mod/photos.php:1151 msgid "Close" msgstr "" #: ../../include/ItemObject.php:364 ../../include/conversation.php:737 -#: ../../include/conversation.php:1209 ../../mod/photos.php:950 +#: ../../include/conversation.php:1209 ../../mod/photos.php:962 #: ../../mod/editlayout.php:153 ../../mod/editwebpage.php:192 #: ../../mod/editpost.php:130 ../../mod/editblock.php:155 #: ../../mod/mail.php:241 ../../mod/mail.php:356 msgid "Please wait" msgstr "" -#: ../../include/ItemObject.php:665 ../../mod/photos.php:966 -#: ../../mod/photos.php:1084 +#: ../../include/ItemObject.php:665 ../../mod/photos.php:978 +#: ../../mod/photos.php:1096 msgid "This is you" msgstr "" @@ -2041,7 +2041,7 @@ msgstr "" msgid "Attachments:" msgstr "" -#: ../../include/bb2diaspora.php:453 +#: ../../include/bb2diaspora.php:461 msgid "$Projectname event notification:" msgstr "" @@ -2525,42 +2525,42 @@ msgctxt "mood" msgid "%1$s is %2$s" msgstr "" -#: ../../include/conversation.php:572 ../../mod/photos.php:984 +#: ../../include/conversation.php:572 ../../mod/photos.php:996 msgctxt "title" msgid "Likes" msgstr "" -#: ../../include/conversation.php:572 ../../mod/photos.php:984 +#: ../../include/conversation.php:572 ../../mod/photos.php:996 msgctxt "title" msgid "Dislikes" msgstr "" -#: ../../include/conversation.php:573 ../../mod/photos.php:985 +#: ../../include/conversation.php:573 ../../mod/photos.php:997 msgctxt "title" msgid "Agree" msgstr "" -#: ../../include/conversation.php:573 ../../mod/photos.php:985 +#: ../../include/conversation.php:573 ../../mod/photos.php:997 msgctxt "title" msgid "Disagree" msgstr "" -#: ../../include/conversation.php:573 ../../mod/photos.php:985 +#: ../../include/conversation.php:573 ../../mod/photos.php:997 msgctxt "title" msgid "Abstain" msgstr "" -#: ../../include/conversation.php:574 ../../mod/photos.php:986 +#: ../../include/conversation.php:574 ../../mod/photos.php:998 msgctxt "title" msgid "Attending" msgstr "" -#: ../../include/conversation.php:574 ../../mod/photos.php:986 +#: ../../include/conversation.php:574 ../../mod/photos.php:998 msgctxt "title" msgid "Not attending" msgstr "" -#: ../../include/conversation.php:574 ../../mod/photos.php:986 +#: ../../include/conversation.php:574 ../../mod/photos.php:998 msgctxt "title" msgid "Might attend" msgstr "" @@ -2702,7 +2702,7 @@ msgid "Expires YYYY-MM-DD HH:MM" msgstr "" #: ../../include/conversation.php:1174 ../../mod/webpages.php:182 -#: ../../mod/blocks.php:154 ../../mod/photos.php:949 ../../mod/layouts.php:184 +#: ../../mod/blocks.php:154 ../../mod/photos.php:961 ../../mod/layouts.php:184 msgid "Share" msgstr "" @@ -3016,12 +3016,12 @@ msgstr "" msgid "Item not found." msgstr "" -#: ../../include/items.php:4148 ../../include/photos.php:26 -#: ../../include/attach.php:137 ../../include/attach.php:184 -#: ../../include/attach.php:247 ../../include/attach.php:261 -#: ../../include/attach.php:305 ../../include/attach.php:319 -#: ../../include/attach.php:350 ../../include/attach.php:546 -#: ../../include/attach.php:618 ../../include/chat.php:131 +#: ../../include/items.php:4148 ../../include/attach.php:137 +#: ../../include/attach.php:184 ../../include/attach.php:247 +#: ../../include/attach.php:261 ../../include/attach.php:305 +#: ../../include/attach.php:319 ../../include/attach.php:350 +#: ../../include/attach.php:546 ../../include/attach.php:618 +#: ../../include/chat.php:131 ../../include/photos.php:26 #: ../../mod/profile.php:64 ../../mod/profile.php:72 #: ../../mod/achievements.php:30 ../../mod/manage.php:6 ../../mod/item.php:206 #: ../../mod/item.php:214 ../../mod/item.php:978 ../../mod/api.php:26 @@ -3031,7 +3031,7 @@ msgstr "" #: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178 #: ../../mod/events.php:219 ../../mod/group.php:9 ../../mod/network.php:12 #: ../../mod/common.php:35 ../../mod/connections.php:169 -#: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/photos.php:68 +#: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/photos.php:69 #: ../../mod/pdledit.php:21 ../../mod/authtest.php:13 #: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87 #: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/editwebpage.php:64 @@ -3082,27 +3082,6 @@ msgstr "" msgid "Connection not found." msgstr "" -#: ../../include/photos.php:94 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" -msgstr "" - -#: ../../include/photos.php:101 -msgid "Image file is empty." -msgstr "" - -#: ../../include/photos.php:128 ../../mod/profile_photo.php:217 -msgid "Unable to process image" -msgstr "" - -#: ../../include/photos.php:199 -msgid "Photo storage failed." -msgstr "" - -#: ../../include/photos.php:363 -msgid "Upload New Photos" -msgstr "" - #: ../../include/zot.php:666 msgid "Invalid data packet" msgstr "" @@ -3209,7 +3188,7 @@ msgid "Don't show" msgstr "" #: ../../include/acl_selectors.php:248 ../../mod/events.php:654 -#: ../../mod/photos.php:559 ../../mod/photos.php:922 ../../mod/chat.php:209 +#: ../../mod/photos.php:571 ../../mod/photos.php:934 ../../mod/chat.php:209 #: ../../mod/filestorage.php:147 msgid "Permissions" msgstr "" @@ -3885,6 +3864,27 @@ msgstr "" msgid "Room is full" msgstr "" +#: ../../include/photos.php:94 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" +msgstr "" + +#: ../../include/photos.php:101 +msgid "Image file is empty." +msgstr "" + +#: ../../include/photos.php:128 ../../mod/profile_photo.php:217 +msgid "Unable to process image" +msgstr "" + +#: ../../include/photos.php:199 +msgid "Photo storage failed." +msgstr "" + +#: ../../include/photos.php:363 +msgid "Upload New Photos" +msgstr "" + #: ../../mod/achievements.php:34 msgid "Some blurb about what to do when you're new here" msgstr "" @@ -3988,7 +3988,7 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: ../../mod/api.php:105 ../../mod/photos.php:556 ../../mod/menu.php:91 +#: ../../mod/api.php:105 ../../mod/photos.php:568 ../../mod/menu.php:91 #: ../../mod/menu.php:145 ../../mod/filestorage.php:151 #: ../../mod/filestorage.php:159 ../../mod/admin.php:430 #: ../../mod/settings.php:579 ../../mod/mitem.php:163 ../../mod/mitem.php:164 @@ -3998,7 +3998,7 @@ msgstr "" msgid "Yes" msgstr "" -#: ../../mod/api.php:106 ../../mod/photos.php:556 ../../mod/menu.php:91 +#: ../../mod/api.php:106 ../../mod/photos.php:568 ../../mod/menu.php:91 #: ../../mod/menu.php:145 ../../mod/filestorage.php:151 #: ../../mod/filestorage.php:159 ../../mod/admin.php:428 #: ../../mod/settings.php:579 ../../mod/mitem.php:163 ../../mod/mitem.php:164 @@ -4028,7 +4028,7 @@ msgstr "" msgid "Select a tag to remove: " msgstr "" -#: ../../mod/tagrm.php:133 ../../mod/photos.php:875 +#: ../../mod/tagrm.php:133 ../../mod/photos.php:887 msgid "Remove" msgstr "" @@ -4330,11 +4330,11 @@ msgstr "" msgid "Create New Event" msgstr "" -#: ../../mod/events.php:474 ../../mod/photos.php:827 +#: ../../mod/events.php:474 ../../mod/photos.php:839 msgid "Previous" msgstr "" -#: ../../mod/events.php:475 ../../mod/photos.php:836 ../../mod/setup.php:281 +#: ../../mod/events.php:475 ../../mod/photos.php:848 ../../mod/setup.php:281 msgid "Next" msgstr "" @@ -4547,6 +4547,10 @@ msgstr "" msgid "Bug reports and issues: please visit" msgstr "" +#: ../../mod/siteinfo.php:167 +msgid "$projectname issues" +msgstr "" + #: ../../mod/siteinfo.php:168 msgid "" "Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com" @@ -4718,148 +4722,148 @@ msgstr "" msgid "$Projectname - Guests: Username: {your email address}, Password: +++" msgstr "" -#: ../../mod/photos.php:77 +#: ../../mod/photos.php:78 msgid "Page owner information could not be retrieved." msgstr "" -#: ../../mod/photos.php:97 +#: ../../mod/photos.php:98 msgid "Album not found." msgstr "" -#: ../../mod/photos.php:119 ../../mod/photos.php:643 +#: ../../mod/photos.php:120 ../../mod/photos.php:655 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:159 ../../mod/photos.php:930 +#: ../../mod/photos.php:160 ../../mod/photos.php:942 msgid "Delete Photo" msgstr "" -#: ../../mod/photos.php:429 ../../mod/search.php:13 ../../mod/display.php:13 +#: ../../mod/photos.php:441 ../../mod/search.php:13 ../../mod/display.php:13 #: ../../mod/ratings.php:82 ../../mod/directory.php:47 #: ../../mod/viewconnections.php:17 msgid "Public access denied." msgstr "" -#: ../../mod/photos.php:440 +#: ../../mod/photos.php:452 msgid "No photos selected" msgstr "" -#: ../../mod/photos.php:484 +#: ../../mod/photos.php:496 msgid "Access to this item is restricted." msgstr "" -#: ../../mod/photos.php:523 +#: ../../mod/photos.php:535 #, php-format msgid "%1$.2f MB of %2$.2f MB photo storage used." msgstr "" -#: ../../mod/photos.php:526 +#: ../../mod/photos.php:538 #, php-format msgid "%1$.2f MB photo storage used." msgstr "" -#: ../../mod/photos.php:550 +#: ../../mod/photos.php:562 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:554 ../../mod/photos.php:636 ../../mod/photos.php:915 +#: ../../mod/photos.php:566 ../../mod/photos.php:648 ../../mod/photos.php:927 msgid "Enter a new album name" msgstr "" -#: ../../mod/photos.php:555 ../../mod/photos.php:637 ../../mod/photos.php:916 +#: ../../mod/photos.php:567 ../../mod/photos.php:649 ../../mod/photos.php:928 msgid "or select an existing one (doubleclick)" msgstr "" -#: ../../mod/photos.php:556 +#: ../../mod/photos.php:568 msgid "Create a status post for this upload" msgstr "" -#: ../../mod/photos.php:584 +#: ../../mod/photos.php:596 msgid "Album name could not be decoded" msgstr "" -#: ../../mod/photos.php:625 ../../mod/photos.php:1157 -#: ../../mod/photos.php:1173 +#: ../../mod/photos.php:637 ../../mod/photos.php:1169 +#: ../../mod/photos.php:1185 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:649 +#: ../../mod/photos.php:661 msgid "Show Newest First" msgstr "" -#: ../../mod/photos.php:651 +#: ../../mod/photos.php:663 msgid "Show Oldest First" msgstr "" -#: ../../mod/photos.php:675 ../../mod/photos.php:1205 +#: ../../mod/photos.php:687 ../../mod/photos.php:1217 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:704 +#: ../../mod/photos.php:716 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:749 +#: ../../mod/photos.php:761 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:751 +#: ../../mod/photos.php:763 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:809 +#: ../../mod/photos.php:821 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:816 +#: ../../mod/photos.php:828 msgid "Private Photo" msgstr "" -#: ../../mod/photos.php:831 +#: ../../mod/photos.php:843 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:909 +#: ../../mod/photos.php:921 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:911 +#: ../../mod/photos.php:923 msgid "Rotate CW (right)" msgstr "" -#: ../../mod/photos.php:912 +#: ../../mod/photos.php:924 msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/photos.php:919 +#: ../../mod/photos.php:931 msgid "Caption" msgstr "" -#: ../../mod/photos.php:921 +#: ../../mod/photos.php:933 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:925 +#: ../../mod/photos.php:937 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "" -#: ../../mod/photos.php:928 +#: ../../mod/photos.php:940 msgid "Flag as adult in album view" msgstr "" -#: ../../mod/photos.php:1120 +#: ../../mod/photos.php:1132 msgid "In This Photo:" msgstr "" -#: ../../mod/photos.php:1125 +#: ../../mod/photos.php:1137 msgid "Map" msgstr "" -#: ../../mod/photos.php:1211 +#: ../../mod/photos.php:1223 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1234 +#: ../../mod/photos.php:1246 msgid "Recent Photos" msgstr "" diff --git a/version.inc b/version.inc index 2b47a6bda..e38c8df89 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-06-18.1067 +2015-06-20.1069 diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 946e2d7d7..ad203867c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1889,7 +1889,6 @@ nav .dropdown-menu { color: #31708f; background-color: #d9edf7; margin-bottom: 3px; - border-radius: $radiuspx; text-align: center; } @@ -1898,7 +1897,6 @@ nav .dropdown-menu { color: #8a6d3b; background-color: #fcf8e3; margin-bottom: 3px; - border-radius: $radiuspx; text-align: center; } @@ -1907,10 +1905,20 @@ nav .dropdown-menu { color: #a94442; background-color: #f2dede; margin-bottom: 3px; - border-radius: $radiuspx; text-align: center; } +.section-content-tools-wrapper .section-content-info-wrapper, +.section-content-wrapper .section-content-info-wrapper, +.section-content-tools-wrapper .section-content-warning-wrapper, +.section-content-wrapper .section-content-warning-wrapper, +.section-content-tools-wrapper .section-content-danger-wrapper, +.section-content-wrapper .section-content-danger-wrapper { + margin-bottom: 0px; + border-radius: $radiuspx; +} + + .section-content-wrapper { padding: 7px 10px; background-color: $comment_item_colour; diff --git a/view/tpl/blocklist.tpl b/view/tpl/blocklist.tpl index 85e4865ea..27dbcbf0c 100644 --- a/view/tpl/blocklist.tpl +++ b/view/tpl/blocklist.tpl @@ -1,67 +1,69 @@ -<div class="section-title-wrapper"> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + {{if $editor}} + <div class="pull-right"> + <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('block-editor');"><i class="icon-edit"></i> {{$create}}</button> + </div> + {{/if}} + <h2>{{$title}}</h2> + <div class="clear"></div> + </div> {{if $editor}} - <div class="pull-right"> - <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('block-editor');"><i class="icon-edit"></i> {{$create}}</button> + <div id="block-editor" class="section-content-tools-wrapper"> + {{$editor}} </div> {{/if}} - <h2>{{$title}}</h2> + {{if $pages}} + <div id="pagelist-content-wrapper" class="section-content-wrapper-np"> + <table id="block-list-table"> + <tr> + <th width="1%">{{$name}}</th> + <th width="94%">{{$blocktitle}}</th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%" class="hidden-xs">{{$created}}</th> + <th width="1%" class="hidden-xs">{{$edited}}</th> + </tr> + {{foreach $pages as $key => $items}} + {{foreach $items as $item}} + <tr id="block-list-item-{{$item.url}}"> + <td> + {{if $view}} + <a href="block/{{$channel}}/{{$item.name}}" title="{{$view}}">{{$item.name}}</a> + {{else}} + {{$item.name}} + {{/if}} + </td> + <td> + {{$item.title}} + </td> + <td class="webpage-list-tool"> + {{if $edit}} + <a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a> + {{/if}} + </td> + <td class="webpage-list-tool"> + {{if $item.bb_element}} + <a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a> + {{/if}} + </td> + <td class="webpage-list-tool"> + {{if $edit}} + <a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#block-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a> + {{/if}} + </td> + <td class="hidden-xs"> + {{$item.created}} + </td> + <td class="hidden-xs"> + {{$item.edited}} + </td> + </tr> + {{/foreach}} + {{/foreach}} + </table> + </div> <div class="clear"></div> + {{/if}} </div> -{{if $editor}} -<div id="block-editor" class="section-content-tools-wrapper"> - {{$editor}} -</div> -{{/if}} -{{if $pages}} -<div id="pagelist-content-wrapper" class="section-content-wrapper-np"> - <table id="block-list-table"> - <tr> - <th width="1%">{{$name}}</th> - <th width="94%">{{$blocktitle}}</th> - <th width="1%"></th> - <th width="1%"></th> - <th width="1%"></th> - <th width="1%" class="hidden-xs">{{$created}}</th> - <th width="1%" class="hidden-xs">{{$edited}}</th> - </tr> - {{foreach $pages as $key => $items}} - {{foreach $items as $item}} - <tr id="block-list-item-{{$item.url}}"> - <td> - {{if $view}} - <a href="block/{{$channel}}/{{$item.name}}" title="{{$view}}">{{$item.name}}</a> - {{else}} - {{$item.name}} - {{/if}} - </td> - <td> - {{$item.title}} - </td> - <td class="webpage-list-tool"> - {{if $edit}} - <a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a> - {{/if}} - </td> - <td class="webpage-list-tool"> - {{if $item.bb_element}} - <a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a> - {{/if}} - </td> - <td class="webpage-list-tool"> - {{if $edit}} - <a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#block-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a> - {{/if}} - </td> - <td class="hidden-xs"> - {{$item.created}} - </td> - <td class="hidden-xs"> - {{$item.edited}} - </td> - </tr> - {{/foreach}} - {{/foreach}} - </table> -</div> -<div class="clear"></div> -{{/if}} diff --git a/view/tpl/cloud.tpl b/view/tpl/cloud.tpl new file mode 100644 index 000000000..d1567af9f --- /dev/null +++ b/view/tpl/cloud.tpl @@ -0,0 +1,4 @@ +<div class="generic-content-wrapper"> +{{include file="cloud_header.tpl"}} +{{include file="cloud_directory.tpl"}} +</div> diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index c1d03da83..0c7892c25 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -1,4 +1,4 @@ -<div class="generic-content-wrapper section-content-wrapper-np"> +<div class="section-content-wrapper-np"> <table id="cloud-index"> <tr> <th width="1%"></th> diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index e0acc25ae..27632d770 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -4,7 +4,7 @@ </div> <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;"> {{/if}} - <div id="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}}"> + <div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper{{/if}}"> <a name="{{$item.id}}" ></a> <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" > <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;"> diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 85425b4e2..cb2fb8959 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -4,7 +4,7 @@ </div> <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;"> {{/if}} - <div id="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}} conv-list-mode"> + <div id="thread-wrapper-{{$item.id}}" class="thread-wrapper conv-list-mode{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper{{/if}}"> <a name="{{$item.id}}" ></a> <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" > <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;"> diff --git a/view/tpl/conversation.tpl b/view/tpl/conversation.tpl index 97d64327a..82c7be922 100755 --- a/view/tpl/conversation.tpl +++ b/view/tpl/conversation.tpl @@ -1,6 +1,6 @@ <div id="threads-begin"></div> {{foreach $threads as $thread}} -<div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper"> +<div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper generic-content-wrapper"> {{foreach $thread.items as $item}} {{if $item.comment_firstcollapsed}} <div class="hide-comments-outer"> diff --git a/view/tpl/layoutlist.tpl b/view/tpl/layoutlist.tpl index ab7408eae..cf172e197 100644 --- a/view/tpl/layoutlist.tpl +++ b/view/tpl/layoutlist.tpl @@ -1,69 +1,71 @@ -<div class="section-title-wrapper"> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + {{if $editor}} + <div class="pull-right"> + <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('layout-editor');"><i class="icon-edit"></i> {{$create}}</button> + <a href="{{$help.url}}" target="_blank" class="btn btn-xs btn-warning" title="{{$help.title}}"><i class="icon-info"></i> {{$help.text}}</a> + </div> + {{/if}} + <h2>{{$title}}</h2> + <div class="clear"></div> + </div> {{if $editor}} - <div class="pull-right"> - <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('layout-editor');"><i class="icon-edit"></i> {{$create}}</button> - <a href="{{$help.url}}" target="_blank" class="btn btn-xs btn-warning" title="{{$help.title}}"><i class="icon-info"></i> {{$help.text}}</a> + <div id="layout-editor" class="section-content-tools-wrapper"> + {{$editor}} </div> {{/if}} - <h2>{{$title}}</h2> - <div class="clear"></div> -</div> -{{if $editor}} -<div id="layout-editor" class="section-content-tools-wrapper"> - {{$editor}} -</div> -{{/if}} -{{if $pages}} -<div id="pagelist-content-wrapper" class="section-content-wrapper-np"> - <table id="layout-list-table"> - <tr> - <th width="1%">{{$name}}</th> - <th width="94%">{{$descr}}</th> - <th width="1%"></th> - <th width="1%"></th> - <th width="1%"></th> - <th width="1%" class="hidden-xs">{{$created}}</th> - <th width="1%" class="hidden-xs">{{$edited}}</th> - </tr> - {{foreach $pages as $key => $items}} - {{foreach $items as $item}} - <tr id="layout-list-item-{{$item.url}}"> - <td> - {{if $view}} - <a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.title}}</a> - {{else}} - {{$item.title}} - {{/if}} - </td> - <td> - {{$item.descr}} - </td> - <td class="webpage-list-tool"> - {{if $edit}} - <a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a> - {{/if}} - </td> - <td class="webpage-list-tool"> - {{if $item.bb_element}} - <a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a> - {{/if}} - </td> - <td class="webpage-list-tool"> - {{if $edit}} - <a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#layout-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a> - {{/if}} - </td> - <td class="hidden-xs"> - {{$item.created}} - </td> - <td class="hidden-xs"> - {{$item.edited}} - </td> - </tr> - {{/foreach}} - {{/foreach}} - </table> + {{if $pages}} + <div id="pagelist-content-wrapper" class="section-content-wrapper-np"> + <table id="layout-list-table"> + <tr> + <th width="1%">{{$name}}</th> + <th width="94%">{{$descr}}</th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%" class="hidden-xs">{{$created}}</th> + <th width="1%" class="hidden-xs">{{$edited}}</th> + </tr> + {{foreach $pages as $key => $items}} + {{foreach $items as $item}} + <tr id="layout-list-item-{{$item.url}}"> + <td> + {{if $view}} + <a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.title}}</a> + {{else}} + {{$item.title}} + {{/if}} + </td> + <td> + {{$item.descr}} + </td> + <td class="webpage-list-tool"> + {{if $edit}} + <a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a> + {{/if}} + </td> + <td class="webpage-list-tool"> + {{if $item.bb_element}} + <a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a> + {{/if}} + </td> + <td class="webpage-list-tool"> + {{if $edit}} + <a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#layout-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a> + {{/if}} + </td> + <td class="hidden-xs"> + {{$item.created}} + </td> + <td class="hidden-xs"> + {{$item.edited}} + </td> + </tr> + {{/foreach}} + {{/foreach}} + </table> + </div> + <div class="clear"></div> + {{/if}} </div> -<div class="clear"></div> -{{/if}} diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl index 888dc6e6d..743165cc3 100644 --- a/view/tpl/menulist.tpl +++ b/view/tpl/menulist.tpl @@ -1,38 +1,40 @@ -<div class="section-title-wrapper"> - <div class="pull-right"> - <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-creator');"><i class="icon-edit"></i> {{$hintnew}}</button> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <div class="pull-right"> + <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-creator');"><i class="icon-edit"></i> {{$hintnew}}</button> + </div> + <h2>{{$title}}</h2> + <div class="clear"></div> </div> - <h2>{{$title}}</h2> - <div class="clear"></div> -</div> -{{$create}} + {{$create}} -{{if $menus }} -<div id="menulist-content-wrapper" class="section-content-wrapper-np"> - <table id="menu-list-table"> - <tr> - <th width="1%"></th> - <th width="1%">{{$nametitle}}</th> - <th width="93%">{{$desctitle}}</th> - <th width="1%"></th> - <th width="1%"></th> - <th width="1%"></th> - <th width="1%" class="hidden-xs">{{$created}}</th> - <th width="1%" class="hidden-xs">{{$edited}}</th> - </tr> - {{foreach $menus as $m }} - <tr id="menu-list-item-{{$m.menu_id}}"> - <td>{{if $m.bookmark}}<i class="icon-bookmark menu-list-tool" title="{{$bmark}}" ></i>{{/if}}</td> - <td><a href="mitem/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintcontent}}">{{$m.menu_name}}</a></td> - <td>{{$m.menu_desc}}</td> - <td class="menu-list-tool"><a href="menu/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td> - <td class="menu-list-tool"><a href="rpost?attachment={{$m.element}}" title="{{$share}}"><i class="icon-share"></i></a></td> - <td class="menu-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('menu/{{$m.menu_id}}/drop{{if $sys}}?f=&sys=1{{/if}}', '#menu-list-item-{{$m.menu_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td> - <td class="hidden-xs">{{$m.menu_created}}</td> - <td class="hidden-xs">{{$m.menu_edited}}</td> - </tr> - {{/foreach}} - </table> + {{if $menus }} + <div id="menulist-content-wrapper" class="section-content-wrapper-np"> + <table id="menu-list-table"> + <tr> + <th width="1%"></th> + <th width="1%">{{$nametitle}}</th> + <th width="93%">{{$desctitle}}</th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%" class="hidden-xs">{{$created}}</th> + <th width="1%" class="hidden-xs">{{$edited}}</th> + </tr> + {{foreach $menus as $m }} + <tr id="menu-list-item-{{$m.menu_id}}"> + <td>{{if $m.bookmark}}<i class="icon-bookmark menu-list-tool" title="{{$bmark}}" ></i>{{/if}}</td> + <td><a href="mitem/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintcontent}}">{{$m.menu_name}}</a></td> + <td>{{$m.menu_desc}}</td> + <td class="menu-list-tool"><a href="menu/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td> + <td class="menu-list-tool"><a href="rpost?attachment={{$m.element}}" title="{{$share}}"><i class="icon-share"></i></a></td> + <td class="menu-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('menu/{{$m.menu_id}}/drop{{if $sys}}?f=&sys=1{{/if}}', '#menu-list-item-{{$m.menu_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td> + <td class="hidden-xs">{{$m.menu_created}}</td> + <td class="hidden-xs">{{$m.menu_edited}}</td> + </tr> + {{/foreach}} + </table> + </div> + {{/if}} </div> -{{/if}} diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index 5506b01f2..0ce9c36a8 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,27 +1,29 @@ -<div class="section-title-wrapper"> - <div class="pull-right"> - <a class="btn btn-default btn-xs" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a> - <div class="btn-group btn-group"> - {{if $album_edit.1}} - <i class="icon-pencil btn btn-default btn-xs" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i> - {{/if}} - {{if $can_post}} - <button class="btn btn-xs btn-success btn-xs" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="icon-upload"></i> {{$upload.0}}</button> - {{/if}} +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <div class="pull-right"> + <a class="btn btn-default btn-xs" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a> + <div class="btn-group btn-group"> + {{if $album_edit.1}} + <i class="icon-pencil btn btn-default btn-xs" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i> + {{/if}} + {{if $can_post}} + <button class="btn btn-xs btn-success btn-xs" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="icon-upload"></i> {{$upload.0}}</button> + {{/if}} + </div> </div> - </div> - <h2>{{$album}}</h2> + <h2>{{$album}}</h2> - <div class="clear"></div> -</div> -{{$upload_form}} -{{$album_edit.1}} -<div id="photo-album-contents" class="generic-content-wrapper"> - {{foreach $photos as $photo}} - {{include file="photo_top.tpl"}} - {{/foreach}} - <div id="page-end"></div> + <div class="clear"></div> + </div> + {{$upload_form}} + {{$album_edit.1}} + <div id="photo-album-contents"> + {{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} + {{/foreach}} + <div id="page-end"></div> + </div> </div> <div class="photos-end"></div> <script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 1054d5e3a..63d5ad778 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -1,6 +1,5 @@ <div id="live-photos"></div> <div class="generic-content-wrapper"> - <div class="section-title-wrapper"> <div class="pull-right"> @@ -155,17 +154,17 @@ {{/if}} <div class="clear"></div> </div> -</div> -{{$comments}} + {{$comments}} -{{if $commentbox}} -<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" > - {{$commentbox}} -</div> -{{/if}} + {{if $commentbox}} + <div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" > + {{$commentbox}} + </div> + {{/if}} -<div class="clear"></div> + <div class="clear"></div> +</div> {{$paginate}} diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 7727abcea..15faa4a34 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -1,16 +1,18 @@ -<div class="section-title-wrapper"> - {{if $can_post}} - <button class="btn btn-xs btn-success pull-right" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="icon-upload"></i> {{$upload.0}}</button> - {{/if}} - <h2>{{$title}}</h2> - <div class="clear"></div> -</div> -{{$upload_form}} -<div id="photo-album-contents" class="generic-content-wrapper"> - {{foreach $photos as $photo}} - {{include file="photo_top.tpl"}} - {{/foreach}} - <div id="page-end"></div> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + {{if $can_post}} + <button class="btn btn-xs btn-success pull-right" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="icon-upload"></i> {{$upload.0}}</button> + {{/if}} + <h2>{{$title}}</h2> + <div class="clear"></div> + </div> + {{$upload_form}} + <div id="photo-album-contents"> + {{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} + {{/foreach}} + <div id="page-end"></div> + </div> </div> <div class="photos-end"></div> <script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script> diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index d5a608c82..dee33f1b3 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -1,4 +1,4 @@ -<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}}"> +<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper{{/if}}"> <a name="{{$item.id}}" ></a> <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" > <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;"> diff --git a/view/tpl/sharedwithme.tpl b/view/tpl/sharedwithme.tpl index cb365ed05..4ffacc241 100644 --- a/view/tpl/sharedwithme.tpl +++ b/view/tpl/sharedwithme.tpl @@ -1,24 +1,26 @@ -<div class="section-title-wrapper"> - <a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-xs btn-default pull-right"><i class="icon-trash"></i> {{$dropall}}</a> - <h2>{{$header}}</h2> -</div> -<div class="generic-content-wrapper section-content-wrapper-np"> - <table id="cloud-index"> - <tr> - <th width="1%"></th> - <th width="92%">{{$name}}</th> - <th width="1%"></th> - <th width="1%" class="hidden-xs">{{$size}}</th> - <th width="1%" class="hidden-xs">{{$lastmod}}</th> - </tr> - {{foreach $items as $item}} - <tr id="cloud-index-{{$item.id}}"> - <td><i class="{{$item.objfiletypeclass}}" title="{{$item.objfiletype}}"></i></td> - <td><a href="{{$item.objurl}}">{{$item.objfilename}}</a>{{if $item.unseen}} <span class="label label-success">{{$label_new}}</span>{{/if}}</td> - <td class="cloud-index-tool"><a href="#" title="{{$drop}}" onclick="dropItem('/sharedwithme/{{$item.id}}/drop', '#cloud-index-{{$item.id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td> - <td class="hidden-xs">{{$item.objfilesize}}</td> - <td class="hidden-xs">{{$item.objedited}}</td> - </tr> - {{/foreach}} - </table> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-xs btn-default pull-right"><i class="icon-trash"></i> {{$dropall}}</a> + <h2>{{$header}}</h2> + </div> + <div class="section-content-wrapper-np"> + <table id="cloud-index"> + <tr> + <th width="1%"></th> + <th width="92%">{{$name}}</th> + <th width="1%"></th> + <th width="1%" class="hidden-xs">{{$size}}</th> + <th width="1%" class="hidden-xs">{{$lastmod}}</th> + </tr> + {{foreach $items as $item}} + <tr id="cloud-index-{{$item.id}}"> + <td><i class="{{$item.objfiletypeclass}}" title="{{$item.objfiletype}}"></i></td> + <td><a href="{{$item.objurl}}">{{$item.objfilename}}</a>{{if $item.unseen}} <span class="label label-success">{{$label_new}}</span>{{/if}}</td> + <td class="cloud-index-tool"><a href="#" title="{{$drop}}" onclick="dropItem('/sharedwithme/{{$item.id}}/drop', '#cloud-index-{{$item.id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td> + <td class="hidden-xs">{{$item.objfilesize}}</td> + <td class="hidden-xs">{{$item.objedited}}</td> + </tr> + {{/foreach}} + </table> + </div> </div> diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index 77fb09492..864705121 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -1,74 +1,76 @@ -<div class="section-title-wrapper"> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + {{if $editor}} + <div class="pull-right"> + <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('webpage-editor');"><i class="icon-edit"></i> {{$create}}</button> + </div> + {{/if}} + <h2>{{$listtitle}}</h2> + <div class="clear"></div> + </div> {{if $editor}} - <div class="pull-right"> - <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('webpage-editor');"><i class="icon-edit"></i> {{$create}}</button> + <div id="webpage-editor" class="section-content-tools-wrapper"> + {{$editor}} + </div> + {{/if}} + {{if $pages}} + <div id="pagelist-content-wrapper" class="section-content-wrapper-np"> + <table id="webpage-list-table"> + <tr> + <th width="1%">{{$pagelink_txt}}</th> + <th width="95%">{{$title_txt}}</th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%" class="hidden-xs">{{$created_txt}}</th> + <th width="1%" class="hidden-xs">{{$edited_txt}}</th> + </tr> + {{foreach $pages as $key => $items}} + {{foreach $items as $item}} + <tr id="webpage-list-item-{{$item.url}}"> + <td> + {{if $view}} + <a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a> + {{else}} + {{$item.pagetitle}} + {{/if}} + </td> + <td> + {{$item.title}} + </td> + <td class="webpage-list-tool dropdown"> + {{if $item.lockstate=='lock'}} + <i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('item',{{$item.url}});" ></i> + <ul id="panel-{{$item.url}}" class="lockview-panel dropdown-menu"></ul> + {{/if}} + </td> + <td class="webpage-list-tool"> + {{if $edit}} + <a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a> + {{/if}} + </td> + <td class="webpage-list-tool"> + {{if $item.bb_element}} + <a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a> + {{/if}} + </td> + <td class="webpage-list-tool"> + {{if $edit}} + <a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#webpage-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a> + {{/if}} + </td> + <td class="hidden-xs"> + {{$item.created}} + </td> + <td class="hidden-xs"> + {{$item.edited}} + </td> + </tr> + {{/foreach}} + {{/foreach}} + </table> </div> {{/if}} - <h2>{{$listtitle}}</h2> <div class="clear"></div> </div> -{{if $editor}} -<div id="webpage-editor" class="section-content-tools-wrapper"> - {{$editor}} -</div> -{{/if}} -{{if $pages}} -<div id="pagelist-content-wrapper" class="section-content-wrapper-np"> - <table id="webpage-list-table"> - <tr> - <th width="1%">{{$pagelink_txt}}</th> - <th width="95%">{{$title_txt}}</th> - <th width="1%"></th> - <th width="1%"></th> - <th width="1%"></th> - <th width="1%"></th> - <th width="1%" class="hidden-xs">{{$created_txt}}</th> - <th width="1%" class="hidden-xs">{{$edited_txt}}</th> - </tr> - {{foreach $pages as $key => $items}} - {{foreach $items as $item}} - <tr id="webpage-list-item-{{$item.url}}"> - <td> - {{if $view}} - <a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a> - {{else}} - {{$item.pagetitle}} - {{/if}} - </td> - <td> - {{$item.title}} - </td> - <td class="webpage-list-tool dropdown"> - {{if $item.lockstate=='lock'}} - <i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('item',{{$item.url}});" ></i> - <ul id="panel-{{$item.url}}" class="lockview-panel dropdown-menu"></ul> - {{/if}} - </td> - <td class="webpage-list-tool"> - {{if $edit}} - <a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a> - {{/if}} - </td> - <td class="webpage-list-tool"> - {{if $item.bb_element}} - <a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a> - {{/if}} - </td> - <td class="webpage-list-tool"> - {{if $edit}} - <a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#webpage-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a> - {{/if}} - </td> - <td class="hidden-xs"> - {{$item.created}} - </td> - <td class="hidden-xs"> - {{$item.edited}} - </td> - </tr> - {{/foreach}} - {{/foreach}} - </table> -</div> -<div class="clear"></div> -{{/if}} |