diff options
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | include/text.php | 2 | ||||
| -rw-r--r-- | util/messages.po | 316 | ||||
| -rw-r--r-- | view/theme/darkbubble/unsupported | 0 | ||||
| -rw-r--r-- | view/theme/dispy/dark/style.css | 53 | ||||
| -rw-r--r-- | view/theme/dispy/dark/style.less | 135 | ||||
| -rw-r--r-- | view/theme/dispy/group_side.tpl | 5 | ||||
| -rw-r--r-- | view/theme/dispy/light/style.css | 53 | ||||
| -rw-r--r-- | view/theme/dispy/light/style.less | 135 | ||||
| -rw-r--r-- | view/theme/dispy/photo_edit.tpl | 53 | ||||
| -rw-r--r-- | view/theme/duepuntozero/profile_vcard.tpl | 51 | ||||
| -rw-r--r-- | view/theme/duepuntozero/style.css | 3 | ||||
| -rw-r--r-- | view/theme/slackr/style.css | 22 | ||||
| -rw-r--r-- | view/theme/slackr/theme.php | 8 |
14 files changed, 537 insertions, 301 deletions
@@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1350' ); +define ( 'FRIENDICA_VERSION', '3.0.1351' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1144 ); diff --git a/include/text.php b/include/text.php index e93c24ef4..d6a9ef5d3 100644 --- a/include/text.php +++ b/include/text.php @@ -646,7 +646,7 @@ function search($s,$id='search-box',$url='/search',$save = false) { $a = get_app(); $o = '<div id="' . $id . '">'; $o .= '<form action="' . $a->get_baseurl((stristr($url,'network')) ? true : false) . $url . '" method="get" >'; - $o .= '<input type="text" name="search" id="search-text" value="' . $s .'" />'; + $o .= '<input type="text" name="search" id="search-text" placeholder="' . t('Search') . '" value="' . $s .'" />'; $o .= '<input type="submit" name="submit" id="search-submit" value="' . t('Search') . '" />'; if($save) $o .= '<input type="submit" name="save" id="search-save" value="' . t('Save') . '" />'; diff --git a/util/messages.po b/util/messages.po index c5749f0ad..d732de130 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1350\n" +"Project-Id-Version: 3.0.1351\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-22 10:00-0700\n" +"POT-Creation-Date: 2012-05-23 10:00-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" @@ -36,7 +36,7 @@ msgstr "" #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44 #: ../../mod/fsuggest.php:78 ../../mod/events.php:138 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:865 +#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:920 #: ../../mod/editpost.php:10 ../../mod/install.php:171 #: ../../mod/notifications.php:66 ../../mod/contacts.php:125 #: ../../mod/settings.php:104 ../../mod/settings.php:535 @@ -122,9 +122,9 @@ msgid "New photo from this URL" msgstr "" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:428 ../../mod/photos.php:900 ../../mod/photos.php:958 -#: ../../mod/photos.php:1200 ../../mod/photos.php:1240 -#: ../../mod/photos.php:1280 ../../mod/photos.php:1311 +#: ../../mod/events.php:428 ../../mod/photos.php:955 ../../mod/photos.php:1013 +#: ../../mod/photos.php:1256 ../../mod/photos.php:1296 +#: ../../mod/photos.php:1336 ../../mod/photos.php:1367 #: ../../mod/install.php:251 ../../mod/install.php:289 #: ../../mod/localtime.php:45 ../../mod/contacts.php:322 #: ../../mod/settings.php:553 ../../mod/settings.php:699 @@ -137,9 +137,10 @@ msgstr "" #: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158 #: ../../addon/uhremotestorage/uhremotestorage.php:89 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93 -#: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187 -#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:82 -#: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61 +#: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92 +#: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41 +#: ../../addon/impressum/impressum.php:82 ../../addon/blockem/blockem.php:57 +#: ../../addon/qcomment/qcomment.php:61 #: ../../addon/openstreetmap/openstreetmap.php:70 #: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84 #: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:86 @@ -220,7 +221,7 @@ msgid "link to source" msgstr "" #: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:126 -#: ../../include/nav.php:52 ../../boot.php:1522 +#: ../../include/nav.php:52 ../../boot.php:1523 msgid "Events" msgstr "" @@ -270,7 +271,7 @@ msgid "Description:" msgstr "" #: ../../mod/events.php:423 ../../include/event.php:37 -#: ../../include/bb2diaspora.php:260 ../../boot.php:1102 +#: ../../include/bb2diaspora.php:260 ../../boot.php:1103 msgid "Location:" msgstr "" @@ -345,18 +346,19 @@ msgstr "" msgid "No" msgstr "" -#: ../../mod/photos.php:43 ../../boot.php:1516 +#: ../../mod/photos.php:43 ../../boot.php:1517 msgid "Photo Albums" msgstr "" -#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879 -#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1389 -#: ../../mod/photos.php:1401 ../../addon/communityhome/communityhome.php:110 +#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:934 +#: ../../mod/photos.php:1005 ../../mod/photos.php:1020 +#: ../../mod/photos.php:1445 ../../mod/photos.php:1457 +#: ../../addon/communityhome/communityhome.php:110 #: ../../view/theme/diabook/theme.php:593 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:58 ../../mod/photos.php:975 ../../mod/photos.php:1438 +#: ../../mod/photos.php:58 ../../mod/photos.php:1030 ../../mod/photos.php:1494 msgid "Upload New Photos" msgstr "" @@ -368,8 +370,8 @@ msgstr "" msgid "Contact information unavailable" msgstr "" -#: ../../mod/photos.php:151 ../../mod/photos.php:597 ../../mod/photos.php:950 -#: ../../mod/photos.php:965 ../../mod/register.php:314 +#: ../../mod/photos.php:151 ../../mod/photos.php:652 ../../mod/photos.php:1005 +#: ../../mod/photos.php:1020 ../../mod/register.php:314 #: ../../mod/register.php:321 ../../mod/register.php:328 #: ../../mod/profile_photo.php:60 ../../mod/profile_photo.php:67 #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174 @@ -383,19 +385,19 @@ msgstr "" msgid "Album not found." msgstr "" -#: ../../mod/photos.php:179 ../../mod/photos.php:959 +#: ../../mod/photos.php:179 ../../mod/photos.php:1014 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:242 ../../mod/photos.php:1201 +#: ../../mod/photos.php:242 ../../mod/photos.php:1257 msgid "Delete Photo" msgstr "" -#: ../../mod/photos.php:528 +#: ../../mod/photos.php:583 msgid "was tagged in a" msgstr "" -#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70 +#: ../../mod/photos.php:583 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 #: ../../view/theme/diabook/theme.php:565 ../../include/text.php:1311 #: ../../include/diaspora.php:1662 ../../include/conversation.php:53 @@ -403,168 +405,172 @@ msgstr "" msgid "photo" msgstr "" -#: ../../mod/photos.php:528 +#: ../../mod/photos.php:583 msgid "by" msgstr "" -#: ../../mod/photos.php:631 ../../addon/js_upload/js_upload.php:315 +#: ../../mod/photos.php:686 ../../addon/js_upload/js_upload.php:315 msgid "Image exceeds size limit of " msgstr "" -#: ../../mod/photos.php:639 +#: ../../mod/photos.php:694 msgid "Image file is empty." msgstr "" -#: ../../mod/photos.php:653 ../../mod/profile_photo.php:124 +#: ../../mod/photos.php:708 ../../mod/profile_photo.php:124 #: ../../mod/wall_upload.php:83 msgid "Unable to process image." msgstr "" -#: ../../mod/photos.php:673 ../../mod/profile_photo.php:257 +#: ../../mod/photos.php:728 ../../mod/profile_photo.php:257 #: ../../mod/wall_upload.php:102 msgid "Image upload failed." msgstr "" -#: ../../mod/photos.php:759 ../../mod/community.php:16 +#: ../../mod/photos.php:814 ../../mod/community.php:16 #: ../../mod/dfrn_request.php:740 ../../mod/viewcontacts.php:17 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29 msgid "Public access denied." msgstr "" -#: ../../mod/photos.php:769 +#: ../../mod/photos.php:824 msgid "No photos selected" msgstr "" -#: ../../mod/photos.php:846 +#: ../../mod/photos.php:901 msgid "Access to this item is restricted." msgstr "" -#: ../../mod/photos.php:907 +#: ../../mod/photos.php:962 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:910 ../../mod/photos.php:954 +#: ../../mod/photos.php:965 ../../mod/photos.php:1009 msgid "New album name: " msgstr "" -#: ../../mod/photos.php:911 +#: ../../mod/photos.php:966 msgid "or existing album name: " msgstr "" -#: ../../mod/photos.php:912 +#: ../../mod/photos.php:967 msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/photos.php:914 ../../mod/photos.php:1196 +#: ../../mod/photos.php:969 ../../mod/photos.php:1252 msgid "Permissions" msgstr "" -#: ../../mod/photos.php:969 +#: ../../mod/photos.php:1024 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:991 ../../mod/photos.php:1421 +#: ../../mod/photos.php:1046 ../../mod/photos.php:1477 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:1026 +#: ../../mod/photos.php:1081 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:1028 +#: ../../mod/photos.php:1083 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:1078 +#: ../../mod/photos.php:1133 msgid "View photo" msgstr "" -#: ../../mod/photos.php:1078 +#: ../../mod/photos.php:1133 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:1079 +#: ../../mod/photos.php:1134 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:1085 ../../include/conversation.php:484 +#: ../../mod/photos.php:1140 ../../include/conversation.php:484 msgid "Private Message" msgstr "" -#: ../../mod/photos.php:1107 +#: ../../mod/photos.php:1162 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:1175 +#: ../../mod/photos.php:1230 msgid "Tags: " msgstr "" -#: ../../mod/photos.php:1178 +#: ../../mod/photos.php:1233 msgid "[Remove any tag]" msgstr "" -#: ../../mod/photos.php:1189 +#: ../../mod/photos.php:1243 +msgid "Rotate CW" +msgstr "" + +#: ../../mod/photos.php:1245 msgid "New album name" msgstr "" -#: ../../mod/photos.php:1192 +#: ../../mod/photos.php:1248 msgid "Caption" msgstr "" -#: ../../mod/photos.php:1194 +#: ../../mod/photos.php:1250 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:1198 +#: ../../mod/photos.php:1254 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1218 ../../include/conversation.php:533 +#: ../../mod/photos.php:1274 ../../include/conversation.php:533 msgid "I like this (toggle)" msgstr "" -#: ../../mod/photos.php:1219 ../../include/conversation.php:534 +#: ../../mod/photos.php:1275 ../../include/conversation.php:534 msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1220 ../../include/conversation.php:968 +#: ../../mod/photos.php:1276 ../../include/conversation.php:968 msgid "Share" msgstr "" -#: ../../mod/photos.php:1221 ../../mod/editpost.php:104 +#: ../../mod/photos.php:1277 ../../mod/editpost.php:104 #: ../../mod/wallmessage.php:145 ../../mod/message.php:214 #: ../../mod/message.php:408 ../../include/conversation.php:365 #: ../../include/conversation.php:710 ../../include/conversation.php:987 msgid "Please wait" msgstr "" -#: ../../mod/photos.php:1237 ../../mod/photos.php:1277 -#: ../../mod/photos.php:1308 ../../include/conversation.php:556 +#: ../../mod/photos.php:1293 ../../mod/photos.php:1333 +#: ../../mod/photos.php:1364 ../../include/conversation.php:556 msgid "This is you" msgstr "" -#: ../../mod/photos.php:1239 ../../mod/photos.php:1279 -#: ../../mod/photos.php:1310 ../../include/conversation.php:558 -#: ../../boot.php:516 +#: ../../mod/photos.php:1295 ../../mod/photos.php:1335 +#: ../../mod/photos.php:1366 ../../include/conversation.php:558 +#: ../../boot.php:517 msgid "Comment" msgstr "" -#: ../../mod/photos.php:1241 ../../mod/editpost.php:125 +#: ../../mod/photos.php:1297 ../../mod/editpost.php:125 #: ../../include/conversation.php:568 ../../include/conversation.php:1005 msgid "Preview" msgstr "" -#: ../../mod/photos.php:1338 ../../mod/settings.php:616 +#: ../../mod/photos.php:1394 ../../mod/settings.php:616 #: ../../mod/settings.php:697 ../../mod/group.php:168 ../../mod/admin.php:660 #: ../../include/conversation.php:322 ../../include/conversation.php:588 msgid "Delete" msgstr "" -#: ../../mod/photos.php:1427 +#: ../../mod/photos.php:1483 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1436 +#: ../../mod/photos.php:1492 msgid "Recent Photos" msgstr "" @@ -1166,7 +1172,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1046 +#: ../../include/contact_widgets.php:9 ../../boot.php:1047 msgid "Connect" msgstr "" @@ -1210,7 +1216,7 @@ msgstr "" msgid "Network" msgstr "" -#: ../../mod/notifications.php:85 ../../mod/network.php:184 +#: ../../mod/notifications.php:85 ../../mod/network.php:188 msgid "Personal" msgstr "" @@ -1693,7 +1699,7 @@ msgstr "" #: ../../addon/facebook/facebook.php:1178 #: ../../addon/public_server/public_server.php:62 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2738 -#: ../../boot.php:696 +#: ../../boot.php:697 msgid "Administrator" msgstr "" @@ -1703,7 +1709,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:83 ../../boot.php:828 +#: ../../mod/lostpass.php:83 ../../boot.php:829 msgid "Password Reset" msgstr "" @@ -2289,51 +2295,51 @@ msgstr "" msgid "add" msgstr "" -#: ../../mod/network.php:171 +#: ../../mod/network.php:175 msgid "Commented Order" msgstr "" -#: ../../mod/network.php:174 +#: ../../mod/network.php:178 msgid "Sort by Comment Date" msgstr "" -#: ../../mod/network.php:177 +#: ../../mod/network.php:181 msgid "Posted Order" msgstr "" -#: ../../mod/network.php:180 +#: ../../mod/network.php:184 msgid "Sort by Post Date" msgstr "" -#: ../../mod/network.php:187 +#: ../../mod/network.php:191 msgid "Posts that mention or involve you" msgstr "" -#: ../../mod/network.php:190 +#: ../../mod/network.php:194 msgid "New" msgstr "" -#: ../../mod/network.php:193 +#: ../../mod/network.php:197 msgid "Activity Stream - by date" msgstr "" -#: ../../mod/network.php:196 +#: ../../mod/network.php:200 msgid "Starred" msgstr "" -#: ../../mod/network.php:199 +#: ../../mod/network.php:203 msgid "Favourite Posts" msgstr "" -#: ../../mod/network.php:202 +#: ../../mod/network.php:206 msgid "Shared Links" msgstr "" -#: ../../mod/network.php:205 +#: ../../mod/network.php:209 msgid "Interesting Links" msgstr "" -#: ../../mod/network.php:281 +#: ../../mod/network.php:285 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -2341,41 +2347,41 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ../../mod/network.php:284 +#: ../../mod/network.php:288 msgid "Private messages to this group are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:329 +#: ../../mod/network.php:333 msgid "No such group" msgstr "" -#: ../../mod/network.php:340 +#: ../../mod/network.php:344 msgid "Group is empty" msgstr "" -#: ../../mod/network.php:344 +#: ../../mod/network.php:348 msgid "Group: " msgstr "" -#: ../../mod/network.php:354 +#: ../../mod/network.php:358 msgid "Contact: " msgstr "" -#: ../../mod/network.php:356 +#: ../../mod/network.php:360 msgid "Private messages to this person are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:361 +#: ../../mod/network.php:365 msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1528 +#: ../../mod/notes.php:44 ../../boot.php:1529 msgid "Personal Notes" msgstr "" #: ../../mod/notes.php:63 ../../mod/filer.php:30 #: ../../addon/facebook/facebook.php:756 -#: ../../addon/privacy_image_cache/privacy_image_cache.php:147 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:148 #: ../../include/text.php:652 msgid "Save" msgstr "" @@ -2620,7 +2626,7 @@ msgstr "" #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:123 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 -#: ../../include/nav.php:50 ../../boot.php:1507 +#: ../../include/nav.php:50 ../../boot.php:1508 msgid "Profile" msgstr "" @@ -2792,7 +2798,7 @@ msgstr "" msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:546 ../../include/nav.php:81 ../../boot.php:794 +#: ../../mod/register.php:546 ../../include/nav.php:81 ../../boot.php:795 msgid "Register" msgstr "" @@ -2835,7 +2841,7 @@ msgid "Access denied." msgstr "" #: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:125 -#: ../../include/nav.php:51 ../../boot.php:1513 +#: ../../include/nav.php:51 ../../boot.php:1514 msgid "Photos" msgstr "" @@ -3618,7 +3624,7 @@ msgstr "" msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:21 ../../boot.php:959 +#: ../../mod/profile.php:21 ../../boot.php:960 msgid "Requested profile is not available." msgstr "" @@ -3630,48 +3636,48 @@ msgstr "" msgid "Tips for New Members" msgstr "" -#: ../../mod/ping.php:177 +#: ../../mod/ping.php:185 msgid "{0} wants to be your friend" msgstr "" -#: ../../mod/ping.php:182 +#: ../../mod/ping.php:190 msgid "{0} sent you a message" msgstr "" -#: ../../mod/ping.php:187 +#: ../../mod/ping.php:195 msgid "{0} requested registration" msgstr "" -#: ../../mod/ping.php:193 +#: ../../mod/ping.php:201 #, php-format msgid "{0} commented %s's post" msgstr "" -#: ../../mod/ping.php:198 +#: ../../mod/ping.php:206 #, php-format msgid "{0} liked %s's post" msgstr "" -#: ../../mod/ping.php:203 +#: ../../mod/ping.php:211 #, php-format msgid "{0} disliked %s's post" msgstr "" -#: ../../mod/ping.php:208 +#: ../../mod/ping.php:216 #, php-format msgid "{0} is now friends with %s" msgstr "" -#: ../../mod/ping.php:213 +#: ../../mod/ping.php:221 msgid "{0} posted" msgstr "" -#: ../../mod/ping.php:218 +#: ../../mod/ping.php:226 #, php-format msgid "{0} tagged %s's post with #%s" msgstr "" -#: ../../mod/ping.php:224 +#: ../../mod/ping.php:232 msgid "{0} mentioned you in a post" msgstr "" @@ -3688,8 +3694,8 @@ msgid "" "Account not found and OpenID registration is not permitted on this site." msgstr "" -#: ../../mod/openid.php:93 ../../include/auth.php:90 -#: ../../include/auth.php:153 +#: ../../mod/openid.php:93 ../../include/auth.php:97 +#: ../../include/auth.php:160 msgid "Login failed." msgstr "" @@ -4031,23 +4037,23 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:621 ../../boot.php:1068 +#: ../../mod/profiles.php:621 ../../boot.php:1069 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:622 ../../boot.php:1069 +#: ../../mod/profiles.php:622 ../../boot.php:1070 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:633 ../../boot.php:1079 +#: ../../mod/profiles.php:633 ../../boot.php:1080 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:635 ../../boot.php:1082 +#: ../../mod/profiles.php:635 ../../boot.php:1083 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:636 ../../boot.php:1083 +#: ../../mod/profiles.php:636 ../../boot.php:1084 msgid "Edit visibility" msgstr "" @@ -4512,23 +4518,23 @@ msgid "" "connection again, you have to %3$sre-authenticate the Facebook-connector%4$s." msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:144 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:145 msgid "Lifetime of the cache (in hours)" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:149 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:150 msgid "Cache Statistics" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:152 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:153 msgid "Number of items" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:154 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:155 msgid "Size of the cache" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:156 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:157 msgid "Delete the whole cache" msgstr "" @@ -4655,7 +4661,7 @@ msgstr "" #: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87 #: ../../include/contact_widgets.php:188 ../../include/conversation.php:470 -#: ../../boot.php:517 +#: ../../boot.php:518 msgid "show more" msgstr "" @@ -4671,7 +4677,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:815 +#: ../../include/nav.php:64 ../../boot.php:816 msgid "Login" msgstr "" @@ -4855,6 +4861,18 @@ msgstr "" msgid "Post from Friendica" msgstr "" +#: ../../addon/startpage/startpage.php:83 +msgid "Startpage Settings" +msgstr "" + +#: ../../addon/startpage/startpage.php:85 +msgid "Home page to load after login - leave blank for profile wall" +msgstr "" + +#: ../../addon/startpage/startpage.php:88 +msgid "Examples: "network" or "notifications/system"" +msgstr "" + #: ../../addon/geonames/geonames.php:143 msgid "Geonames settings updated." msgstr "" @@ -5836,7 +5854,7 @@ msgstr "" msgid "Set colour scheme" msgstr "" -#: ../../include/profile_advanced.php:17 ../../boot.php:1104 +#: ../../include/profile_advanced.php:17 ../../boot.php:1105 msgid "Gender:" msgstr "" @@ -5857,11 +5875,11 @@ msgstr "" msgid "Age:" msgstr "" -#: ../../include/profile_advanced.php:37 ../../boot.php:1107 +#: ../../include/profile_advanced.php:37 ../../boot.php:1108 msgid "Status:" msgstr "" -#: ../../include/profile_advanced.php:45 ../../boot.php:1109 +#: ../../include/profile_advanced.php:45 ../../boot.php:1110 msgid "Homepage:" msgstr "" @@ -6445,7 +6463,7 @@ msgstr "" msgid "Contacts not in any group" msgstr "" -#: ../../include/nav.php:46 ../../boot.php:814 +#: ../../include/nav.php:46 ../../boot.php:815 msgid "Logout" msgstr "" @@ -6453,7 +6471,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1501 +#: ../../include/nav.php:49 ../../boot.php:1502 msgid "Status" msgstr "" @@ -6533,11 +6551,11 @@ msgstr "" msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1062 +#: ../../include/nav.php:138 ../../boot.php:1063 msgid "Profiles" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1062 +#: ../../include/nav.php:138 ../../boot.php:1063 msgid "Manage/edit profiles" msgstr "" @@ -6616,17 +6634,17 @@ msgstr "" msgid "Categories" msgstr "" -#: ../../include/auth.php:29 +#: ../../include/auth.php:36 msgid "Logged out." msgstr "" -#: ../../include/auth.php:106 +#: ../../include/auth.php:113 msgid "" "We encountered a problem while logging in with the OpenID you provided. " "Please check the correct spelling of the ID." msgstr "" -#: ../../include/auth.php:106 +#: ../../include/auth.php:113 msgid "The error message was:" msgstr "" @@ -7204,96 +7222,96 @@ msgstr "" msgid "permissions" msgstr "" -#: ../../boot.php:515 +#: ../../boot.php:516 msgid "Delete this item?" msgstr "" -#: ../../boot.php:518 +#: ../../boot.php:519 msgid "show fewer" msgstr "" -#: ../../boot.php:691 +#: ../../boot.php:692 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:693 +#: ../../boot.php:694 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:793 +#: ../../boot.php:794 msgid "Create a New Account" msgstr "" -#: ../../boot.php:817 +#: ../../boot.php:818 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:818 +#: ../../boot.php:819 msgid "Password: " msgstr "" -#: ../../boot.php:821 +#: ../../boot.php:822 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:827 +#: ../../boot.php:828 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:994 +#: ../../boot.php:995 msgid "Edit profile" msgstr "" -#: ../../boot.php:1054 +#: ../../boot.php:1055 msgid "Message" msgstr "" -#: ../../boot.php:1170 ../../boot.php:1246 +#: ../../boot.php:1171 ../../boot.php:1247 msgid "g A l F d" msgstr "" -#: ../../boot.php:1171 ../../boot.php:1247 +#: ../../boot.php:1172 ../../boot.php:1248 msgid "F d" msgstr "" -#: ../../boot.php:1216 ../../boot.php:1287 +#: ../../boot.php:1217 ../../boot.php:1288 msgid "[today]" msgstr "" -#: ../../boot.php:1228 +#: ../../boot.php:1229 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1229 +#: ../../boot.php:1230 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1280 +#: ../../boot.php:1281 msgid "[No description]" msgstr "" -#: ../../boot.php:1298 +#: ../../boot.php:1299 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1299 +#: ../../boot.php:1300 msgid "Events this week:" msgstr "" -#: ../../boot.php:1504 +#: ../../boot.php:1505 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1510 +#: ../../boot.php:1511 msgid "Profile Details" msgstr "" -#: ../../boot.php:1525 +#: ../../boot.php:1526 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1531 +#: ../../boot.php:1532 msgid "Only You Can See This" msgstr "" diff --git a/view/theme/darkbubble/unsupported b/view/theme/darkbubble/unsupported deleted file mode 100644 index e69de29bb..000000000 --- a/view/theme/darkbubble/unsupported +++ /dev/null diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index 6f29ef1f4..029722c3a 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -58,7 +58,7 @@ h6{font-size:xx-small;} #articlemain{width:100%;height:100%;margin:0 auto;} .button{color:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#eeeecc;font-weight:bold;} #profile-listing-desc a{color:#eeeecc;font-weight:bold;} -[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:3px outset #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} +[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:3px ridge #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} #item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;} .intro-approve-as-friend-desc{margin-top:10px;} .intro-desc{margin-bottom:20px;font-weight:bold;} @@ -66,6 +66,7 @@ h6{font-size:xx-small;} #settings-nickname-desc{background:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:1px solid #eeeecc;padding:5px;color:#2e2f2e;} .contactname,.contact-name{font-weight:bold;font-size:smaller;} .contact-details{font-style:italic;font-size:smaller;} +.like-rotator{vertical-align:middle;text-align:center;margin:1px;} #asidemain .field{overflow:hidden;width:200px;} #login-extra-links{overflow:auto !important;padding-top:60px !important;width:100% !important;}#login-extra-links a{margin-right:20px;} #login_standard{display:block !important;float:none !important;height:100% !important;position:relative !important;width:100% !important;}#login_standard .field label{width:200px !important;} @@ -106,8 +107,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;} .floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(dark/icons.png) -190px -60px no-repeat;} .search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} -#search-text,#mini-search-text{background:white;color:#2e2f2e;margin:8px;} -#search-text{border:1px solid #eeeeee;margin:8px 0;} +#search-text,#mini-search-text{background:white;color:#2e2f2e;} +#search-text{border:1px solid #eeeeee;margin:5px 0;} #mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;} #scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;} #user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:75%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;} @@ -121,7 +122,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #intro-update{background-position:-120px 0px;} #lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;} #language-selector{position:fixed;bottom:2px;left:52px;z-index:10;} -.menu-popup{position:absolute;display:none;background:white;color:#2e2f2e;margin:0px;padding:0px;font-size:small;line-height:1.1;border:3px solid #88a9d2;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeecc;background-color:#88a9d2;} +.menu-popup{position:absolute;display:none;background:white;color:#2e2f2e;margin:0px;padding:0px;font-size:small;line-height:1.2;border:3px solid #88a9d2;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeecc;background-color:#88a9d2;} .menu-popup .menu-sep{border-top:1px solid #4e4f4e;} .menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;} .menu-popup .empty{padding:5px;text-align:center;color:#9ea8ac;} @@ -135,7 +136,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #asidemain{float:left;font-size:small;margin:20px 0 20px 35px;width:25%;display:inline;} #asideright,#asideleft{display:none;} .vcard .fn{font-size:1.5em;font-weight:bold;border-bottom:1px solid #638ec4;padding-bottom:3px;} -.vcard #profile-photo-wrapper{margin:20px;}.vcard #profile-photo-wrapper img{-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;} +.vcard #profile-photo-wrapper{margin:20px 0;background-color:#555753;padding:5px;width:175px;height:175px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;} #asidemain h4{font-size:1.2em;} #asidemain #viewcontacts{text-align:right;} #asidemain #contact-block{width:99%;}#asidemain #contact-block .contact-block-content{width:99%;}#asidemain #contact-block .contact-block-content .contact-block-div{float:left;margin:0 5px 5px 0;width:50px;height:50px;padding:3px;position:relative;} @@ -194,7 +195,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .tab.active a{color:#2e2f2e;text-decoration:none;} .wall-item-outside-wrapper{border:1px solid #a9a9a9;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:6px 1px 10px -2px #111111;-o-box-shadow:6px 1px 10px -2px #111111;-webkit-box-shadow:6px 1px 10px -2px #111111;-ms-box-shadow:6px 1px 10px -2px #111111;box-shadow:6px 1px 10px -2px #111111;}.wall-item-outside-wrapper.comment{margin-top:5px;} .wall-item-content-wrapper{position:relative;padding:0.75em;width:auto;} -.wall-item-outside-wrapper .wall-item-comment-wrapper{} +.wall-item-outside-wrapper .wall-item-comment-wrapper{}.wall-item-outside-wrapper .wall-item-comment-wrapper .preview{border:0;-o-border-radius:0px;-webkit-border-radius:0px;-moz-border-radius:0px;-ms-border-radius:0px;border-radius:0px;} .shiny{background:#2e3436;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} .wall-outside-wrapper .shiny{-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} .heart{color:red;} @@ -202,7 +203,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm [id^="tread-wrapper"],[class^="tread-wrapper"]{margin:1.2em 0 0 0;padding:0px;} .wall-item-photo-menu{display:none;} .wall-item-photo-menu-button{display:none;text-indent:-99999px;background:#555753 url(dark/menu-user-pin.jpg) no-repeat 75px center;position:absolute;overflow:hidden;width:90px;height:20px;top:85px;left:0;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;} -.wall-item-info{float:left;width:8em;} +.wall-item-info{float:left;width:8em;position:relative;} .wall-item-photo-wrapper{width:80px;height:80px;position:relative;padding:5px;background-color:#555753;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} [class^="wall-item-tools"] *{}[class^="wall-item-tools"] *>*{} .wall-item-tools{float:right;opacity:0.4;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;}.wall-item-tools:hover{opacity:1;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;} @@ -212,9 +213,9 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .wall-item-body{margin:15px 10px 10px 0px;text-align:left;overflow-x:auto;} .wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;} .wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#888b85;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;} -.wall-item-author,.wall-item-actions-author,.wall-item-ago{clear:left;float:left;color:#eeeecc;line-height:1;display:inline-block;font-size:0.75em;margin:0.5em auto 0;} -.wall-item-author,.wall-item-actions-author{margin:0.5em auto 0;font-size:0.75em;font-weight:bold;} -.wall-item-location{margin-top:15px;width:100px;overflow:hidden;-moz-text-overflow:ellipsis;-ms-text-verflow:ellipsis;-o-text-overflow:ellipsis;-webkit-text-overflow:ellipsis;text-overflow:ellipsis;}.wall-item-location .icon{float:left;} +.wall-item-author,.wall-item-actions-author,.wall-item-ago{color:#eeeecc;line-height:1;display:inline-block;font-size:x-small;margin:0.5em auto;font-weight:bold;} +.comment-edit-preview{width:auto;margin:auto auto auto -2em;}.comment-edit-preview.wall-item-author,.comment-edit-preview.wall-item-actions-author,.comment-edit-preview.wall-item-ago{font-size:smaller;} +.wall-item-location{margin-top:2em;width:6em;overflow:hidden;-moz-text-overflow:ellipsis;-ms-text-verflow:ellipsis;-o-text-overflow:ellipsis;-webkit-text-overflow:ellipsis;text-overflow:ellipsis;}.wall-item-location .icon{float:left;} .wall-item-location>a,.wall-item-location .smalltext{margin-left:25px;font-size:0.7em;display:block;} .wall-item-location>br{display:none;} .wallwall .wwto{left:5px;margin:0;position:absolute;top:75px;z-index:10001;width:30px;height:30px;}.wallwall .wwto img{width:30px !important;height:30px !important;} @@ -228,10 +229,9 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .wall-item-outside-wrapper.comment{margin-left:5em;}.wall-item-outside-wrapper.comment .wall-item-photo{width:40px !important;height:40px !important;} .wall-item-outside-wrapper.comment .wall-item-photo-wrapper{width:40px;height:40px;} .wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:50px;top:45px;background-position:35px center;} -.wall-item-outside-wrapper.comment .wall-item-body{margin-left:10px;} .wall-item-outside-wrapper.comment .wall-item-author{margin-left:0.2em;} .wall-item-outside-wrapper.comment .wall-item-photo-menu{min-width:50px;top:60px;} -.comment-wwedit-wrapper{} +.comment-wwedit-wrapper{border:1px solid #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:5px;} .comment-edit-wrapper{border-top:1px #aaa solid;} [class^="comment-edit-bb"]{margin:0px;padding:0px;list-style:none;list-style-position:inside;display:none;margin:-40px 0 5px 60px;width:75%;}[class^="comment-edit-bb"]>li{display:inline-block;margin:0 10px 0 0;visibility:none;} .comment-wwedit-wrapper img,.comment-edit-wrapper img{width:20px;height:20px;} @@ -255,27 +255,28 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} .photos{height:auto;overflow:auto;} #photo-top-links{margin-bottom:30px;} .photo-album-image-wrapper,.photo-top-image-wrapper{float:left;-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;background-color:#222222;color:#2e2f2e;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding-bottom:30px;position:relative;margin:0 10px 10px 0;} -#photo-photo{max-width:100%;}#photo-photo img{max-width:100%;} +#photo-photo{margin:auto auto 5em 20%;}#photo-photo img{max-width:50%;} .photo-top-image-wrapper a:hover,#photo-photo a:hover,.photo-album-image-wrapper a:hover{border-bottom:0;} .photo-top-photo,.photo-album-photo{-o-border-radius:5px 5px 0 0;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;-ms-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;} .photo-top-album-name,.caption{position:absolute;bottom:0;padding:0 5px;} -#photo-photo{position:relative;margin:5px 45%;} -#photo-prev-link,#photo-next-link{position:absolute;width:50px;height:150px;background:#ffffff center center no-repeat;opacity:0;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;z-index:10;top:175px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}#photo-prev-link:hover,#photo-next-link:hover{opacity:0.6;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;} +#photo-prev-link,#photo-next-link{position:absolute;width:50px;height:200px;background:#ffffff center center no-repeat;opacity:0;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;z-index:10;top:15em;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}#photo-prev-link:hover,#photo-next-link:hover{opacity:0.6;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;} #photo-prev-link .icon,#photo-next-link .icon{display:none;} -#photo-prev-link{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAALpQTFRF////AAAAQEBAZmZmVVVVSUlJTU1NXV1dVVVVTk5OW1tbWlpaWFhPWFhQU1pTVVVVVlZSVVlRVlZTVFdUVFdUVVdTVFZSVldUVldSVldSVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVhTVVdTVVdTVVdTVVdT3XYY/AAAAD10Uk5TAAEEBQYHCgsMDQ4RHSAlP0FFR1hee3+JnqSqq6ytrq+wsbKztLW2t7y9vr/AwcLDxMXGx8jU1dng7O/3+TmOwVsAAADASURBVCjPddPXEoIwEAXQINh7Q8WKYu+95v9/S0dxZxNy83hgMpvdu0Jox642r25GVxGfys+5540sZV3jyY/lWeVxyDLg7AR/lhXOI+KZZeRFgvGQeMnY9olXScYD4jXnPvHGzNsU4x7xjnGsa+YO8T7NnukRHzgXiY/KNKiUkzqkZ8ivnDoKD/xfBvdbbXM9sH70Xtgf2E/YfzgvOF+YB5gf5cPcAfmsgTy3QP5vYF8akf36XvXIRhZPlPyLWxBvNENWsZXDKukAAAAASUVORK5CYII=");left:22%;} -#photo-next-link{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAKVQTFRF////gICAQEBAZmZmVVVVSUlJYGBgVVVVTU1NXV1dVVVVWVlZU1hTVlZSVlZTVlZTVVlRVVhSVFdUVlhTVVdTVFZTVVdTVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdT8E3YQQAAADZ0Uk5TAAIEBQYHCAkKCwwUN0FER0hOW2uNjqWqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCxcjT3PP3B0dhfwAAANlJREFUKM910+cSgjAQRtEIomAXu4iIYge7ef9Hs+ZzN4b9eW4mk1kGIaqdU9wQf2Nf5XPSiu4d+Z6jp/n54/KghZ40h5ZymbFQGCCkLg3WKC+MEfYs2AHCrszCBGHLQ5gXpggbFooRwrrEwgxhxUOcE5w5wtJiYYHQZjt0EuUhX3r19vU7Y++ozgeMD7i/buYhYTcDj8gz3RQ8prwHB/aPyzvwhPLWzBtwSLi0Bk8pr8BR0cgzwiIycw0cUxZ9xXOH7VZ9vAVn4X840Vh4F9Pp1w/gZ92mpesDuLpM+1blc68AAAAASUVORK5CYII=");left:44%;} +#photo-prev-link{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAALpQTFRF////AAAAQEBAZmZmVVVVSUlJTU1NXV1dVVVVTk5OW1tbWlpaWFhPWFhQU1pTVVVVVlZSVVlRVlZTVFdUVFdUVVdTVFZSVldUVldSVldSVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVhTVVdTVVdTVVdTVVdT3XYY/AAAAD10Uk5TAAEEBQYHCgsMDQ4RHSAlP0FFR1hee3+JnqSqq6ytrq+wsbKztLW2t7y9vr/AwcLDxMXGx8jU1dng7O/3+TmOwVsAAADASURBVCjPddPXEoIwEAXQINh7Q8WKYu+95v9/S0dxZxNy83hgMpvdu0Jox642r25GVxGfys+5540sZV3jyY/lWeVxyDLg7AR/lhXOI+KZZeRFgvGQeMnY9olXScYD4jXnPvHGzNsU4x7xjnGsa+YO8T7NnukRHzgXiY/KNKiUkzqkZ8ivnDoKD/xfBvdbbXM9sH70Xtgf2E/YfzgvOF+YB5gf5cPcAfmsgTy3QP5vYF8akf36XvXIRhZPlPyLWxBvNENWsZXDKukAAAAASUVORK5CYII=");left:5%;} +#photo-next-link{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAKVQTFRF////gICAQEBAZmZmVVVVSUlJYGBgVVVVTU1NXV1dVVVVWVlZU1hTVlZSVlZTVlZTVVlRVVhSVFdUVlhTVVdTVFZTVVdTVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdT8E3YQQAAADZ0Uk5TAAIEBQYHCAkKCwwUN0FER0hOW2uNjqWqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCxcjT3PP3B0dhfwAAANlJREFUKM910+cSgjAQRtEIomAXu4iIYge7ef9Hs+ZzN4b9eW4mk1kGIaqdU9wQf2Nf5XPSiu4d+Z6jp/n54/KghZ40h5ZymbFQGCCkLg3WKC+MEfYs2AHCrszCBGHLQ5gXpggbFooRwrrEwgxhxUOcE5w5wtJiYYHQZjt0EuUhX3r19vU7Y++ozgeMD7i/buYhYTcDj8gz3RQ8prwHB/aPyzvwhPLWzBtwSLi0Bk8pr8BR0cgzwiIycw0cUxZ9xXOH7VZ9vAVn4X840Vh4F9Pp1w/gZ92mpesDuLpM+1blc68AAAAASUVORK5CYII=");left:50%;} #photo-prev-link a,#photo-next-link a{display:block;width:100%;height:100%;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;overflow:hidden;text-indent:-900000px;} #photos-upload-spacer,#photos-upload-new-wrapper,#photos-upload-exist-wrapper{margin-bottom:1em;} #photos-upload-existing-album-text,#photos-upload-newalbum-div{background-color:#555753;color:#eeeeee;padding:1px;} #photos-upload-album-select,#photos-upload-newalbum{width:99%;} #photos-upload-perms-menu{text-align:right;} -#photo-edit-caption,#photo-edit-newtag,#photo-edit-albumname{float:left;margin-bottom:25px;} #photo-edit-link-wrap{margin-bottom:15px;} -#photo-edit-caption,#photo-edit-newtag{width:100%;} -#photo-like-div{margin-bottom:25px;} -#photo-edit-delete-button{margin-left:200px;} +#photo-edit-perms{width:auto;} +#photo-edit-rotate-label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #2e2f2e;padding:3px 5px;background:#eeeecc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;} +#photo-like-div{float:left;margin:auto 0 0;width:2em;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:1px solid #eeeecc;} +.wall-item-like-buttons>*{display:inline;} +#photo-edit-delete-button{margin:auto auto auto 1em;} #photo-edit-end{margin-bottom:35px;} #photo-caption{font-size:110%;font-weight:bold;margin-top:15px;margin-bottom:15px;} +#wall-photo-container{margin:0 auto 1em 4em;width:90%;} .prvmail-text{width:100%;} #prvmail-subject{width:100%;color:#2e2f2e;background:#eeeecc;} #prvmail-submit-wrapper{margin-top:10px;} @@ -389,8 +390,8 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} .fc-state-highlight{background:#eeeecc;color:#2e2f2e;} .directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;} #group-sidebar{margin-bottom:10px;} -.group-selected,.nets-selected,.fileas-selected{background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} -.group-selected a,.nets-selected a,.fileas-selected a{color:#2e2f2e;text-decoration:none;} +.categories-selected,.group-selected,.nets-selected,.fileas-selected{color:#2e2f2e;background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.categories-selected:hover,.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} +.categories-selected a,.group-selected a,.nets-selected a,.fileas-selected a{color:#2e2f2e;text-decoration:none;} .groupsideedit{margin-right:10px;} #sidebar-group-ul{padding-left:0;} #sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;} @@ -402,8 +403,9 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} #sidebar-new-group:hover{} #sidebar-new-group:active{position:relative;top:1px;} #side-peoplefind-url{border:1px solid #999999;margin-right:3px;width:75%;} -.nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.nets-ul li{margin:10px 0 0;} -.nets-link,.nets-all{margin-left:0px;} +.categories-ul,.nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.categories-ul li,.nets-ul li{margin:10px 0 0;} +.categories-link,.nets-link,.nets-all{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin-left:0px;}.categories-link:active,.nets-link:active,.nets-all:active,.categories-link:hover,.nets-link:hover,.nets-all:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} +.categories-link a,.nets-link a,.nets-all a{border:0;text-decoration:none;} #netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;} #pending-update{float:right;color:white;font-weight:bold;background-color:red;padding:0 0.3em;} .admin.linklist{border:0;padding:0;} @@ -513,6 +515,7 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} .type-unkn{background-position:-80px 0;} .cc-license{margin-top:100px;font-size:0.7em;} footer{display:block;clear:both;} +#sectionfooter{margin:1em 0 1em 0;} #profile-jot-text{height:20px;color:#eeeecc;background:#2e2f2e;border:1px solid #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;width:99.5%;} #photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#2e2f2e;color:#eeeecc;} #profile-jot-acl-wrapper{margin:0 10px;border:1px solid #555753;border-top:0;font-size:small;} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index 000918a9b..fb0fbc6df 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -184,7 +184,7 @@ blockquote { .borders(1px, solid, darken(@main_alt_colour, 33%)); .rounded_corners; } -label { +.label () { width: 38%; display: inline-block; font-size: small; @@ -195,6 +195,9 @@ label { color: darken(@main_alt_colour, 86.5%); .box_shadow(3px, 3px, 5px); } +label { + .label; +} input { .box(250px, 25px); .borders(1px, solid, darken(@main_alt_colour, 33.5%)); @@ -312,7 +315,7 @@ h6 { [id$="-desc"] { color: @main_colour; background: @bg_colour; - .borders(3px, outset, @main_colour); + .borders(3px, ridge, @main_colour); .rounded_corners; // .box_shadow(3px, 3px, 5px); margin: 3px 10px 7px 0; @@ -353,6 +356,11 @@ h6 { font-style: italic; font-size: smaller; } +.like-rotator { + vertical-align: middle; + text-align: center; + margin: 1px; +} /** @@ -510,7 +518,8 @@ nav .nav-link { background-position: -44px -190px; } } -#nav-login-link, #nav-logout-link { +#nav-login-link, +#nav-logout-link { background-position: 0 -88px; &:hover { background-position: -22px -88px; @@ -669,11 +678,10 @@ nav #nav-notifications-linkmenu { #mini-search-text { background: white; color: @bg_colour; - margin: 8px; } #search-text { .borders(1px, solid, @main_alt_colour); - margin: 8px 0; + margin: 5px 0; } #mini-search-text { font-size: 8pt; @@ -771,7 +779,7 @@ nav #nav-notifications-linkmenu { margin: 0px; padding: 0px; font-size: small; - line-height: 1.1; + line-height: 1.2; .borders(3px, solid, @link_colour); .rounded_corners; z-index: 100000; @@ -880,10 +888,12 @@ nav #nav-notifications-linkmenu { padding-bottom: 3px; } #profile-photo-wrapper { - margin: 20px; - img { - .box_shadow(3px, 3px, 10px, 0); - } + margin: 20px 0; + background-color: @menu_bg_colour; + padding: 5px; + .box(175px, 175px); + .rounded_corners; + .box_shadow(3px, 3px, 10px, 0); } } #asidemain { @@ -1298,6 +1308,10 @@ nav #nav-notifications-linkmenu { } .wall-item-outside-wrapper .wall-item-comment-wrapper { /*margin-left: 90px;*/ + .preview { + border: 0; + .rounded_corners(0px); + } } .shiny { background: @shiny_colour; @@ -1335,6 +1349,7 @@ nav #nav-notifications-linkmenu { .wall-item-info { float: left; width: 8em; + position: relative; } .wall-item-photo-wrapper { .box(80px, 80px); @@ -1401,23 +1416,25 @@ nav #nav-notifications-linkmenu { .wall-item-author, .wall-item-actions-author, .wall-item-ago { - clear: left; - float: left; color: @main_colour; line-height: 1; display: inline-block; - font-size: 0.75em; - margin: 0.5em auto 0; -} -.wall-item-author, -.wall-item-actions-author { - margin: 0.5em auto 0; - font-size: 0.75em; + font-size: x-small; + margin: 0.5em auto; font-weight: bold; } +.comment-edit-preview { + width: auto; + margin: auto auto auto -2em; + &.wall-item-author, + &.wall-item-actions-author, + &.wall-item-ago { + font-size: smaller; + } +} .wall-item-location { - margin-top: 15px; - width: 100px; + margin-top: 2em; + width: 6em; overflow: hidden; .text_overflow; .icon { @@ -1517,9 +1534,6 @@ nav #nav-notifications-linkmenu { top: 45px; background-position: 35px center; } - .wall-item-body { - margin-left: 10px; - } .wall-item-author { margin-left: 0.2em; } @@ -1529,7 +1543,9 @@ nav #nav-notifications-linkmenu { } } .comment-wwedit-wrapper { - /*margin: 30px 0px 0px 80px;*/ + .borders(1px, solid, @main_colour); + .rounded_corners; + margin: 5px; } .comment-edit-wrapper { border-top: 1px #aaa solid; @@ -1679,9 +1695,9 @@ div { margin: 0 10px 10px 0; } #photo-photo { - max-width: 100%; + margin: auto auto 5em 20%; img { - max-width: 100%; + max-width: 50%; } } .photo-top-image-wrapper a:hover, @@ -1689,7 +1705,8 @@ div { .photo-album-image-wrapper a:hover { border-bottom: 0; } -.photo-top-photo, .photo-album-photo { +.photo-top-photo, +.photo-album-photo { .rounded_corners(5px 5px 0 0); } .photo-top-album-name, @@ -1698,21 +1715,16 @@ div { bottom: 0; padding: 0 5px; } -#photo-photo { - position: relative; - // float: left; - margin: 5px 45%; -} #photo-prev-link, #photo-next-link { position: absolute; // .box(30%, 100%); - .box(50px, 150px); + .box(50px, 200px); background: white center center no-repeat; opacity: 0; .transition(all, 0.5s); z-index: 10; - top: 175px; + top: 15em; .rounded_corners; &:hover { opacity: 0.6; @@ -1725,12 +1737,12 @@ div { #photo-prev-link { // background-image: url(dark/prev.png); background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAALpQTFRF////AAAAQEBAZmZmVVVVSUlJTU1NXV1dVVVVTk5OW1tbWlpaWFhPWFhQU1pTVVVVVlZSVVlRVlZTVFdUVFdUVVdTVFZSVldUVldSVldSVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVhTVVdTVVdTVVdTVVdT3XYY/AAAAD10Uk5TAAEEBQYHCgsMDQ4RHSAlP0FFR1hee3+JnqSqq6ytrq+wsbKztLW2t7y9vr/AwcLDxMXGx8jU1dng7O/3+TmOwVsAAADASURBVCjPddPXEoIwEAXQINh7Q8WKYu+95v9/S0dxZxNy83hgMpvdu0Jox642r25GVxGfys+5540sZV3jyY/lWeVxyDLg7AR/lhXOI+KZZeRFgvGQeMnY9olXScYD4jXnPvHGzNsU4x7xjnGsa+YO8T7NnukRHzgXiY/KNKiUkzqkZ8ivnDoKD/xfBvdbbXM9sH70Xtgf2E/YfzgvOF+YB5gf5cPcAfmsgTy3QP5vYF8akf36XvXIRhZPlPyLWxBvNENWsZXDKukAAAAASUVORK5CYII="); - left: 22%; + left: 5%; } #photo-next-link { // background-image: url(dark/next.png); background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAKVQTFRF////gICAQEBAZmZmVVVVSUlJYGBgVVVVTU1NXV1dVVVVWVlZU1hTVlZSVlZTVlZTVVlRVVhSVFdUVlhTVVdTVFZTVVdTVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdT8E3YQQAAADZ0Uk5TAAIEBQYHCAkKCwwUN0FER0hOW2uNjqWqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCxcjT3PP3B0dhfwAAANlJREFUKM910+cSgjAQRtEIomAXu4iIYge7ef9Hs+ZzN4b9eW4mk1kGIaqdU9wQf2Nf5XPSiu4d+Z6jp/n54/KghZ40h5ZymbFQGCCkLg3WKC+MEfYs2AHCrszCBGHLQ5gXpggbFooRwrrEwgxhxUOcE5w5wtJiYYHQZjt0EuUhX3r19vU7Y++ozgeMD7i/buYhYTcDj8gz3RQ8prwHB/aPyzvwhPLWzBtwSLi0Bk8pr8BR0cgzwiIycw0cUxZ9xXOH7VZ9vAVn4X840Vh4F9Pp1w/gZ92mpesDuLpM+1blc68AAAAASUVORK5CYII="); - left: 44%; + left: 50%; } #photo-prev-link a, #photo-next-link a { @@ -1761,21 +1773,35 @@ div { #photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname { - float: left; - margin-bottom: 25px; + } #photo-edit-link-wrap { margin-bottom: 15px; } #photo-edit-caption, #photo-edit-newtag { - width: 100%; + +} +#photo-edit-perms { + width: auto; +} +#photo-edit-rotate-label { + .label; } #photo-like-div { - margin-bottom: 25px; + float: left; + margin: auto 0 0; + width: 2em; + .rounded_corners; + .borders; +} +.wall-item-like-buttons { + > * { + display: inline; + } } #photo-edit-delete-button { - margin-left: 200px; + margin: auto auto auto 1em; } #photo-edit-end { margin-bottom: 35px; @@ -1786,6 +1812,10 @@ div { margin-top: 15px; margin-bottom: 15px; } +#wall-photo-container { + margin: 0 auto 1em 4em; + width: 90%; +} /** @@ -2333,23 +2363,25 @@ div { #group-sidebar { margin-bottom: 10px; } +.categories-selected, .group-selected, .nets-selected, .fileas-selected { // padding: 4px; - // color: @bg_colour; + color: @bg_colour; // background: @main_colour; // .borders(1px, solid, @link_colour); .multibutton_active; } -// .group-selected:hover, -// .nets-selected:hover, -// .fileas-selected:hover { +.categories-selected:hover, +.group-selected:hover, +.nets-selected:hover, +.fileas-selected:hover { // padding: 4px; -// color: @link_colour; + // color: @bg_colour; // background: @bg_colour; // .borders(1px, solid, @link_colour); -// } +} .groupsideedit { margin-right: 10px; } @@ -2396,14 +2428,18 @@ div { margin-right: 3px; width: 75%; } +.categories-ul, .nets-ul { .list_reset; li { margin: 10px 0 0; } } +.categories-link, .nets-link, .nets-all { + .multibutton; + .rounded_corners; margin-left: 0px; } #netsearch-box { @@ -2949,6 +2985,9 @@ footer { display: block; clear: both; } +#sectionfooter { + margin: 1em 0 1em 0; +} #profile-jot-text { height: 20px; color: @main_colour; diff --git a/view/theme/dispy/group_side.tpl b/view/theme/dispy/group_side.tpl index 10ecec2e8..be8e23de0 100644 --- a/view/theme/dispy/group_side.tpl +++ b/view/theme/dispy/group_side.tpl @@ -5,10 +5,9 @@ <ul id="sidebar-group-ul"> {{ for $groups as $group }} <li class="sidebar-group-li"> - <a href="$group.href" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}">$group.text</a> + <a href="$group.href" class="sidebar-group-element {{ if $group.selected }}group-selected{{ else }}group-other{{ endif }}">$group.text</a> {{ if $group.edit }} - <a - class="groupsideedit" + <a class="groupsideedit" href="$group.edit.href" title="$group.edit.title"><span class="icon small-pencil"></span></a> {{ endif }} {{ if $group.cid }} diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index bd3da3189..c9f7ef95a 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -58,7 +58,7 @@ h6{font-size:xx-small;} #articlemain{width:100%;height:100%;margin:0 auto;} .button{color:#111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#111111;font-weight:bold;} #profile-listing-desc a{color:#eeeeec;font-weight:bold;} -[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#2e3436;border:3px outset #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} +[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#2e3436;border:3px ridge #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} #item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;} .intro-approve-as-friend-desc{margin-top:10px;} .intro-desc{margin-bottom:20px;font-weight:bold;} @@ -66,6 +66,7 @@ h6{font-size:xx-small;} #settings-nickname-desc{background:#2e3436;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:1px solid #111111;padding:5px;color:#eeeeec;} .contactname,.contact-name{font-weight:bold;font-size:smaller;} .contact-details{font-style:italic;font-size:smaller;} +.like-rotator{vertical-align:middle;text-align:center;margin:1px;} #asidemain .field{overflow:hidden;width:200px;} #login-extra-links{overflow:auto !important;padding-top:60px !important;width:100% !important;}#login-extra-links a{margin-right:20px;} #login_standard{display:block !important;float:none !important;height:100% !important;position:relative !important;width:100% !important;}#login_standard .field label{width:200px !important;} @@ -106,8 +107,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;} .floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(light/icons.png) -190px -60px no-repeat;} .search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#2e3436;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} -#search-text,#mini-search-text{background:white;color:#111111;margin:8px;} -#search-text{border:1px solid #999999;margin:8px 0;} +#search-text,#mini-search-text{background:white;color:#111111;} +#search-text{border:1px solid #999999;margin:5px 0;} #mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;} #scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;} #user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:75%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;} @@ -121,7 +122,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #intro-update{background-position:-120px 0px;} #lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;} #language-selector{position:fixed;bottom:2px;left:52px;z-index:10;} -.menu-popup{position:absolute;display:none;background:white;color:#111111;margin:0px;padding:0px;font-size:small;line-height:1.1;border:3px solid #3465a4;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#111111;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeeec;background-color:#3465a4;} +.menu-popup{position:absolute;display:none;background:white;color:#111111;margin:0px;padding:0px;font-size:small;line-height:1.2;border:3px solid #3465a4;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#111111;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeeec;background-color:#3465a4;} .menu-popup .menu-sep{border-top:1px solid #4e4f4e;} .menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;} .menu-popup .empty{padding:5px;text-align:center;color:#ffffff;} @@ -135,7 +136,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #asidemain{float:left;font-size:small;margin:20px 0 20px 35px;width:25%;display:inline;} #asideright,#asideleft{display:none;} .vcard .fn{font-size:1.5em;font-weight:bold;border-bottom:1px solid #284d7d;padding-bottom:3px;} -.vcard #profile-photo-wrapper{margin:20px;}.vcard #profile-photo-wrapper img{-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;} +.vcard #profile-photo-wrapper{margin:20px 0;background-color:#555753;padding:5px;width:175px;height:175px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;} #asidemain h4{font-size:1.2em;} #asidemain #viewcontacts{text-align:right;} #asidemain #contact-block{width:99%;}#asidemain #contact-block .contact-block-content{width:99%;}#asidemain #contact-block .contact-block-content .contact-block-div{float:left;margin:0 5px 5px 0;width:50px;height:50px;padding:3px;position:relative;} @@ -194,7 +195,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .tab.active a{color:#eeeeec;text-decoration:none;} .wall-item-outside-wrapper{border:1px solid #545454;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:6px 1px 10px -2px #111111;-o-box-shadow:6px 1px 10px -2px #111111;-webkit-box-shadow:6px 1px 10px -2px #111111;-ms-box-shadow:6px 1px 10px -2px #111111;box-shadow:6px 1px 10px -2px #111111;}.wall-item-outside-wrapper.comment{margin-top:5px;} .wall-item-content-wrapper{position:relative;padding:0.75em;width:auto;} -.wall-item-outside-wrapper .wall-item-comment-wrapper{} +.wall-item-outside-wrapper .wall-item-comment-wrapper{}.wall-item-outside-wrapper .wall-item-comment-wrapper .preview{border:0;-o-border-radius:0px;-webkit-border-radius:0px;-moz-border-radius:0px;-ms-border-radius:0px;border-radius:0px;} .shiny{background:#f2f2c3;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} .wall-outside-wrapper .shiny{-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} .heart{color:red;} @@ -202,7 +203,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm [id^="tread-wrapper"],[class^="tread-wrapper"]{margin:1.2em 0 0 0;padding:0px;} .wall-item-photo-menu{display:none;} .wall-item-photo-menu-button{display:none;text-indent:-99999px;background:#555753 url(light/menu-user-pin.jpg) no-repeat 75px center;position:absolute;overflow:hidden;width:90px;height:20px;top:85px;left:0;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;} -.wall-item-info{float:left;width:8em;} +.wall-item-info{float:left;width:8em;position:relative;} .wall-item-photo-wrapper{width:80px;height:80px;position:relative;padding:5px;background-color:#555753;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} [class^="wall-item-tools"] *{}[class^="wall-item-tools"] *>*{} .wall-item-tools{float:right;opacity:0.4;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;}.wall-item-tools:hover{opacity:1;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;} @@ -212,9 +213,9 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .wall-item-body{margin:15px 10px 10px 0px;text-align:left;overflow-x:auto;} .wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;} .wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#111111;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;} -.wall-item-author,.wall-item-actions-author,.wall-item-ago{clear:left;float:left;color:#111111;line-height:1;display:inline-block;font-size:0.75em;margin:0.5em auto 0;} -.wall-item-author,.wall-item-actions-author{margin:0.5em auto 0;font-size:0.75em;font-weight:bold;} -.wall-item-location{margin-top:15px;width:100px;overflow:hidden;-moz-text-overflow:ellipsis;-ms-text-verflow:ellipsis;-o-text-overflow:ellipsis;-webkit-text-overflow:ellipsis;text-overflow:ellipsis;}.wall-item-location .icon{float:left;} +.wall-item-author,.wall-item-actions-author,.wall-item-ago{color:#111111;line-height:1;display:inline-block;font-size:x-small;margin:0.5em auto;font-weight:bold;} +.comment-edit-preview{width:auto;margin:auto auto auto -2em;}.comment-edit-preview.wall-item-author,.comment-edit-preview.wall-item-actions-author,.comment-edit-preview.wall-item-ago{font-size:smaller;} +.wall-item-location{margin-top:2em;width:6em;overflow:hidden;-moz-text-overflow:ellipsis;-ms-text-verflow:ellipsis;-o-text-overflow:ellipsis;-webkit-text-overflow:ellipsis;text-overflow:ellipsis;}.wall-item-location .icon{float:left;} .wall-item-location>a,.wall-item-location .smalltext{margin-left:25px;font-size:0.7em;display:block;} .wall-item-location>br{display:none;} .wallwall .wwto{left:5px;margin:0;position:absolute;top:75px;z-index:10001;width:30px;height:30px;}.wallwall .wwto img{width:30px !important;height:30px !important;} @@ -228,10 +229,9 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .wall-item-outside-wrapper.comment{margin-left:5em;}.wall-item-outside-wrapper.comment .wall-item-photo{width:40px !important;height:40px !important;} .wall-item-outside-wrapper.comment .wall-item-photo-wrapper{width:40px;height:40px;} .wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:50px;top:45px;background-position:35px center;} -.wall-item-outside-wrapper.comment .wall-item-body{margin-left:10px;} .wall-item-outside-wrapper.comment .wall-item-author{margin-left:0.2em;} .wall-item-outside-wrapper.comment .wall-item-photo-menu{min-width:50px;top:60px;} -.comment-wwedit-wrapper{} +.comment-wwedit-wrapper{border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:5px;} .comment-edit-wrapper{border-top:1px #aaa solid;} [class^="comment-edit-bb"]{margin:0px;padding:0px;list-style:none;list-style-position:inside;display:none;margin:-40px 0 5px 60px;width:75%;}[class^="comment-edit-bb"]>li{display:inline-block;margin:0 10px 0 0;visibility:none;} .comment-wwedit-wrapper img,.comment-edit-wrapper img{width:20px;height:20px;} @@ -255,27 +255,28 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} .photos{height:auto;overflow:auto;} #photo-top-links{margin-bottom:30px;} .photo-album-image-wrapper,.photo-top-image-wrapper{float:left;-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;background-color:#eeeeec;color:#111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding-bottom:30px;position:relative;margin:0 10px 10px 0;} -#photo-photo{max-width:100%;}#photo-photo img{max-width:100%;} +#photo-photo{margin:auto auto 5em 20%;}#photo-photo img{max-width:50%;} .photo-top-image-wrapper a:hover,#photo-photo a:hover,.photo-album-image-wrapper a:hover{border-bottom:0;} .photo-top-photo,.photo-album-photo{-o-border-radius:5px 5px 0 0;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;-ms-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;} .photo-top-album-name,.caption{position:absolute;bottom:0;padding:0 5px;} -#photo-photo{position:relative;margin:5px 45%;} -#photo-prev-link,#photo-next-link{position:absolute;width:50px;height:150px;background:#ffffff center center no-repeat;opacity:0;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;z-index:10;top:175px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}#photo-prev-link:hover,#photo-next-link:hover{opacity:0.6;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;} +#photo-prev-link,#photo-next-link{position:absolute;width:50px;height:200px;background:#ffffff center center no-repeat;opacity:0;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;z-index:10;top:15em;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}#photo-prev-link:hover,#photo-next-link:hover{opacity:0.6;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;} #photo-prev-link .icon,#photo-next-link .icon{display:none;} -#photo-prev-link{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAALpQTFRF////AAAAQEBAZmZmVVVVSUlJTU1NXV1dVVVVTk5OW1tbWlpaWFhPWFhQU1pTVVVVVlZSVVlRVlZTVFdUVFdUVVdTVFZSVldUVldSVldSVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVhTVVdTVVdTVVdTVVdT3XYY/AAAAD10Uk5TAAEEBQYHCgsMDQ4RHSAlP0FFR1hee3+JnqSqq6ytrq+wsbKztLW2t7y9vr/AwcLDxMXGx8jU1dng7O/3+TmOwVsAAADASURBVCjPddPXEoIwEAXQINh7Q8WKYu+95v9/S0dxZxNy83hgMpvdu0Jox642r25GVxGfys+5540sZV3jyY/lWeVxyDLg7AR/lhXOI+KZZeRFgvGQeMnY9olXScYD4jXnPvHGzNsU4x7xjnGsa+YO8T7NnukRHzgXiY/KNKiUkzqkZ8ivnDoKD/xfBvdbbXM9sH70Xtgf2E/YfzgvOF+YB5gf5cPcAfmsgTy3QP5vYF8akf36XvXIRhZPlPyLWxBvNENWsZXDKukAAAAASUVORK5CYII=");left:22%;} -#photo-next-link{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAKVQTFRF////gICAQEBAZmZmVVVVSUlJYGBgVVVVTU1NXV1dVVVVWVlZU1hTVlZSVlZTVlZTVVlRVVhSVFdUVlhTVVdTVFZTVVdTVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdT8E3YQQAAADZ0Uk5TAAIEBQYHCAkKCwwUN0FER0hOW2uNjqWqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCxcjT3PP3B0dhfwAAANlJREFUKM910+cSgjAQRtEIomAXu4iIYge7ef9Hs+ZzN4b9eW4mk1kGIaqdU9wQf2Nf5XPSiu4d+Z6jp/n54/KghZ40h5ZymbFQGCCkLg3WKC+MEfYs2AHCrszCBGHLQ5gXpggbFooRwrrEwgxhxUOcE5w5wtJiYYHQZjt0EuUhX3r19vU7Y++ozgeMD7i/buYhYTcDj8gz3RQ8prwHB/aPyzvwhPLWzBtwSLi0Bk8pr8BR0cgzwiIycw0cUxZ9xXOH7VZ9vAVn4X840Vh4F9Pp1w/gZ92mpesDuLpM+1blc68AAAAASUVORK5CYII=");left:44%;} +#photo-prev-link{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAALpQTFRF////AAAAQEBAZmZmVVVVSUlJTU1NXV1dVVVVTk5OW1tbWlpaWFhPWFhQU1pTVVVVVlZSVVlRVlZTVFdUVFdUVVdTVFZSVldUVldSVldSVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVhTVVdTVVdTVVdTVVdT3XYY/AAAAD10Uk5TAAEEBQYHCgsMDQ4RHSAlP0FFR1hee3+JnqSqq6ytrq+wsbKztLW2t7y9vr/AwcLDxMXGx8jU1dng7O/3+TmOwVsAAADASURBVCjPddPXEoIwEAXQINh7Q8WKYu+95v9/S0dxZxNy83hgMpvdu0Jox642r25GVxGfys+5540sZV3jyY/lWeVxyDLg7AR/lhXOI+KZZeRFgvGQeMnY9olXScYD4jXnPvHGzNsU4x7xjnGsa+YO8T7NnukRHzgXiY/KNKiUkzqkZ8ivnDoKD/xfBvdbbXM9sH70Xtgf2E/YfzgvOF+YB5gf5cPcAfmsgTy3QP5vYF8akf36XvXIRhZPlPyLWxBvNENWsZXDKukAAAAASUVORK5CYII=");left:5%;} +#photo-next-link{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAKVQTFRF////gICAQEBAZmZmVVVVSUlJYGBgVVVVTU1NXV1dVVVVWVlZU1hTVlZSVlZTVlZTVVlRVVhSVFdUVlhTVVdTVFZTVVdTVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdT8E3YQQAAADZ0Uk5TAAIEBQYHCAkKCwwUN0FER0hOW2uNjqWqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCxcjT3PP3B0dhfwAAANlJREFUKM910+cSgjAQRtEIomAXu4iIYge7ef9Hs+ZzN4b9eW4mk1kGIaqdU9wQf2Nf5XPSiu4d+Z6jp/n54/KghZ40h5ZymbFQGCCkLg3WKC+MEfYs2AHCrszCBGHLQ5gXpggbFooRwrrEwgxhxUOcE5w5wtJiYYHQZjt0EuUhX3r19vU7Y++ozgeMD7i/buYhYTcDj8gz3RQ8prwHB/aPyzvwhPLWzBtwSLi0Bk8pr8BR0cgzwiIycw0cUxZ9xXOH7VZ9vAVn4X840Vh4F9Pp1w/gZ92mpesDuLpM+1blc68AAAAASUVORK5CYII=");left:50%;} #photo-prev-link a,#photo-next-link a{display:block;width:100%;height:100%;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;overflow:hidden;text-indent:-900000px;} #photos-upload-spacer,#photos-upload-new-wrapper,#photos-upload-exist-wrapper{margin-bottom:1em;} #photos-upload-existing-album-text,#photos-upload-newalbum-div{background-color:#555753;color:#eeeeec;padding:1px;} #photos-upload-album-select,#photos-upload-newalbum{width:99%;} #photos-upload-perms-menu{text-align:right;} -#photo-edit-caption,#photo-edit-newtag,#photo-edit-albumname{float:left;margin-bottom:25px;} #photo-edit-link-wrap{margin-bottom:15px;} -#photo-edit-caption,#photo-edit-newtag{width:100%;} -#photo-like-div{margin-bottom:25px;} -#photo-edit-delete-button{margin-left:200px;} +#photo-edit-perms{width:auto;} +#photo-edit-rotate-label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #eeeeec;padding:3px 5px;background:#cccccc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;} +#photo-like-div{float:left;margin:auto 0 0;width:2em;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:1px solid #111111;} +.wall-item-like-buttons>*{display:inline;} +#photo-edit-delete-button{margin:auto auto auto 1em;} #photo-edit-end{margin-bottom:35px;} #photo-caption{font-size:110%;font-weight:bold;margin-top:15px;margin-bottom:15px;} +#wall-photo-container{margin:0 auto 1em 4em;width:90%;} .prvmail-text{width:100%;} #prvmail-subject{width:100%;color:#eeeeec;background:#111111;} #prvmail-submit-wrapper{margin-top:10px;} @@ -389,8 +390,8 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} .fc-state-highlight{background:#eeeeec;color:#111111;} .directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;} #group-sidebar{margin-bottom:10px;} -.group-selected,.nets-selected,.fileas-selected{background:#2e3436;color:#eeeeec;border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;} -.group-selected a,.nets-selected a,.fileas-selected a{color:#eeeeec;text-decoration:none;} +.categories-selected,.group-selected,.nets-selected,.fileas-selected{color:#111111;background:#2e3436;color:#eeeeec;border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.categories-selected:hover,.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;} +.categories-selected a,.group-selected a,.nets-selected a,.fileas-selected a{color:#eeeeec;text-decoration:none;} .groupsideedit{margin-right:10px;} #sidebar-group-ul{padding-left:0;} #sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;} @@ -402,8 +403,9 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} #sidebar-new-group:hover{} #sidebar-new-group:active{position:relative;top:1px;} #side-peoplefind-url{border:1px solid #666666;margin-right:3px;width:75%;} -.nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.nets-ul li{margin:10px 0 0;} -.nets-link,.nets-all{margin-left:0px;} +.categories-ul,.nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.categories-ul li,.nets-ul li{margin:10px 0 0;} +.categories-link,.nets-link,.nets-all{border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin-left:0px;}.categories-link:active,.nets-link:active,.nets-all:active,.categories-link:hover,.nets-link:hover,.nets-all:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;} +.categories-link a,.nets-link a,.nets-all a{border:0;text-decoration:none;} #netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;} #pending-update{float:right;color:white;font-weight:bold;background-color:red;padding:0 0.3em;} .admin.linklist{border:0;padding:0;} @@ -513,6 +515,7 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} .type-unkn{background-position:-80px 0;} .cc-license{margin-top:100px;font-size:0.7em;} footer{display:block;clear:both;} +#sectionfooter{margin:1em 0 1em 0;} #profile-jot-text{height:20px;color:#666666;background:#cccccc;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;width:99.5%;} #photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#eeeeec;color:#111111;} #profile-jot-acl-wrapper{margin:0 10px;border:1px solid #555753;border-top:0;font-size:small;} diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less index d8bd922cc..045dadba5 100644 --- a/view/theme/dispy/light/style.less +++ b/view/theme/dispy/light/style.less @@ -185,7 +185,7 @@ blockquote { .borders(1px, solid, @main_colour); .rounded_corners; } -label { +.label () { width: 38%; display: inline-block; font-size: small; @@ -196,6 +196,9 @@ label { color: @main_colour; .box_shadow(3px, 3px, 5px); } +label { + .label; +} input { .box(250px, 25px); .borders(1px, solid, darken(@main_alt_colour, 33.5%)); @@ -313,7 +316,7 @@ h6 { [id$="-desc"] { color: @bg_colour; background: @dk_bg_colour; - .borders(3px, outset, @main_colour); + .borders(3px, ridge, @main_colour); .rounded_corners; // .box_shadow(3px, 3px, 5px); margin: 3px 10px 7px 0; @@ -354,6 +357,11 @@ h6 { font-style: italic; font-size: smaller; } +.like-rotator { + vertical-align: middle; + text-align: center; + margin: 1px; +} /** @@ -511,7 +519,8 @@ nav .nav-link { background-position: -44px -190px; } } -#nav-login-link, #nav-logout-link { +#nav-login-link, +#nav-logout-link { background-position: 0 -88px; &:hover { background-position: -22px -88px; @@ -670,11 +679,10 @@ nav #nav-notifications-linkmenu { #mini-search-text { background: white; color: @main_colour; - margin: 8px; } #search-text { .borders(1px, solid, @main_alt_colour); - margin: 8px 0; + margin: 5px 0; } #mini-search-text { font-size: 8pt; @@ -772,7 +780,7 @@ nav #nav-notifications-linkmenu { margin: 0px; padding: 0px; font-size: small; - line-height: 1.1; + line-height: 1.2; .borders(3px, solid, @link_colour); .rounded_corners; z-index: 100000; @@ -881,10 +889,12 @@ nav #nav-notifications-linkmenu { padding-bottom: 3px; } #profile-photo-wrapper { - margin: 20px; - img { - .box_shadow(3px, 3px, 10px, 0); - } + margin: 20px 0; + background-color: @menu_bg_colour; + padding: 5px; + .box(175px, 175px); + .rounded_corners; + .box_shadow(3px, 3px, 10px, 0); } } #asidemain { @@ -1299,6 +1309,10 @@ nav #nav-notifications-linkmenu { } .wall-item-outside-wrapper .wall-item-comment-wrapper { /*margin-left: 90px;*/ + .preview { + border: 0; + .rounded_corners(0px); + } } .shiny { background: @shiny_colour; @@ -1336,6 +1350,7 @@ nav #nav-notifications-linkmenu { .wall-item-info { float: left; width: 8em; + position: relative; } .wall-item-photo-wrapper { .box(80px, 80px); @@ -1402,23 +1417,25 @@ nav #nav-notifications-linkmenu { .wall-item-author, .wall-item-actions-author, .wall-item-ago { - clear: left; - float: left; color: @main_colour; line-height: 1; display: inline-block; - font-size: 0.75em; - margin: 0.5em auto 0; -} -.wall-item-author, -.wall-item-actions-author { - margin: 0.5em auto 0; - font-size: 0.75em; + font-size: x-small; + margin: 0.5em auto; font-weight: bold; } +.comment-edit-preview { + width: auto; + margin: auto auto auto -2em; + &.wall-item-author, + &.wall-item-actions-author, + &.wall-item-ago { + font-size: smaller; + } +} .wall-item-location { - margin-top: 15px; - width: 100px; + margin-top: 2em; + width: 6em; overflow: hidden; .text_overflow; .icon { @@ -1518,9 +1535,6 @@ nav #nav-notifications-linkmenu { top: 45px; background-position: 35px center; } - .wall-item-body { - margin-left: 10px; - } .wall-item-author { margin-left: 0.2em; } @@ -1530,7 +1544,9 @@ nav #nav-notifications-linkmenu { } } .comment-wwedit-wrapper { - /*margin: 30px 0px 0px 80px;*/ + .borders(1px, solid, @main_colour); + .rounded_corners; + margin: 5px; } .comment-edit-wrapper { border-top: 1px #aaa solid; @@ -1680,9 +1696,9 @@ div { margin: 0 10px 10px 0; } #photo-photo { - max-width: 100%; + margin: auto auto 5em 20%; img { - max-width: 100%; + max-width: 50%; } } .photo-top-image-wrapper a:hover, @@ -1690,7 +1706,8 @@ div { .photo-album-image-wrapper a:hover { border-bottom: 0; } -.photo-top-photo, .photo-album-photo { +.photo-top-photo, +.photo-album-photo { .rounded_corners(5px 5px 0 0); } .photo-top-album-name, @@ -1699,21 +1716,16 @@ div { bottom: 0; padding: 0 5px; } -#photo-photo { - position: relative; - // float: left; - margin: 5px 45%; -} #photo-prev-link, #photo-next-link { position: absolute; // .box(30%, 100%); - .box(50px, 150px); + .box(50px, 200px); background: white center center no-repeat; opacity: 0; .transition(all, 0.5s); z-index: 10; - top: 175px; + top: 15em; .rounded_corners; &:hover { opacity: 0.6; @@ -1726,12 +1738,12 @@ div { #photo-prev-link { // background-image: url(light/prev.png); background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAALpQTFRF////AAAAQEBAZmZmVVVVSUlJTU1NXV1dVVVVTk5OW1tbWlpaWFhPWFhQU1pTVVVVVlZSVVlRVlZTVFdUVFdUVVdTVFZSVldUVldSVldSVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVhTVVdTVVdTVVdTVVdT3XYY/AAAAD10Uk5TAAEEBQYHCgsMDQ4RHSAlP0FFR1hee3+JnqSqq6ytrq+wsbKztLW2t7y9vr/AwcLDxMXGx8jU1dng7O/3+TmOwVsAAADASURBVCjPddPXEoIwEAXQINh7Q8WKYu+95v9/S0dxZxNy83hgMpvdu0Jox642r25GVxGfys+5540sZV3jyY/lWeVxyDLg7AR/lhXOI+KZZeRFgvGQeMnY9olXScYD4jXnPvHGzNsU4x7xjnGsa+YO8T7NnukRHzgXiY/KNKiUkzqkZ8ivnDoKD/xfBvdbbXM9sH70Xtgf2E/YfzgvOF+YB5gf5cPcAfmsgTy3QP5vYF8akf36XvXIRhZPlPyLWxBvNENWsZXDKukAAAAASUVORK5CYII="); - left: 22%; + left: 5%; } #photo-next-link { // background-image: url(light/next.png); background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAKVQTFRF////gICAQEBAZmZmVVVVSUlJYGBgVVVVTU1NXV1dVVVVWVlZU1hTVlZSVlZTVlZTVVlRVVhSVFdUVlhTVVdTVFZTVVdTVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdT8E3YQQAAADZ0Uk5TAAIEBQYHCAkKCwwUN0FER0hOW2uNjqWqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCxcjT3PP3B0dhfwAAANlJREFUKM910+cSgjAQRtEIomAXu4iIYge7ef9Hs+ZzN4b9eW4mk1kGIaqdU9wQf2Nf5XPSiu4d+Z6jp/n54/KghZ40h5ZymbFQGCCkLg3WKC+MEfYs2AHCrszCBGHLQ5gXpggbFooRwrrEwgxhxUOcE5w5wtJiYYHQZjt0EuUhX3r19vU7Y++ozgeMD7i/buYhYTcDj8gz3RQ8prwHB/aPyzvwhPLWzBtwSLi0Bk8pr8BR0cgzwiIycw0cUxZ9xXOH7VZ9vAVn4X840Vh4F9Pp1w/gZ92mpesDuLpM+1blc68AAAAASUVORK5CYII="); - left: 44%; + left: 50%; } #photo-prev-link a, #photo-next-link a { @@ -1762,21 +1774,35 @@ div { #photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname { - float: left; - margin-bottom: 25px; + } #photo-edit-link-wrap { margin-bottom: 15px; } #photo-edit-caption, #photo-edit-newtag { - width: 100%; + +} +#photo-edit-perms { + width: auto; +} +#photo-edit-rotate-label { + .label; } #photo-like-div { - margin-bottom: 25px; + float: left; + margin: auto 0 0; + width: 2em; + .rounded_corners; + .borders; +} +.wall-item-like-buttons { + > * { + display: inline; + } } #photo-edit-delete-button { - margin-left: 200px; + margin: auto auto auto 1em; } #photo-edit-end { margin-bottom: 35px; @@ -1787,6 +1813,10 @@ div { margin-top: 15px; margin-bottom: 15px; } +#wall-photo-container { + margin: 0 auto 1em 4em; + width: 90%; +} /** @@ -2334,23 +2364,25 @@ div { #group-sidebar { margin-bottom: 10px; } +.categories-selected, .group-selected, .nets-selected, .fileas-selected { // padding: 4px; - // color: @bg_colour; + color: @main_colour; // background: @dk_bg_colour; // .borders(1px, solid, @hover_colour); .multibutton_active; } -// .group-selected:hover, -// .nets-selected:hover, -// .fileas-selected:hover { +.categories-selected:hover, +.group-selected:hover, +.nets-selected:hover, +.fileas-selected:hover { // padding: 4px; -// color: @link_colour; + // color: @link_colour; // background: @bg_colour; // .borders(1px, solid, @link_colour); -// } +} .groupsideedit { margin-right: 10px; } @@ -2397,14 +2429,18 @@ div { margin-right: 3px; width: 75%; } +.categories-ul, .nets-ul { .list_reset; li { margin: 10px 0 0; } } +.categories-link, .nets-link, .nets-all { + .multibutton; + .rounded_corners; margin-left: 0px; } #netsearch-box { @@ -2950,6 +2986,9 @@ footer { display: block; clear: both; } +#sectionfooter { + margin: 1em 0 1em 0; +} #profile-jot-text { height: 20px; color: darken(@main_alt_colour, 20%); diff --git a/view/theme/dispy/photo_edit.tpl b/view/theme/dispy/photo_edit.tpl new file mode 100644 index 000000000..9e623ba61 --- /dev/null +++ b/view/theme/dispy/photo_edit.tpl @@ -0,0 +1,53 @@ + +<form action="photos/$nickname/$resource_id" method="post" id="photo_edit_form" > + + <input type="hidden" name="item_id" value="$item_id" /> + + <label id="photo-edit-albumname-label" for="photo-edit-albumname">$newalbum</label> + <input id="photo-edit-albumname" type="text" name="albname" value="$album" /> + + <div id="photo-edit-albumname-end"></div> + + <label id="photo-edit-caption-label" for="photo-edit-caption">$capt_label</label> + <input id="photo-edit-caption" type="text" name="desc" value="$caption" /> + + <div id="photo-edit-caption-end"></div> + + <label id="photo-edit-tags-label" for="photo-edit-newtag" >$tag_label</label> + <input name="newtag" id="photo-edit-newtag" title="$help_tags" type="text" /> + + <div id="photo-edit-tags-end"></div> + <div id="photo-edit-rotate-wrapper"> + <div id="photo-edit-rotate-label">$rotate</div> + <input type="checkbox" name="rotate" value="1" /> + </div> + <div id="photo-edit-rotate-end"></div> + + <div id="photo-edit-perms" class="photo-edit-perms" > + <a href="#photo-edit-perms-select" + id="photo-edit-perms-menu" + class="button" + title="$permissions"/><span id="jot-perms-icon" + class="icon $lockstate" ></span>$permissions</a> + <div id="photo-edit-perms-menu-end"></div> + + <div style="display: none;"> + <div id="photo-edit-perms-select" > + $aclselect + </div> + </div> + </div> + <div id="photo-edit-perms-end"></div> + + <input id="photo-edit-submit-button" type="submit" name="submit" value="$submit" /> + <input id="photo-edit-delete-button" type="submit" name="delete" value="$delete" onclick="return confirmDelete()"; /> + + <div id="photo-edit-end"></div> +</form> + +<script type="text/javascript"> + $("a#photo-edit-perms-menu").fancybox({ + 'transitionIn' : 'none', + 'transitionOut' : 'none' + }); +</script> diff --git a/view/theme/duepuntozero/profile_vcard.tpl b/view/theme/duepuntozero/profile_vcard.tpl new file mode 100644 index 000000000..bcb5baeeb --- /dev/null +++ b/view/theme/duepuntozero/profile_vcard.tpl @@ -0,0 +1,51 @@ +<div class="vcard"> + + <div class="fn label">$profile.name</div> + + + + {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} + <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div> + + + + {{ if $location }} + <dl class="location"><dt class="location-label">$location</dt> + <dd class="adr"> + {{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }} + <span class="city-state-zip"> + <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }} + <span class="region">$profile.region</span> + <span class="postal-code">$profile.postal-code</span> + </span> + {{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }} + </dd> + </dl> + {{ endif }} + + {{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }} + + {{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }} + + {{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">♥</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }} + + {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }} + + {{ inc diaspora_vcard.tpl }}{{ endinc }} + + <div id="profile-vcard-break"></div> + <div id="profile-extra-links"> + <ul> + {{ if $connect }} + <li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li> + {{ endif }} + {{ if $wallmessage }} + <li><a id="wallmessage-link" href="wallmessage/$profile.nickname">$wallmessage</a></li> + {{ endif }} + </ul> + </div> +</div> + +$contact_block + + diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index f984cab68..0abf128a3 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -551,6 +551,9 @@ input#dfrn-url { margin-bottom: 30px; } +#profile-vcard-break { + clear: both; +} #profile-extra-links { clear: both; margin-top: 10px; diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css index 635f5bcf0..82ba795cd 100644 --- a/view/theme/slackr/style.css +++ b/view/theme/slackr/style.css @@ -40,6 +40,26 @@ nav #site-location { right: 36px; } +#profile-jot-text_parent, .mceLayout { + border-radius: 3px; + -moz-border-radius: 3px; + box-shadow: 3px 3px 10px 0 #000000; +} + +#profile-jot-text:hover { + color: #000000; +} + +.fc { + opacity: 0.3; + filter:alpha(opacity=30); +} + +.fc:hover { + opacity: 1.0; + filter:alpha(opacity=100); +} + .fc-event-skin { background-color: #3465a4 !important; } @@ -55,7 +75,7 @@ nav #site-location { box-shadow: 3px 3px 10px -2px #000000; } -.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo { +.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .fc, .profile-jot-text, .group-selected, .nets-selected, .fileas-selected, #profile-jot-submit, .categories-selected { border-radius: 3px; -moz-border-radius: 3px; box-shadow: 3px 3px 10px 0 #000000; diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/theme.php index 516132f5c..988700860 100644 --- a/view/theme/slackr/theme.php +++ b/view/theme/slackr/theme.php @@ -43,8 +43,16 @@ function cmtBbOpen(id) { function cmtBbClose(id) { $(".comment-edit-bb-" + id).hide(); } + +function hidecal() { + if(editor) return; + $('.fc').hide(); +} + $(document).ready(function() { + $("#profile-jot-text").focus(hidecal); + $("#profile-jot-text").click(hidecal); $('html').click(function() { $("#nav-notifications-menu" ).hide(); }); |