diff --git a/boot.php b/boot.php index b0412e0514..4e23794695 100644 --- a/boot.php +++ b/boot.php @@ -2631,7 +2631,7 @@ if(! function_exists('get_plink')) { function get_plink($item) { $a = get_app(); $plink = (((x($item,'plink')) && (! $item['private'])) ? '
' . t('link to source') . '
' : ''); + . $item['plink'] . '" title="' . t('link to source') . '" target="external-link" class="icon remote-link">' : ''); return $plink; }} diff --git a/images/icons.png b/images/icons.png new file mode 100644 index 0000000000..734c75f733 Binary files /dev/null and b/images/icons.png differ diff --git a/include/main.js b/include/main.js index a251d8e3a3..c7a3aea482 100644 --- a/include/main.js +++ b/include/main.js @@ -91,19 +91,20 @@ $.get("ping",function(data) { $(data).find('result').each(function() { var net = $(this).find('net').text(); - if(net == 0) { net = ''; } + if(net == 0) { net = ''; $('#net-update').hide() } else { $('#net-update').show() } $('#net-update').html(net); var home = $(this).find('home').text(); - if(home == 0) { home = ''; } + if(home == 0) { home = ''; $('#home-update').hide() } else { $('#home-update').show() } $('#home-update').html(home); var mail = $(this).find('mail').text(); - if(mail == 0) { mail = ''; } + if(mail == 0) { mail = ''; $('#mail-update').hide() } else { $('#mail-update').show() } $('#mail-update').html(mail); var intro = $(this).find('intro').text(); var register = $(this).find('register').text(); if(intro == 0) { intro = ''; } if(register != 0 && intro != '') { intro = intro+'/'+register; } if(register != 0 && intro == '') { intro = '0/'+register; } + if (intro == '') { $('#notify-update').hide() } else { $('#notify-update').show() } $('#notify-update').html(intro); }); @@ -161,15 +162,11 @@ } function imgbright(node) { - $(node).attr("src",$(node).attr("src").replace('hide','show')); - $(node).css('width',24); - $(node).css('height',24); + $(node).removeClass("drophide").addClass("drop"); } function imgdull(node) { - $(node).attr("src",$(node).attr("src").replace('show','hide')); - $(node).css('width',16); - $(node).css('height',16); + $(node).removeClass("drop").addClass("drophide"); } // Since our ajax calls are asynchronous, we will give a few diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl index 039c8d235c..97134aedd7 100644 --- a/view/contact_edit.tpl +++ b/view/contact_edit.tpl @@ -18,13 +18,13 @@
diff --git a/view/contact_template.tpl b/view/contact_template.tpl index 5b99f1be1c..e9f616760d 100644 --- a/view/contact_template.tpl +++ b/view/contact_template.tpl @@ -7,7 +7,7 @@
- $edit_hover +
diff --git a/view/group_drop.tpl b/view/group_drop.tpl index c87ea459f6..bd9852b962 100644 --- a/view/group_drop.tpl +++ b/view/group_drop.tpl @@ -1 +1,10 @@ -
$delete
+
+ +
+
diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 94f0f58f84..0fdd302094 100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -74,11 +74,11 @@ tinyMCE.init({ var selstr; $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() { selstr = $(this).text(); - $('#profile-jot-perms img').attr('src', 'images/lock_icon.gif'); + $('#jot-perms-icon').removeClass('unlock').addClass('lock'); $('.profile-jot-net input').attr('disabled', 'disabled'); }); if(selstr == null) { - $('#profile-jot-perms img').attr('src', 'images/unlock_icon.gif'); + $('#jot-perms-icon').removeClass('lock').addClass('unlock'); $('.profile-jot-net input').attr('disabled', false); } diff --git a/view/jot.tpl b/view/jot.tpl index f5010301f6..31f2eff04a 100644 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -21,28 +21,28 @@
-
$upload
+
- $youtube +
- $video +
- $audio +
- $setloc +
- $title +
@@ -52,14 +52,16 @@
-
$permset$bang
+
+ $bang +
diff --git a/view/like.tpl b/view/like.tpl index 0a1c6bfe83..ce5af04cef 100644 --- a/view/like.tpl +++ b/view/like.tpl @@ -1,6 +1,6 @@ diff --git a/view/like_noshare.tpl b/view/like_noshare.tpl index e36a624a41..2c467c3c26 100644 --- a/view/like_noshare.tpl +++ b/view/like_noshare.tpl @@ -1,5 +1,5 @@ diff --git a/view/mail_list.tpl b/view/mail_list.tpl index 1ef714f7a9..8c8e78276e 100644 --- a/view/mail_list.tpl +++ b/view/mail_list.tpl @@ -8,6 +8,9 @@
$subject
-
$delete
+
+ +
+
diff --git a/view/prv_message.tpl b/view/prv_message.tpl index cf6ff50eec..7c38941454 100644 --- a/view/prv_message.tpl +++ b/view/prv_message.tpl @@ -17,12 +17,12 @@ $select
- +
-
$upload
+
diff --git a/view/register.tpl b/view/register.tpl index 131460828b..ac8388de44 100644 --- a/view/register.tpl +++ b/view/register.tpl @@ -1,6 +1,6 @@

$regtitle

-
+ diff --git a/view/theme/dispy/icons.png b/view/theme/dispy/icons.png new file mode 100644 index 0000000000..43228bb9de Binary files /dev/null and b/view/theme/dispy/icons.png differ diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl new file mode 100644 index 0000000000..4661161b31 --- /dev/null +++ b/view/theme/dispy/jot-header.tpl @@ -0,0 +1,175 @@ + + + + + + diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl new file mode 100644 index 0000000000..ab121db316 --- /dev/null +++ b/view/theme/dispy/jot.tpl @@ -0,0 +1,72 @@ + +
+
+
 
+
0
+
+ +
+
+ + + + + + + + + + + + + +
+
$bang
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+ $jotplugins +
+ +
+ + + +
+ + + +
+ +
diff --git a/view/theme/dispy/mail_head.tpl b/view/theme/dispy/mail_head.tpl new file mode 100644 index 0000000000..89615cbd03 --- /dev/null +++ b/view/theme/dispy/mail_head.tpl @@ -0,0 +1,7 @@ +

$messages

+ + diff --git a/view/theme/dispy/menu-user-pin.jpg b/view/theme/dispy/menu-user-pin.jpg new file mode 100644 index 0000000000..26449569f4 Binary files /dev/null and b/view/theme/dispy/menu-user-pin.jpg differ diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl new file mode 100644 index 0000000000..4fc12d8679 --- /dev/null +++ b/view/theme/dispy/nav.tpl @@ -0,0 +1,50 @@ +$langselector + + + +{{ if $nav.login }}$nav.login.1 {{ endif }} +$nav.search.1 +$nav.directory.1 + +
+ $sitelocation + + + +
+ {{ if $nav.network }}{{ endif }} + {{ if $nav.home }}{{ endif }} + {{ if $nav.notifications }}{{ endif }} + {{ if $nav.messages }}{{ endif }} +
+ +
+ + +{{ if $nav.apps }}$nav.apps.1{{ endif }} + + + diff --git a/view/theme/dispy/notifications.png b/view/theme/dispy/notifications.png new file mode 100644 index 0000000000..f0f6a90e81 Binary files /dev/null and b/view/theme/dispy/notifications.png differ diff --git a/view/theme/dispy/profile_tabs.tpl b/view/theme/dispy/profile_tabs.tpl new file mode 100644 index 0000000000..63b6d48dd2 --- /dev/null +++ b/view/theme/dispy/profile_tabs.tpl @@ -0,0 +1,7 @@ + +
+ $status + $profile + $photos +
+
\ No newline at end of file diff --git a/view/theme/dispy/search_item.tpl b/view/theme/dispy/search_item.tpl new file mode 100644 index 0000000000..41cc95e65f --- /dev/null +++ b/view/theme/dispy/search_item.tpl @@ -0,0 +1,40 @@ +
+
+
+
+ + $name + menu +
+
    + $item_photo_menu +
+
+
+
+
{{ if $location }}$location {{ endif }}
+
+
$lock
+
+ $drop +
+
+
$title
+
+
$body
+
+
+ $name +
$ago
+ +
+ +
+
+
+ +
+
$conv
+ diff --git a/view/theme/dispy/settings.tpl b/view/theme/dispy/settings.tpl new file mode 100644 index 0000000000..953e5c3f26 --- /dev/null +++ b/view/theme/dispy/settings.tpl @@ -0,0 +1,212 @@ +
+ $ptitle + $lbl_plug +
+
+ +

$ptitle

+ + +$uexport + +$nickname_block + + +
+ + +

$lbl_pass1

+ + +
+

+$lbl_pass2 +

+ + +
+
+ +
+ + +
+
+ +
+ $oidhtml +
+
+ + +
+ +
+ + +

$lbl_basic

+ +
+ + +
+
+ +
+ + +
+
+ + + +
+ +$zoneselect +
+
+ +
+ + +
+
+ +
+ + +
+
+ + + + +
+ +$theme +
+
+ +
+ +
+ + +

$lbl_prv

+ + + + +
+ + +
$lbl_maxrdesc
+
+
+ + + + +$profile_in_dir + +$profile_in_net_dir + + +
+ +
+ + +
+
+ +
+ + +
+
+ + + +
$lbl_exp1 $lbl_exp2
+
+ + +
+ +
+ + + +

$lbl_not1

+ + +
+
$lbl_not2
+ + +
+ + +
+ + +
+ + +
+ + +
+
+
+ +
+ +
+ +

$lbl_imap0

+

+$imap_desc +$mail_disabled +

+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ +
+ +
+ + +

$lbl_advn

+ +$pagetype + +
+ +
+ + diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css new file mode 100644 index 0000000000..d2d47427fe --- /dev/null +++ b/view/theme/dispy/style.css @@ -0,0 +1,616 @@ +body { + margin: 0px; + padding: 0px; + font-family: freesans,helvetica,arial,clean,sans-serif; + font-size: 16px; +} +img { border: 0 none; } + +a { color: #3465a4; text-decoration: none; margin-bottom:1px;} +a:hover { color: #729fcf; padding-bottom: 0px; border-bottom: 1px dotted #729fcf;} + + +.required { display: inline; color: #ff0000;} + +input[type=submit] { + margin-top: 20px; + height: 22px; + background-color: #555753; + color: #eeeeec; + -webkit-border-radius: 5px ; + -moz-border-radius: 5px; + border-radius: 5px; + border: 0px; +} + + + +/** + * login + */ +#login-extra-links a { margin-right: 20px; } + +/********* +* nav +*********/ + +nav { + height: 50px; + display: block; + background-color: #2e3436; + color: #eeeeec; + position: relative; + padding: 0px 20%; +} +nav a { text-decoration: none; color: #eeeeec; border:0px;} +nav a:hover { text-decoration: none; color: #eeeeec; border:0px;} + +nav #banner { + display: block; + position: absolute; + margin-left: 20px; +} +nav #banner #logo-text a { + font-size: 40px; + font-weight: bold; + margin-left: 3px; +} + +nav #user-menu { + display: block; + width: auto; + float: right; + margin-top: 22px; + margin-right: 10px; + position: relative; + vertical-align: middle; + + background-color: #555753; + + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + + background: #555753 url("menu-user-pin.jpg") 98% center no-repeat; +} +nav #user-menu-label { + float: left; + font-size: 12px; + padding: 3px 20px 9px 5px; + height: 10px; +} + +ul#user-menu-popup { + display: none; + position: absolute; + background-color: #555753; + width: 100%; + padding: 10px 0px; + margin: 0px; + top: 20px; + left: 0px; + + -webkit-border-radius: 0px 0px 5px 5px; + -moz-border-radius: 0px 0px 5px 5px; + border-radius: 0px 0px 5px 5px; + + z-index: 10000; +} + +ul#user-menu-popup li { display: block; } +ul#user-menu-popup li a { display: block; padding: 5px; } +ul#user-menu-popup li a:hover { color: #2e3436; background-color: #eeeeec; } +ul#user-menu-popup li a.nav-sep { border-top: 1px solid #eeeeec; } +nav .nav-link { + float: right; + display: block; + width: 22px; + height: 22px; + /*border: 1px solid #eeeeec;*/ + overflow: hidden; + margin-top: 22px; + margin-right: 10px; + text-indent: 50px; + background: transparent url('icons.png') 0px 0px no-repeat; +} + +#nav-directory-link { background-position: 0px -22px } +#nav-directory-link:hover { background-position: -22px -22px;} +#nav-search-link { background-position: 0px -44px } +#nav-search-link:hover { background-position: -22px -44px;} +#nav-apps-link { background-position: 0px -66px } +#nav-apps-link:hover { background-position: -22px -66px;} +#nav-login-link { background-position: 0px -88px } +#nav-login-link:hover { background-position: -22px -88px;} + +#notifications { + height: 20px; width: 100%; + position: absolute; + top:-19px; left: 0px; +} +.nav-ajax-update { + display: none; + width: 30px; + height: 19px; + background: transparent url('notifications.png') 0px 0px no-repeat; + color: #ffffff; + font-weight: bold; + font-size: 0.8em; + padding-top: 0.2em; + text-align: center; + float: left; + margin-right: -4px; +} +.nav-ajax-update a { display: block;} +#net-update-wrap { background-position: 0px 0px; } +#mail-update-wrap { background-position: -30px 0px; } +#notify-update-wrap { background-position: -60px 0px; } +#home-update-wrap { background-position: -90px 0px; } + +/** sysmsg **/ +#sysmsg { + position:absolute; top: 20px; left:40%; + -moz-box-shadow: 0px 0px 5px #888; + -webkit-box-shadow: 0px 0px 5px #888; + box-shadow: 0px 0px 5px #888; + padding: 10px; background-color: #fff; +} + +/** +* aside +**/ + +aside { + position: absolute; + right: 20%; + width: 200px; + font-size: 0.7em; + +} +.vcard .fn { font-size: 1.7em; font-weight: bold; border-bottom: 1px solid #729fcf; padding-top: 1px;} + +.vcard #profile-photo-wrapper { margin: 10px 0px } + +aside h4 { font-size: 1.2em; } + +aside #viewcontacts { text-align: right;} + +/** +* contacts block +*/ +.contact-block-div { width: 50px; height: 50px; float: left; } +#contact-block-end { clear: both; } + +/** + * jot + **/ +#profile-jot-text_tbl { margin-bottom: 10px; } +#profile-jot-submit-wrapper { float: right;} +#profile-jot-perms { + float: right; + background-color: #555753; + height: 22px; width: 20px; + -webkit-border-radius: 0px 5px 5px 0px; + -moz-border-radius: 0px 5px 5px 0px; + border-radius: 0px 5px 5px 0px; + overflow: hidden; + border: 0px; + margin-left:2px; +} +#profile-jot-submit { + float: right; + height: 22px; + background-color: #555753; + color: #eeeeec; + -webkit-border-radius: 5px 0px 0px 5px; + -moz-border-radius: 5px 0px 0px 5px; + border-radius: 5px 0px 0px 5px; + border: 0px; +} +#character-counter { + float: right; padding: 8px 10px; +} +#profile-rotator-wrapper { + float: right; +} + +.jot-tool { + float: left; + margin-right: 5px; +} +#profile-jot-tools-end, +#profile-jot-banner-end { clear: both; } + + +/** + * section + */ +section { margin: 10px 20% 0px 20%; font-size: 0.8em; padding-right: 230px;} + +/** tabs **/ +.tabs-wrapper {list-style: none; padding: 0px; margin: 0px; border-bottom: 1px solid #729fcf; } +.tabs-wrapper li { display: inline;} +.tabs { padding: 0px 5px; margin-right: 10px; } +.tabs:hover { background-color: #729fcf; color: #eeeeec; border: 0px; } + + +/** + * items + */ +.wall-item-outside-wrapper { + margin-top: 50px; +} +.wall-item-outside-wrapper-end { clear: both;} +.wall-item-content-wrapper { position: relative; } +.wall-item-photo-menu { display: none;} +.wall-item-photo-menu-button { + display:none; + text-indent: -9999px; + background: #555753 url("menu-user-pin.jpg") no-repeat 75px center; + position: absolute; + overflow: hidden; + height: 20px; width: 90px; + top: 85px; left: 0px; + -webkit-border-radius: 0px 0px 5px 5px; + -moz-border-radius: 0px 0px 5px 5px; + border-radius: 0px 0px 5px 5px; + + +} + +.wall-item-info { float: left; width: 140px; } +.wall-item-photo-wrapper { + width: 80px; height: 80px; + position: relative; + padding: 5px; + background-color: #555753; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} + + +.wall-item-tools { + float: right; + /*height: 0px; + padding-top: 20px; + overflow:hidden; + background: #ffffff url("icons.png") no-repeat -50px -40px;*/ + filter: alpha(opacity=20); + opacity: 0.2; + -webkit-transition: all 1s ease-in-out; + -moz-transition: all 1s ease-in-out; + -o-transition: all 1s ease-in-out; + -ms-transition: all 1s ease-in-out; + transition: all 1s ease-in-out; +} +.wall-item-tools:hover { + /*height:auto;*/ + filter: alpha(opacity=100); + opacity: 1; + -webkit-transition: all 1s ease-in-out; + -moz-transition: all 1s ease-in-out; + -o-transition: all 1s ease-in-out; + -ms-transition: all 1s ease-in-out; + transition: all 1s ease-in-out; + +} + +.wall-item-title { font-size: 1.2em; font-weight: bold;} +.wall-item-body { margin-left: 140px;} +.wall-item-lock-wrapper { float: right; } +.wall-item-dislike, +.wall-item-like, +.wall-item-author { clear: left; font-size: 0.8em; margin: 10px 0px 0px 140px; color: #babdb6;} +.wall-item-ago { display: inline; padding-left: 10px;} +.wall-item-wrapper-end { clear:both; } +.wall-item-location { + margin-top:5px; + width: 100px; + overflow: hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; +} +.wall-item-location span { float: left; } +.wall-item-location a { margin-left: 25px; display: block;} + +.wallwall .wwto { + left: -10px; + margin: 0; + position: absolute; + top: 65px; + width: 30px; + z-index: 10001; + width: 30px; + height: 30px; + +} +.wallwall .wwto img { width: 30px; height: 30px;} +.wallwall .wall-item-photo-end { clear: both; } +.wall-item-arrowphoto-wrapper { + position: absolute; + left: 20px; + top: 70px; + z-index: 10002; +} + +.wall-item-photo-menu { + min-width 92px; + border: 2px solid #FFFFFF; + border-top: 0px; + background: #555753; + position: absolute; + left: -2px; top: 101px; + display: none; + z-index: 10000; + -webkit-border-radius: 0px 5px 5px 5px; + -moz-border-radius: 0px 5px 5px 5px; + border-radius: 0px 5px 5px 5px; +} +.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none } +.wall-item-photo-menu li a { white-space: nowrap; display: block; padding: 5px 2px; color: #eeeeec; } +.wall-item-photo-menu li a:hover { color: #555753; background: #eeeeec; } + + + +/** + * comment + */ +.wall-item-outside-wrapper.comment { margin-left: 80px; } +.wall-item-outside-wrapper.comment .wall-item-photo { width: 40px; height: 40px;} +.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-info { width: 60px; } +.wall-item-outside-wrapper.comment .wall-item-body { margin-left: 60px;} +.wall-item-outside-wrapper.comment .wall-item-author { margin-left: 60px;} + +.wall-item-outside-wrapper.comment .wall-item-photo-menu { + top: 60px; + -webkit-border-radius: 0px 5px 5px 5px; + -moz-border-radius: 0px 5px 5px 5px; + border-radius: 0px 5px 5px 5px; +} + + +.comment-wwedit-wrapper, +.comment-edit-wrapper { margin: 30px 0px 0px 80px;} +.comment-wwedit-wrapper img, +.comment-edit-wrapper img { width: 20px; height: 20px; } +.comment-edit-photo-link { float: left; width: 40px;} +.comment-edit-text-empty { width: 80%; height: 20px; border: 0px; color: #babdb6; + -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; +} +.comment-edit-text-empty:hover { color: #999999;} +.comment-edit-text-full { width: 80%; height: 6em; + -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; +} +.comment-edit-submit-wrapper { width: 80%; margin-left: 40px; text-align: right; } +.comment-edit-submit { + height: 22px; + background-color: #555753; + color: #eeeeec; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + border: 0px; +} + + + + +/** + * photos + **/ +.photo-album-image-wrapper, +.photo-top-image-wrapper { + float: left; + margin: 0px 10px 10px 0px; + -moz-box-shadow: 0px 0px 5px #888; + -webkit-box-shadow: 0px 0px 5px #888; + box-shadow: 0px 0px 5px #888; + background-color: #eeeeee; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + + height: 265px; + position:relative; + +} + +.photo-top-image-wrapper a:hover, +#photo-photo a:hover, +.photo-album-image-wrapper a:hover { + border-bottom: 0px; +} + +.photo-top-photo, +.photo-album-photo { + -webkit-border-radius: 5px 5px 0px 0px; + -moz-border-radius: 5px 5px 0px 0px; + border-radius: 5px 5px 0px 0px; + } + +.photo-top-album-name { position: absolute; bottom: 0px; padding: 0px 5px;} +.caption { position: absolute; bottom: 0px; margin: 0px 5px} + +/** + * message + */ +.prvmail-text { width: 100%;} +#prvmail-subject { width: 100%;} +#prvmail-submit-wrapper { margin-top: 10px; } +#prvmail-submit { + float: right; + margin-top: 0px; +} +#prvmail-submit-wrapper > div { + margin-right: 5px; + float: left; +} +.mail-list-outside-wrapper { margin-top: 20px;} +.mail-list-sender { float: left; } +.mail-list-detail { margin-left: 90px; } +.mail-list-sender-name { display: inline; } +.mail-list-date { display: inline; font-size: 0.8em; padding-left: 10px;} +.mail-list-subject { font-size: 1.5em;} +.mail-list-delete-wrapper { float: right; } +.mail-list-outside-wrapper-end { clear: both;} + +/** + * contacts + */ + +.contact-entry-wrapper { float: left; margin-right: 20px; margin-bottom: 20px; position: relative;} +.contact-entry-direction-wrapper {position: absolute; top: 20px;} +.contact-entry-edit-links { position: absolute; top: 60px; } +.contact-entry-photo { + margin-left:20px; +} +.contact-entry-edit-links .icon { + border: 1px solid #babdb6; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + background-color: #ffffff; +} + +/** + * register, settings & profile forms + */ +#settings-nickname-desc { + background-color: #DDEFFF; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + padding: 5px; +} + +#register-form div, +#profile-edit-form div, +#settings-form div { + clear: both; +} + +#register-form label, +#profile-edit-form label, +#settings-form label { + width: 300px; float: left; +} + +#register-form span, +#profile-edit-form span, +#settings-form span { + color: #555753; + display:block; + margin-bottom: 20px; +} +.settings-submit-wrapper, +.profile-edit-submit-wrapper { margin: 30px 0px;} +.settings-submit-wrapper input, + +.profile-listing { float: left; margin: 20px 20px 0px 0px} + +#profile-edit-links ul { margin: 20px 0px; padding: 0px; list-style: none; } + + +#register-sitename { display: inline; font-weight: bold;} + +/** + * contacts selector + */ + +#prof-members { + height: 200px; + overflow: auto; + border: 1px solid #555753; + -webkit-border-radius: 5px 5px 0px 0px; + -moz-border-radius: 5px 5px 0px 0px; + border-radius: 5px 5px 0px 0px; +} +#prof-all-contacts { + height: 200px; + overflow: auto; + border: 1px solid #555753; + -webkit-border-radius: 0px 0px 5px 5px; + -moz-border-radius: 0px 0px 5px 5px; + border-radius: 0px 0px 5px 5px; +} +#prof-members h3, +#prof-all-contacts h3{ + color: #eeeeec; + background-color: #555753; + margin: 0px; + padding: 5px; +} + +#prof-separator { display: none;} + + +/** + * directory + */ +.directory-item {float: left; margin: 50px 50px 0px 0px;} + +/** + * ICONS + */ +.icon { + display: block; width: 20px; height: 20px; + background-image: url('icons.png'); +} +/*.icon:hover { + border-bottom: 0px; +}*/ + +.border { + border: 1px solid #babdb6; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} + +.article { background-position: -50px 0px;} +.audio { background-position: -70px 0px;} +.block { background-position: -90px 0px;} +.drop { background-position: -110px 0px;} +.drophide { background-position: -130px 0px;} +.edit { background-position: -150px 0px;} +.camera { background-position: -170px 0px;} +.dislike { background-position: -190px 0px;} +.like { background-position: -210px 0px;} +.link { background-position: -230px 0px;} + +.globe { background-position: -50px -20px;} +.noglobe { background-position: -70px -20px;} +.no { background-position: -90px -20px;} +.pause { background-position: -110px -20px;} +.play { background-position: -130px -20px;} +.pencil { background-position: -150px -20px;} +.small-pencil{ background-position: -170px -20px;} +.recycle { background-position: -190px -20px;} +.remote-link{ background-position: -210px -20px;} +.share { background-position: -230px -20px;} + +.tools { background-position: -50px -40px;} +.lock { background-position: -70px -40px;} +.unlock { background-position: -90px -40px;} +.video { background-position: -110px -40px;} +.youtube { background-position: -130px -40px;} + +/** + * footer + */ + .cc-license { margin-top: 100px; font-size: 0.7em; } +footer { display: block; margin: 50px 20%; clear: both; } + \ No newline at end of file diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl new file mode 100644 index 0000000000..ed1206f81b --- /dev/null +++ b/view/theme/dispy/wall_item.tpl @@ -0,0 +1,47 @@ +
+
+
+
+ + $name + + menu +
+
    + $item_photo_menu +
+
+
+
+
{{ if $location }}$location {{ endif }}
+
+
$lock
+
+ $vote + $plink + $edpost + $drop +
+
+
$title
+
+
$body
+
+
+ $name +
$ago
+ +
+
+
+ +
$dislike
+
+ $comment +
+
+ +
+ diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl new file mode 100644 index 0000000000..263b67c73b --- /dev/null +++ b/view/theme/dispy/wallwall_item.tpl @@ -0,0 +1,51 @@ +
+
+
+
+ + $owner_name +
+
$wall
+
+ + $name + menu +
+
    + $item_photo_menu +
+
+ +
+
+
{{ if $location }}$location {{ endif }}
+
+
$lock
+
+ $vote + $plink + $edpost + $drop +
+
+
$title
+
+
$body
+
+
+ $name +
$ago
+
+
+
+ +
$dislike
+
+ $comment +
+
+ +
+ diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 0e361ad46d..beb89123b7 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -224,6 +224,10 @@ div.wall-item-content-wrapper.shiny { cursor: pointer; } +#jot-perms-icon { + float: left; +} + .fakelink, .fakelink:visited, .fakelink:link { color: #3465a4; text-decoration: none; @@ -2335,3 +2339,38 @@ a.mail-list-link { float: left; width: 300px; } + +/** + * ICONS + */ +.icon { + display: block; width: 16px; height: 16px; + background-image: url('../../../images/icons.png'); +} +.article { background-position: 0px 0px;} +.audio { background-position: -16px 0px;} +.block { background-position: -32px 0px;} +.drop { background-position: -48px 0px;} +.drophide { background-position: -64px 0px;} +.edit { background-position: -80px 0px;} +.camera { background-position: -96px 0px;} +.dislike { background-position: -112px 0px;} +.like { background-position: -128px 0px;} +.link { background-position: -144px 0px;} + +.globe { background-position: 0px -16px;} +.noglobe { background-position: -16px -16px;} +.no { background-position: -32px -16px;} +.pause { background-position: -48px -16px;} +.play { background-position: -64px -16px;} +.pencil { background-position: -80px -16px;} +.small-pencil { background-position: -96px -16px;} +.recycle { background-position: -112px -16px;} +.remote-link { background-position: -128px -16px;} +.share { background-position: -144px -16px;} + +.tools { background-position: 0px -32px;} +.lock { background-position: -16px -32px;} +.unlock { background-position: -32px -32px;} +.video { background-position: -48px -32px;} +.youtube { background-position: -64px -32px;} diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index f4d31e93f2..5d2f806228 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -120,6 +120,10 @@ blockquote:before { cursor: pointer; } +#jot-perms-icon { + float: left; +} + .fakelink, .fakelink:visited { color: #15607B; text-decoration: none; @@ -2359,3 +2363,38 @@ a.mail-list-link { float: left; width: 300px; } + +/** + * ICONS + */ +.icon { + display: block; width: 16px; height: 16px; + background-image: url('../../../images/icons.png'); +} +.article { background-position: 0px 0px;} +.audio { background-position: -16px 0px;} +.block { background-position: -32px 0px;} +.drop { background-position: -48px 0px;} +.drophide { background-position: -64px 0px;} +.edit { background-position: -80px 0px;} +.camera { background-position: -96px 0px;} +.dislike { background-position: -112px 0px;} +.like { background-position: -128px 0px;} +.link { background-position: -144px 0px;} + +.globe { background-position: 0px -16px;} +.noglobe { background-position: -16px -16px;} +.no { background-position: -32px -16px;} +.pause { background-position: -48px -16px;} +.play { background-position: -64px -16px;} +.pencil { background-position: -80px -16px;} +.small-pencil { background-position: -96px -16px;} +.recycle { background-position: -112px -16px;} +.remote-link { background-position: -128px -16px;} +.share { background-position: -144px -16px;} + +.tools { background-position: 0px -32px;} +.lock { background-position: -16px -32px;} +.unlock { background-position: -32px -32px;} +.video { background-position: -48px -32px;} +.youtube { background-position: -64px -32px;} diff --git a/view/wall_item_drop.tpl b/view/wall_item_drop.tpl index 9aa565f69b..b4ea62b451 100644 --- a/view/wall_item_drop.tpl +++ b/view/wall_item_drop.tpl @@ -1,2 +1,4 @@ -
$delete
-
+
+ +
+