aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-09-28 23:53:05 -0700
committerFriendika <info@friendika.com>2011-09-28 23:53:05 -0700
commit0ee9ae23d75d9f15fd37fb2ea118649dfe92aee0 (patch)
tree1785aa2947ac6d472fc03ca5954f85102222df2f
parentffa3b67365741d77b9a21b8505e4661668e6b561 (diff)
parent0881c04cea53b68fba070ebb4490055064bc537d (diff)
downloadvolse-hubzilla-0ee9ae23d75d9f15fd37fb2ea118649dfe92aee0.tar.gz
volse-hubzilla-0ee9ae23d75d9f15fd37fb2ea118649dfe92aee0.tar.bz2
volse-hubzilla-0ee9ae23d75d9f15fd37fb2ea118649dfe92aee0.zip
Merge pull request #8 from duthied/master
Classes added to core and testbubble theme It looks to me as if view/wall_item.tpl is an earlier version that somehow didn't get merged. I don't think testbubble is using it, so I'm going to merge and then revert that one file, as I don't see any changes you made to it specifically for this body of work.
-rw-r--r--mod/network.php10
-rw-r--r--view/contact_edit.tpl2
-rw-r--r--view/contact_template.tpl2
-rw-r--r--view/directory_header.tpl2
-rw-r--r--view/directory_item.tpl2
-rw-r--r--view/login.tpl2
-rw-r--r--view/mail_conv.tpl2
-rw-r--r--view/mail_head.tpl6
-rw-r--r--view/photo_edit.tpl2
-rw-r--r--view/photo_top.tpl2
-rw-r--r--view/photos_upload.tpl2
-rw-r--r--view/profile_listing_header.tpl4
-rw-r--r--view/profile_tabs.tpl10
-rw-r--r--view/suggestions.tpl2
-rw-r--r--view/theme/testbubble/contact_edit.tpl6
-rw-r--r--view/theme/testbubble/login.tpl2
-rw-r--r--view/theme/testbubble/nav.tpl14
-rw-r--r--view/theme/testbubble/photo_view.tpl2
-rw-r--r--view/theme/testbubble/profile_entry.tpl2
-rw-r--r--view/theme/testbubble/profile_tabs.tpl10
-rw-r--r--view/theme/testbubble/search_item.tpl2
-rw-r--r--view/theme/testbubble/style.css496
-rw-r--r--view/theme/testbubble/wall_item.tpl2
-rw-r--r--view/theme/testbubble/wallwall_item.tpl4
-rw-r--r--view/viewcontact_template.tpl2
-rw-r--r--view/wall_item.tpl101
-rw-r--r--view/wallwall_item.tpl4
27 files changed, 175 insertions, 522 deletions
diff --git a/mod/network.php b/mod/network.php
index 9488cd973..371a35402 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -78,23 +78,25 @@ function network_init(&$a) {
// network links moved to content to match other pages
// all
- $a->page['content'] .= '<a class="tabs ' . $all_active . '" href="' . $a->get_baseurl() . '/'
+ // added 'button' class for easier styling - not the best place for it, should be moved into the tpl like profile_tabs.tpl
+ // once there is a network_tabs.tpl or something
+ $a->page['content'] .= '<a class="button tabs ' . $all_active . '" href="' . $a->get_baseurl() . '/'
. str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . '">'
. t('All') . '</a>';
// new
- $a->page['content'] .= '<a class="tabs ' . $new_active . '" href="' . $a->get_baseurl() . '/'
+ $a->page['content'] .= '<a class="button tabs ' . $new_active . '" href="' . $a->get_baseurl() . '/'
. str_replace('/new', '', $a->cmd) . '/new'
. ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '">'
. t('New') . '</a>';
// starred
- $a->page['content'] .= '<a class="tabs ' . $starred_active . '" href="' . $a->get_baseurl() . '/'
+ $a->page['content'] .= '<a class="button tabs ' . $starred_active . '" href="' . $a->get_baseurl() . '/'
. str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&star=1" >'
. t('Starred') . '</a>';
// bookmarks
- $a->page['content'] .= '<a class="tabs ' . $bookmarked_active . '" href="' . $a->get_baseurl() . '/'
+ $a->page['content'] .= '<a class="button tabs ' . $bookmarked_active . '" href="' . $a->get_baseurl() . '/'
. str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&bmark=1" >'
. t('Bookmarks') . '</a>';
diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl
index 86ebb5608..248140a6b 100644
--- a/view/contact_edit.tpl
+++ b/view/contact_edit.tpl
@@ -35,7 +35,7 @@ $nettype
<div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span></div>
<div id="contact-edit-poll-text">$updpub</div>
$poll_interval
- <div id="contact-edit-update-now"><a href="contacts/$contact_id/update" >$udnow</a></div>
+ <div id="contact-edit-update-now" class="button"><a href="contacts/$contact_id/update" >$udnow</a></div>
</div>
{{ endif }}
</div>
diff --git a/view/contact_template.tpl b/view/contact_template.tpl
index 2fa167feb..e1a080b67 100644
--- a/view/contact_template.tpl
+++ b/view/contact_template.tpl
@@ -1,7 +1,7 @@
<div class="contact-entry-wrapper" id="contact-entry-wrapper-$id" >
<div class="contact-entry-photo-wrapper" >
- <div class="contact-entry-photo" id="contact-entry-photo-$id"
+ <div class="contact-entry-photo mframe" id="contact-entry-photo-$id"
onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('contact-photo-menu-button-$id')" onmouseout="t$id=setTimeout('closeMenu(\'contact-photo-menu-button-$id\'); closeMenu(\'contact-photo-menu-$id\');',200)" >
<a href="$url" title="$img_hover" /><img src="$thumb" $sparkle alt="$name" /></a>
diff --git a/view/directory_header.tpl b/view/directory_header.tpl
index c5463778b..ba90b94f8 100644
--- a/view/directory_header.tpl
+++ b/view/directory_header.tpl
@@ -8,7 +8,7 @@ $finding
<div id="directory-search-wrapper">
<form id="directory-search-form" action="directory" method="get" >
<input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="$search" />
-<input type="submit" name="submit" id="directory-search-submit" value="$submit" />
+<input type="submit" name="submit" id="directory-search-submit" value="$submit" class="button" />
</form>
</div>
<div id="directory-search-end"></div>
diff --git a/view/directory_item.tpl b/view/directory_item.tpl
index 2494bc4b7..031f4ff22 100644
--- a/view/directory_item.tpl
+++ b/view/directory_item.tpl
@@ -1,5 +1,5 @@
-<div class="directory-item" id="directory-item-$id" >
+<div class="directory-item lframe" id="directory-item-$id" >
<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" >
<div class="directory-photo" id="directory-photo-$id" ><a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" ><img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" /></a>
</div>
diff --git a/view/login.tpl b/view/login.tpl
index 78f624eed..27598cd50 100644
--- a/view/login.tpl
+++ b/view/login.tpl
@@ -11,7 +11,7 @@
<input type="password" maxlength="60" name="password" id="login-password" value="" />
</div>
<div id="login-password-end"></div>
-<div id="login-extra-links">
+<div id="login-extra-links" class=".button">
<div id="login-extra-filler">&nbsp;</div>
$register_html
<a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
diff --git a/view/mail_conv.tpl b/view/mail_conv.tpl
index 779ef39ee..d7ed14580 100644
--- a/view/mail_conv.tpl
+++ b/view/mail_conv.tpl
@@ -1,6 +1,6 @@
<div class="mail-conv-outside-wrapper">
<div class="mail-conv-sender" >
- <a href="$from_url" class="mail-conv-sender-url" ><img class="mail-conv-sender-photo$sparkle" src="$from_photo" alt="$from_name" /></a>
+ <a href="$from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$sparkle" src="$from_photo" alt="$from_name" /></a>
</div>
<div class="mail-conv-detail" >
<div class="mail-conv-sender-name" >$from_name</div>
diff --git a/view/mail_head.tpl b/view/mail_head.tpl
index eac79eb59..5cc65b9ad 100644
--- a/view/mail_head.tpl
+++ b/view/mail_head.tpl
@@ -2,8 +2,8 @@
<div class="message-links">
<ul>
-<li><a href="message" class="message-link-inbox">$inbox</a></li>
-<li><a href="message/sent" class="message-link-outbox">$outbox</a></li>
-<li><a href="message/new" class="message-link-new">$new</a></li>
+<li><a href="message" class="button message-link-inbox">$inbox</a></li>
+<li><a href="message/sent" class="button message-link-outbox">$outbox</a></li>
+<li><a href="message/new" class="button message-link-new">$new</a></li>
<ul>
</div>
diff --git a/view/photo_edit.tpl b/view/photo_edit.tpl
index 839e41ee7..9950cc4ac 100644
--- a/view/photo_edit.tpl
+++ b/view/photo_edit.tpl
@@ -19,7 +19,7 @@
<div id="photo-edit-tags-end"></div>
<div id="photo-edit-perms" class="photo-edit-perms" >
- <a href="#photo-edit-perms-select" id="photo-edit-perms-menu" title="$permissions"/>
+ <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>
diff --git a/view/photo_top.tpl b/view/photo_top.tpl
index e2ebb6fd5..ab88c5ff5 100644
--- a/view/photo_top.tpl
+++ b/view/photo_top.tpl
@@ -1,5 +1,5 @@
-<div class="photo-top-image-wrapper" id="photo-top-image-wrapper-$id">
+<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-$id">
<a href="$photolink" class="photo-top-photo-link" id="photo-top-photo-link-$id" title="$phototitle"><img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-top-photo" id="photo-top-photo-$id" /></a>
<div class="photo-top-album-name"><a href="$albumlink" class="photo-top-album-link" title="$albumalt" >$albumname</a></div>
</div>
diff --git a/view/photos_upload.tpl b/view/photos_upload.tpl
index 10240b596..c7c61c6db 100644
--- a/view/photos_upload.tpl
+++ b/view/photos_upload.tpl
@@ -15,7 +15,7 @@
<div id="photos-upload-perms" class="photos-upload-perms" >
- <a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" />
+ <a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button" />
<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
</a>
<div id="photos-upload-perms-end"></div>
diff --git a/view/profile_listing_header.tpl b/view/profile_listing_header.tpl
index 707dfec53..95d0f177c 100644
--- a/view/profile_listing_header.tpl
+++ b/view/profile_listing_header.tpl
@@ -1,8 +1,8 @@
<h1>$header</h1>
-<p id="profile-listing-desc" >
+<p id="profile-listing-desc" class="button" >
<a href="profile_photo" >$chg_photo</a>
</p>
-<div id="profile-listing-new-link-wrapper" >
+<div id="profile-listing-new-link-wrapper" class="button >
<a href="profiles/new" id="profile-listing-new-link" title="$cr_new" >$cr_new</a>
</div>
diff --git a/view/profile_tabs.tpl b/view/profile_tabs.tpl
index 7820013b6..d57c33acf 100644
--- a/view/profile_tabs.tpl
+++ b/view/profile_tabs.tpl
@@ -1,9 +1,9 @@
<div id="profile-tabs-wrapper" >
- <a href="$url" id="profile-tab-status-link" class="profile-tabs" >$status</a>
- <a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >$profile</a>
- <a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >$photos</a>
- {{ if $events }}<a href="events" id="profile-tab-events-link" class="profile-tabs" >$events</a>{{ endif }}
- {{ if $notes }}<a href="notes" id="profile-tab-notes-link" class="profile-tabs" >$notes</a>{{ endif }}
+ <a href="$url" id="profile-tab-status-link" class="profile-tabs button" >$status</a>
+ <a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs button" >$profile</a>
+ <a href="$phototab" id="profile-tab-photos-link" class="profile-tabs button" >$photos</a>
+ {{ if $events }}<a href="events" id="profile-tab-events-link" class="profile-tabs button" >$events</a>{{ endif }}
+ {{ if $notes }}<a href="notes" id="profile-tab-notes-link" class="profile-tabs button" >$notes</a>{{ endif }}
<div id="profile-tabs-end"></div>
</div>
diff --git a/view/suggestions.tpl b/view/suggestions.tpl
index 46c927754..dae551849 100644
--- a/view/suggestions.tpl
+++ b/view/suggestions.tpl
@@ -4,7 +4,7 @@
<p class="intro-desc">$str_notifytype $notify_type</p>
<div class="intro-madeby">$madeby</div>
<div class="intro-fullname" >$fullname</div>
-<a class="intro-url-link" href="$url" ><img class="intro-photo" src="$photo" width="175" height=175" title="$fullname" alt="$fullname" /></a>
+<a class="intro-url-link" href="$url" ><img class="intro-photo lframe" src="$photo" width="175" height=175" title="$fullname" alt="$fullname" /></a>
<div class="intro-note" >$note</div>
<div class="intro-wrapper-end"></div>
<form class="intro-form" action="notifications/$intro_id" method="post">
diff --git a/view/theme/testbubble/contact_edit.tpl b/view/theme/testbubble/contact_edit.tpl
index 59747c62d..9191a36b0 100644
--- a/view/theme/testbubble/contact_edit.tpl
+++ b/view/theme/testbubble/contact_edit.tpl
@@ -12,7 +12,7 @@ $nettype
<div id="contact-edit-photo-wrapper" >
<img id="contact-edit-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
- <div id="contact-edit-photo" >
+ <div id="contact-edit-photo" class="lframe">
<a href="$url" title="$visit" /><img src="$photo" $sparkle alt="$name" /></a>
</div>
<div id="contact-edit-photo-end" ></div>
@@ -32,7 +32,7 @@ $nettype
<div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span></div>
<div id="contact-edit-poll-text">$updpub</div>
$poll_interval
- <div id="contact-edit-update-now"><a href="contacts/$contact_id/update" >$udnow</a></div>
+ <div id="contact-edit-update-now" class="button"><a href="contacts/$contact_id/update" >$udnow</a></div>
</div>
{{ endif }}
</div>
@@ -42,7 +42,7 @@ $insecure
$blocked
$ignored
-<div id="view-recent-wrapper"><a href="network/?cid=$contact_id" id="contact-view-recent">$lblrecent</a></div>
+<div id="view-recent-wrapper"><a href="network/?cid=$contact_id" id="contact-view-recent" class="button">$lblrecent</a></div>
$lblsuggest
<div id="contact-edit-info-wrapper">
diff --git a/view/theme/testbubble/login.tpl b/view/theme/testbubble/login.tpl
index 2c879d69a..c17950ece 100644
--- a/view/theme/testbubble/login.tpl
+++ b/view/theme/testbubble/login.tpl
@@ -16,7 +16,7 @@
<a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
</div>
<div id="login-submit-end"></div>
- <div id="login-extra-links">
+ <div id="login-extra-links" class=".button">
<div id="login-extra-filler">&nbsp;</div>
$register_html
</div>
diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl
index a2171d431..38d2dfac6 100644
--- a/view/theme/testbubble/nav.tpl
+++ b/view/theme/testbubble/nav.tpl
@@ -17,19 +17,19 @@
onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
- {{ if $nav.register }}<li><a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.1">$nav.register.1</a></li>{{ endif }}
+ {{ if $nav.register }}<li><a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0">$nav.register.1</a></li>{{ endif }}
{{ if $nav.home }}<li><a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0">$nav.home.1</a></li>{{ endif }}
{{ if $nav.network }}<li><a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0">$nav.network.1</a></li>{{ endif }}
{{ if $nav.community }}
- <li><a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
+ <li><a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0">$nav.community.1</a></li>
{{ endif }}
- <li><a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a></li>
- <li><a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a></li>
- {{ if $nav.apps }}<li><a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a></li>{{ endif }}
+ <li><a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0">$nav.search.1</a></li>
+ <li><a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0">$nav.directory.1</a></li>
+ {{ if $nav.apps }}<li><a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0">$nav.apps.1</a></li>{{ endif }}
{{ if $nav.notifications }}<li><a id="nav-notify-link" class="nav-commlink nav-sep $nav.notifications.2" href="$nav.notifications.0">$nav.notifications.1</a></li>{{ endif }}
{{ if $nav.messages }}<li><a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0">$nav.messages.1</a></li>{{ endif }}
@@ -42,9 +42,9 @@
{{ if $nav.admin }}<li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0">$nav.admin.1</a></li>{{ endif }}
- <li><a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a></li>
+ <li><a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0">$nav.help.1</a></li>
- {{ if $nav.login }}<li><a id="nav-login-link" class="nav-link $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li> {{ endif }}
+ {{ if $nav.login }}<li><a id="nav-login-link" class="nav-link $nav.login.2" href="$nav.login.0">$nav.login.1</a></li> {{ endif }}
{{ if $nav.logout }}<li><a id="nav-logout-link" class="nav-commlink nav-sep $nav.logout.2" href="$nav.logout.0">$nav.logout.1</a></li> {{ endif }}
</ul>
</div>
diff --git a/view/theme/testbubble/photo_view.tpl b/view/theme/testbubble/photo_view.tpl
index 4582751c6..4c754f597 100644
--- a/view/theme/testbubble/photo_view.tpl
+++ b/view/theme/testbubble/photo_view.tpl
@@ -10,7 +10,7 @@
{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
</div>
-<div id="photo-photo">
+<div id="photo-photo" class="lframe">
{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
<a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a>
{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
diff --git a/view/theme/testbubble/profile_entry.tpl b/view/theme/testbubble/profile_entry.tpl
index 82c04cc20..5bea298ac 100644
--- a/view/theme/testbubble/profile_entry.tpl
+++ b/view/theme/testbubble/profile_entry.tpl
@@ -1,7 +1,7 @@
<div class="profile-listing" >
<div class="profile-listing-photo-wrapper" >
-<a href="profiles/$id" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="$alt" /></a>
+<a href="profiles/$id" class="profile-listing-edit-link"><img class="profile-listing-photo mframe" id="profile-listing-photo-$id" src="$photo" alt="$alt" /></a>
</div>
<div class="profile-listing-photo-end"></div>
<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
diff --git a/view/theme/testbubble/profile_tabs.tpl b/view/theme/testbubble/profile_tabs.tpl
index c236490b2..ae7c65e1c 100644
--- a/view/theme/testbubble/profile_tabs.tpl
+++ b/view/theme/testbubble/profile_tabs.tpl
@@ -1,9 +1,9 @@
<div class="tabs-wrapper" >
- <a href="$url" id="profile-tab-status-link" class="tabs {{if $activetab==posts}}active{{endif}}" >$status</a>
- <a href="$url?tab=profile" id="profile-tab-profile-link" class="tabs {{if $activetab==profile}}active{{endif}}" >$profile</a>
- <a href="$phototab" id="profile-tab-photos-link" class="tabs {{if $activetab==photos}}active{{endif}}" >$photos</a>
- {{ if $events }}<a href="events" id="profile-tab-events-link" class="tabs {{if $activetab==events}}active{{endif}}" >$events</a>{{ endif }}
- {{ if $notes }}<a href="notes" id="profile-tab-notes-link" class="tabs {{if $activetab==notes}}active{{endif}}" >$notes</a>{{ endif }}
+ <a href="$url" id="profile-tab-status-link" class="button tabs {{if $activetab==posts}}active{{endif}}" >$status</a>
+ <a href="$url?tab=profile" id="profile-tab-profile-link" class="button tabs {{if $activetab==profile}}active{{endif}}" >$profile</a>
+ <a href="$phototab" id="profile-tab-photos-link" class="button tabs {{if $activetab==photos}}active{{endif}}" >$photos</a>
+ {{ if $events }}<a href="events" id="profile-tab-events-link" class="button tabs {{if $activetab==events}}active{{endif}}" >$events</a>{{ endif }}
+ {{ if $notes }}<a href="notes" id="profile-tab-notes-link" class="button tabs {{if $activetab==notes}}active{{endif}}" >$notes</a>{{ endif }}
<div class="tabs-end"></div>
</div>
diff --git a/view/theme/testbubble/search_item.tpl b/view/theme/testbubble/search_item.tpl
index 7e5bfbe71..1762983e2 100644
--- a/view/theme/testbubble/search_item.tpl
+++ b/view/theme/testbubble/search_item.tpl
@@ -1,7 +1,7 @@
<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
<div class="wall-item-info" id="wall-item-info-$id">
- <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id"
+ <div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-$id"
onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 97939c45a..9727de6d1 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -22,17 +22,6 @@ You can switch out the colors of the header, buttons and links by using a find a
= */
/* ========== */
-/*html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {
- margin: 0;
- padding: 0;
- border: 0;
- font-weight: inherit;
- font-style: inherit;
- font-size: 100%;
- font-family: inherit;
- vertical-align: baseline;
-}*/
-
body {
margin: 0px;
padding: 0px;
@@ -133,10 +122,63 @@ section {
padding-right: 230px;
}
+.lframe {
+ border: 1px solid #dddddd;
+ -moz-box-shadow: 3px 3px 6px #959494;
+ -webkit-box-shadow: 3px 3px 6px #959494;
+ box-shadow: 3px 3px 6px #959494;
+ background-color: #efefef;
+ padding: 10px;
+}
+
+.mframe {
+ padding: 5px;
+ background-color: #efefef;
+ border: 2px dotted #eeeeee;
+ -moz-box-shadow: 3px 3px 4px #959494;
+ -webkit-box-shadow: 3px 3px 4px #959494;
+ box-shadow: 3px 3px 4px #959494;
+}
+
#wall-item-lock {
margin-left: 10px;
}
+.button {
+ border: none;
+ font-size: 1em;
+ -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
+ -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
+ box-shadow:inset 0px 1px 0px 0px #cfcfcf;
+ background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+ background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+ background-color:#bdbdbd;
+ -moz-border-radius:5px;
+ -webkit-border-radius:5px;
+ border-radius:5px;
+ color:#efefef;
+ text-align: center;
+}
+
+.button:hover {
+ border: none;
+ background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
+ background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
+ background-color:#b20202;
+ color: #efefef;
+}
+
+.button:active {
+ position:relative;
+ top:1px;
+}
+
+.button a {
+ color: #efefef;
+}
+
/* ========= */
/* = Login = */
/* ========= */
@@ -159,45 +201,16 @@ section {
#login-extra-links {
width: 90px;
margin-top: 20px;
- border: none;
- font-size: 0.9em;
- -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
- background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
- background-color:#bdbdbd;
- -moz-border-radius:5px;
- -webkit-border-radius:5px;
- border-radius:5px;
- color:#efefef;
- text-align: center;
}
#login-extra-links a {
display: block;
margin: 10px;
padding: 5px 0px 5px 0px;
- color: #efefef;
text-align: center;
margin-right: 20px;
}
-#login-extra-links:hover {
- border: none;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
- background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
- background-color:#b20202;
- color: #efefef;
-}
-
-#login-extra-links:active {
- position:relative;
- top:1px;
-}
-
#login-extra-filler {
display: none;
}
@@ -283,13 +296,14 @@ nav #user-menu {
padding: 5px;
position: relative;
vertical-align: middle;
- background:-webk/* margin-right:10px;*/it-gradient( linear, left top, left bottom, color-stop(0.05, #898988), color-stop(1, #a2a2a2) );
- background:-moz-linear-gradient( center top, #898988 5%, #a2a2a2 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#898988', endColorstr='#a2a2a2');
+ background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #797979), color-stop(1, #898988) );
+ background:-moz-linear-gradient( center top, #797979 5%, #898988 100% );
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#797979', endColorstr='#898988');
background-color:#a2a2a2;
-moz-border-radius:5px;
-webkit-border-radius:5px;
border-radius:5px;
+ border: 1px solid #9A9A9A;
color:#efefef;
text-decoration:none;
text-align: center;
@@ -317,7 +331,7 @@ ul#user-menu-popup {
width: 100%;
padding: 10px 0px;
margin: 0px;
- margin-top: 10px;
+ margin-top: 4px;
top: 20px;
left: 0px;
border: 1px solid #9a9a9a;
@@ -422,8 +436,6 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
aside {
position: absolute;
right: 11%;
-/* float: right;
- margin-right: 11%;*/
width: 260px;
margin-top: auto;
font-size: 0.8em;
@@ -478,7 +490,7 @@ aside #viewcontacts {
padding-top: 5px;
}
-#viewcontacts a{
+#viewcontacts a {
color: #898989;
}
@@ -526,7 +538,6 @@ aside #viewcontacts {
#netsearch-box {
background-color: #f6f6f6;
- /*padding: 10px 10px 10px 20px;*/
padding: 10px 8px 10px 8px;
}
#netsearch-box input[type="text"] {
@@ -747,7 +758,6 @@ ul .sidebar-group-li img{
}
#character-counter {
- /*float: left; padding: 8px 10px;*/
position: absolute: right: 100px; top:100px;
}
#profile-rotator-wrapper {
@@ -827,36 +837,10 @@ profile-jot-banner-wrapper {
padding: 5px 10px 5px 10px;
margin-right: 5px;
font-style: bold;
- -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
- background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
- background-color:#bdbdbd;
- -moz-border-radius:5px;
- -webkit-border-radius:5px;
- border-radius:5px;
- color:#efefef;
- text-decoration:none;
- text-align: center;
}
.tabs:hover {
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
- background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
- background-color:#b20202;
- color:#efefef;
- padding: 5px 10px 5px 10px;
- margin-right: 5px;
-}
-.tabs:active {
- position:relative;
- top:1px;
- color:#efefef;
padding: 5px 10px 5px 10px;
- margin-right: 5px;
}
/* ========= */
@@ -886,12 +870,6 @@ profile-jot-banner-wrapper {
.wall-item-photo-wrapper {
width: 80px; height: 80px;
position: relative;
- padding: 5px;
- background-color: #eeeeee;
- border: 1px solid #dddddd;
- -moz-box-shadow: 3px 3px 4px #959494;
- -webkit-box-shadow: 3px 3px 4px #959494;
- box-shadow: 3px 3px 4px #959494;
}
.wall-item-tools {
@@ -1072,7 +1050,7 @@ profile-jot-banner-wrapper {
.icon.drophide { float: left; }
#item-delete-selected { overflow: auto; width: 100%;}
.wall-item-outside-wrapper {
- max-width: 90%;
+ max-width: 83%;
border-bottom: 1px solid #dedede;
margin-top: 20px;
}
@@ -1089,7 +1067,11 @@ profile-jot-banner-wrapper {
}
.wall-item-outside-wrapper.comment { margin-left: 80px; }
-.wall-item-outside-wrapper.comment .wall-item-photo { width: 40px!important; height: 40px!important;}
+.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;
@@ -1157,9 +1139,6 @@ profile-jot-banner-wrapper {
color: #898989;
}
-/**
- * item text style
- **/
.wall-item-body code {
border-color: #CCCCCC;
border-style: solid;
@@ -1198,78 +1177,22 @@ div[id$="wrapper"] br { clear: left; }
width: 150px;
margin-bottom:20px;
margin-top: 20px;
- -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
- background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
- background-color:#bdbdbd;
- -moz-border-radius:5px;
- -webkit-border-radius:5px;
- border-radius:5px;
display:inline-block;
- color:#efefef;
font-style: bold;
text-align: center;
}
-#profile-listing-desc:hover {
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
- background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
- background-color:#b20202;
-}
-
-#profile-listing-desc:active {
- background-color: #b20202;
- position:relative;
- top:1px;
-}
-
-#profile-listing-desc a {
- color: #efefef;
-}
-
#profile-listing-new-link-wrapper {
float: left;
display: inline;
width: 130px;
margin-left:5px;
margin-top: 20px;
- -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
- background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
- background-color:#bdbdbd;
- -moz-border-radius:5px;
- -webkit-border-radius:5px;
- border-radius:5px;
padding: 5px 10px 5px 10px;
font-style: bold;
- color:#efefef;
text-align: center;
}
-#profile-listing-new-link-wrapper:hover {
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
- background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
- background-color:#b20202;
-}
-
-#profile-listing-new-link-wrapper:active {
- background-color: #b20202;
- position:relative;
- top:1px;
-}
-
-#profile-listing-new-link-wrapper a {
- color: #efefef;
-}
-
.profile-listing-name {
font-size: 1em;
font-variant: small-caps;
@@ -1278,52 +1201,6 @@ div[id$="wrapper"] br { clear: left; }
color: #898989;
}
-.profile-listing-visible {
- width: 90px;
- margin-bottom:20px;
- margin-top: 10px;
- -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
- background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
- background-color:#bdbdbd;
- -moz-border-radius:5px;
- -webkit-border-radius:5px;
- border-radius:5px;
- padding: 5px 10px 5px 10px;
- margin-right: 5px;
- color:#efefef;
- text-align: center;
-}
-
-.profile-listing-visible:hover {
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
- background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
- background-color:#b20202;
-}
-
-.profile-listing-visible:active {
- background-color: #b20202;
- position:relative;
- top:1px;
-}
-
-.profile-listing-visible a {
- color: #efefef;
-}
-
-.profile-listing-photo {
- padding: 5px;
- background-color: #efefef;
- border: 2px dotted #eeeeee;
- -moz-box-shadow: 3px 3px 4px #959494;
- -webkit-box-shadow: 3px 3px 4px #959494;
- box-shadow: 3px 3px 4px #959494;
-}
-
#profile-edit-links li {
display: inline;
width: 150px;
@@ -1413,13 +1290,7 @@ div[id$="wrapper"] br { clear: left; }
.photo-top-image-wrapper {
float: left;
margin: 0px 10px 10px 0px;
- border: 1px solid #dddddd;
- -moz-box-shadow: 3px 3px 6px #959494;
- -webkit-box-shadow: 3px 3px 6px #959494;
- box-shadow: 3px 3px 6px #959494;
- background-color: #efefef;
- padding: 10px;
- padding-bottom: 30px;
+ padding-bottom: 30px;
position:relative;
}
@@ -1461,12 +1332,6 @@ div[id$="wrapper"] br { clear: left; }
#photo-photo{
position: relative;
float:left;
- border: 1px solid #dddddd;
- -moz-box-shadow: 3px 3px 6px #959494;
- -webkit-box-shadow: 3px 3px 6px #959494;
- box-shadow: 3px 3px 6px #959494;
- background-color: #efefef;
- padding: 10px;
}
#photo-caption {
@@ -1533,59 +1398,23 @@ div[id$="wrapper"] br { clear: left; }
#photos-upload-perms-menu {
width: 180px;
- -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
- background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
- background-color:#bdbdbd;
- -moz-border-radius:5px;
- -webkit-border-radius:5px;
- border-radius:5px;
padding: 7px;
- text-align: center;
- font-size: 0.9em;
- color: #efefef;
-}
-
-#photos-upload-perms-menu:hover {
- text-align: center;
- font-size: 0.9em;
- width: 180px;
- padding: 7px;
- color: #efefef;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
- background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
- background-color:#b20202;
-}
-
-#photos-upload-perms-menu:active {
- text-align: center;
- font-size: 0.9em;
- width: 180px;
- padding: 7px;
- background-color: #b20202;
- position:relative;
- top:1px;
-}
-
-#photos-upload-perms-menu a {
- color: #efefef;
}
#photos-upload-perms-menu .icon {
display: none;
}
-select[size], select[multiple], select[size][multiple] {
- -webkit-appearance: listbox;
+select, input {
border: 2px solid #b0b0b0;
padding: 2px;
-webkit-border-radius: 3px 3px 3px 3px;
-moz-border-radius: 3px 3px 3px 3px;
- border-radius: 3px 3px 3px 3px;
+ border-radius: 3px 3px 3px 3px;
+}
+
+select[size], select[multiple], select[size][multiple] {
+ -webkit-appearance: listbox;
}
select {
@@ -1593,11 +1422,6 @@ select {
box-sizing: border-box;
-webkit-box-align: center;
cursor: default;
- border: 2px solid #b0b0b0;
- padding: 2px;
- -webkit-border-radius: 3px 3px 3px 3px;
- -moz-border-radius: 3px 3px 3px 3px;
- border-radius: 3px 3px 3px 3px;
}
keygen, select {
@@ -1614,57 +1438,12 @@ input, textarea, keygen {
text-shadow: none;
display: inline-block;
text-align: -webkit-auto;
- border: 2px solid #b0b0b0;
- padding: 2px;
- -webkit-border-radius: 3px 3px 3px 3px;
- -moz-border-radius: 3px 3px 3px 3px;
- border-radius: 3px 3px 3px 3px;
}
.qq-upload-button {
- background-color: none;
- -moz-box-shadow:inset 0px 1px 0px 0px #a65151;
- -webkit-box-shadow:inset 0px 1px 0px 0px #a65151;
- box-shadow:inset 0px 1px 0px 0px #a65151;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #d60808), color-stop(1, #b20202) );
- background:-moz-linear-gradient( center top, #d60808 5%, #b20202 100%);
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#d60808', endColorstr='#b20202');
- background-color:#d60808;
-moz-border-radius:5px;
-webkit-border-radius:5px;
border-radius:5px;
- border:1px solid #fc5656;
- display:inline-block;
- color:#f0e7e7;
- text-shadow:1px 1px 0px #b36f6f;
- text-align: center;
- font-size: 0.9em;
- color: #efefef;
- width: 91px;
- padding: 7px;
-}
-
-.qq-upload-button:hover {
- text-align: center;
- font-size: 0.9em;
- color: #efefef;
- width: 91px;
- padding: 7px;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) )!important;
- background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% )!important;
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808')!important;
- background-color:#b20202;
-}
-
-.qq-upload-button:active {
- text-align: center;
- font-size: 0.9em;
- color: #efefef;
- background-color: #B20202;
- width: 91px;
- padding: 7px;
- position:relative;
- top:1px;
}
#album-edit-link {
@@ -1709,41 +1488,10 @@ input#photo_edit_form {
display: inline;
margin-top: 10px;
margin-right: 10px;
- -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
- background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
- background-color:#bdbdbd;
- -moz-border-radius:5px;
- -webkit-border-radius:5px;
- border-radius:5px;
padding: 4px;
- color: #efefef;
- text-align: center;
- font-size: 0.9em;
width: 100px;
}
-#photo-edit-perms-menu:hover {
- color: #efefef;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
- background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
- background-color:#b20202;
-}
-
-#photo-edit-perms-menu:active {
- background-color: #b20202;
- position:relative;
- top:1px;
-}
-
-#photo-edit-perms-menu a {
- color: #efefef;
-}
-
#photo-edit-perms-menu .icon {
display: none;
}
@@ -1915,12 +1663,6 @@ margin-left: 90px;
.mail-conv-sender-photo {
width: 64px;
height: 64px;
- padding: 5px;
- background-color: #efefef;
- border: 1px solid #dddddd;
- -moz-box-shadow: 3px 3px 4px #959494;
- -webkit-box-shadow: 3px 3px 4px #959494;
- box-shadow: 3px 3px 4px #959494;
}
.mail-conv-sender-name { float: left; font-variant:small-caps; font-style: bold; }
@@ -1945,7 +1687,7 @@ margin-left: 90px;
/* = Notifications = */
/* ================= */
-#notification-show-hide-wrapper {
+/*#notification-show-hide-wrapper {
width: 160px;
-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
@@ -1981,7 +1723,7 @@ margin-left: 90px;
#notification-show-hide-wrapper a {
color: #efefef;
-}
+}*/
/* ============ */
/* = Contacts = */
@@ -2004,14 +1746,6 @@ margin-left: 90px;
.contact-entry-direction-wrapper {position: absolute; top: 20px;}
.contact-entry-edit-links { position: absolute; top: 60px; }
#contacts-show-hide-link { margin-bottom: 20px; margin-top: 10px; font-weight: bold;}
-.contact-entry-photo {
- padding: 3px;
- background-color: #eeeeee;
- border: 1px solid #dddddd;
- -moz-box-shadow: 3px 3px 4px #959494;
- -webkit-box-shadow: 3px 3px 4px #959494;
- box-shadow: 3px 3px 4px #959494;
-}
.contact-entry-name {
width: 100px;
@@ -2041,7 +1775,6 @@ margin-left: 90px;
#contact-edit-direction-icon { position: absolute; top: 60px; left:0px;}
#contact-edit-nav-wrapper { margin-left: 210px; }
#contact-edit-links { float: left; margin-top: 23px; }
-#contact-drop-links {/*position: absolute; top: 150px; left: 348px;*/}
#contact-edit-nav-wrapper .icon {
border: 1px solid #babdb6;
-webkit-border-radius: 3px;
@@ -2065,21 +1798,10 @@ margin-left: 90px;
#contact-edit-update-now {
width: 80px;
- -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
- background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
- background-color:#bdbdbd;
- -moz-border-radius:5px;
- -webkit-border-radius:5px;
- border-radius:5px;
padding: 5px 10px 5px 10px;
margin-left: 125px;
margin-top: 10px;
font-style: bold;
- color: #efefef;
}
#contact-edit-update-now:hover {
@@ -2119,15 +1841,6 @@ margin-left: 90px;
display: none;
}
-#contact-edit-photo {
- padding: 10px;
- background-color: #f1f1f1;
- border: 1px solid #dedede;
- margin-bottom: 5px;
- -moz-box-shadow: 5px 5px 8px #959494;
- -webkit-box-shadow: 5px 5px 8px #959494;
- box-shadow: 5px 5px 8px #959494;
-}
.contact-photo-menu {
width: auto;
border: 1px solid #ddd;
@@ -2152,15 +1865,6 @@ margin-left: 90px;
text-decoration: none;
}
-.view-contact-photo {
- padding: 5px;
- background-color: #efefef;
- border: 1px solid #dddddd;
- -moz-box-shadow: 3px 3px 4px #959494;
- -webkit-box-shadow: 3px 3px 4px #959494;
- box-shadow: 3px 3px 4px #959494;
-}
-
.view-contact-name {
font-variant: small-caps;
}
@@ -2186,6 +1890,10 @@ margin-left: 90px;
margin-bottom: 10px;
}
+#side-follow-submit {
+ width: 70px;
+}
+
#side-match-link {
width: 180px;
padding: 10px;
@@ -2268,7 +1976,7 @@ margin-left: 90px;
padding: 10px;
}
-#side-follow-wrapper{
+#side-follow-wrapper {
font-size: 1em;
font-weight: bold;
font-stretch:semi-expanded;
@@ -2289,40 +1997,8 @@ margin-left: 90px;
#contact-view-recent {
float: left;
width: 150px;
- padding: 10px;
+ padding: 5px;
margin-bottom: 20px;
- -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
- background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
- background-color:#bdbdbd;
- -moz-border-radius:5px;
- -webkit-border-radius:5px;
- border-radius:5px;
- padding: 5px 10px 5px 10px;
- color: #efefef;
- font-size: 1.2em;
- text-align: center;
-}
-
-#contact-view-recent:hover{
- color: #efefef;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
- background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
- background-color:#b20202;
-}
-
-#contact-view-recent:active {
- background-color: #b20202;
- position:relative;
- top:1px;
-}
-
-#contact-view-recent a {
- color: #efefef;
}
#contact-suggest {
@@ -2564,7 +2240,7 @@ margin-left: 90px;
float: right;
display: inline;
}
-#group-delete-icon-11 { position: absolute; left: 360px; top: 103px; }
+
.group-delete-wrapper {
width: 90px;
display: inline;
@@ -2597,7 +2273,8 @@ margin-left: 90px;
}
.group-delete-wrapper a {
- color: #efefef;
+ color: #efefef;
+ font-size: 0.9em;
}
#group-edit-desc { margin: 10px 0xp; }
@@ -2888,13 +2565,6 @@ tr {
.directory-item {
float: left;
margin: 50px 50px 0px 0px;
- padding: 10px;
- background-color: #f1f1f1;
- border: 1px solid #dedede;
- margin-bottom: 5px;
- -moz-box-shadow: 5px 5px 8px #959494;
- -webkit-box-shadow: 5px 5px 8px #959494;
- box-shadow: 5px 5px 8px #959494;
}
.directory-details {
diff --git a/view/theme/testbubble/wall_item.tpl b/view/theme/testbubble/wall_item.tpl
index 70ec00dd9..6efd331c9 100644
--- a/view/theme/testbubble/wall_item.tpl
+++ b/view/theme/testbubble/wall_item.tpl
@@ -2,7 +2,7 @@
<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
<div class="wall-item-info" id="wall-item-info-$id">
- <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id"
+ <div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-$id"
onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
diff --git a/view/theme/testbubble/wallwall_item.tpl b/view/theme/testbubble/wallwall_item.tpl
index 8819103a3..7cefc85ad 100644
--- a/view/theme/testbubble/wallwall_item.tpl
+++ b/view/theme/testbubble/wallwall_item.tpl
@@ -1,12 +1,12 @@
<div class="wall-item-outside-wrapper$indent wallwall" id="wall-item-outside-wrapper-$id" >
<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
<div class="wall-item-info wallwall" id="wall-item-info-$id">
- <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$id" >
+ <div class="wall-item-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$id" >
<a href="$owner_url" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
<img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" style="height: 80px; width: 80px;" alt="$owner_name" /></a>
</div>
<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$wall" /></div>
- <div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$id"
+ <div class="wall-item-photo-wrapper mframe wwfrom" id="wall-item-photo-wrapper-$id"
onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
diff --git a/view/viewcontact_template.tpl b/view/viewcontact_template.tpl
index 3436a5c45..83693bfb1 100644
--- a/view/viewcontact_template.tpl
+++ b/view/viewcontact_template.tpl
@@ -1,7 +1,7 @@
<div class="view-contact-wrapper" id="view-contact-wrapper-$id" >
<div class="view-contact-photo-wrapper" >
- <div class="view-contact-photo" id="view-contact-photo-$id" >
+ <div class="mframe view-contact-photo" id="view-contact-photo-$id" >
<a href="$url" title="$alt_text" /><img src="$thumb" alt="$name" /></a>
</div>
<div class="view-contact-photo-end" ></div>
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index 7db8b8697..ca47ea1e6 100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -1,69 +1,50 @@
-{{ if $indent }}{{ else }}
-<div class="wall-item-decor">
- <span class="icon s22 star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span>
- {{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }}
- <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $indent">
- <div class="wall-item-item">
- <div class="wall-item-info">
- <div class="wall-item-photo-wrapper"
- onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
- onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
+<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
+ <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
+ <div class="wall-item-info" id="wall-item-info-$id">
+ <div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-$id"
+ onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
+ onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
- <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
+ <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" />
</a>
- <a href="#" rel="#wall-item-photo-menu-$id" class="fakelink wall-item-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
- <ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-$id">
- $item_photo_menu
- </ul>
-
+ <span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
+ <div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
+ <ul>
+ $item_photo_menu
+ </ul>
+ </div>
+ </div>
+ <div class="wall-item-photo-end"></div>
+ <div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
+ $lock
+ <div class="wall-item-location" id="wall-item-location-$id">$location</div>
</div>
- <div class="wall-item-location">$location</div>
- </div>
- <div class="wall-item-content">
- {{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
- $body
</div>
- </div>
- <div class="wall-item-bottom">
- <div class="wall-item-links">
- {{ if $plink }}<a class="icon s16 link" title="$plink.title" href="$plink.href">$plink.title</a>{{ endif }}
+ <div class="wall-item-author">
+ <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
+ <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
+
+ </div>
+ <div class="wall-item-content" id="wall-item-content-$id" >
+ <div class="wall-item-title" id="wall-item-title-$id">$title</div>
+ <div class="wall-item-title-end"></div>
+ <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
</div>
- <div class="wall-item-actions">
- <div class="wall-item-actions-author">
- <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> <span class="wall-item-ago">$ago</span>
- </div>
-
- <div class="wall-item-actions-social">
- {{ if $star }}
- <a href="#" id="star-$id" onclick="dostar($id); return false;" class="$star.classdo" title="$star.do">$star.do</a>
- <a href="#" id="unstar-$id" onclick="dostar($id); return false;" class="$star.classundo" title="$star.undo">$star.undo</a>
- {{ endif }}
-
- {{ if $vote }}
- <a href="#" id="like-$id" title="$vote.like.0" onclick="dolike($id,'like'); return false">$vote.like.1</a>
- <a href="#" id="dislike-$id" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false">$vote.dislike.1</a>
- {{ endif }}
-
- {{ if $vote.share }}
- <a href="#" id="share-$id" title="$vote.share.0" onclick="jotShare($id); return false">$vote.share.1</a>
- {{ endif }}
- </div>
-
- <div class="wall-item-actions-tools">
-
- {{ if $drop.dropping }}
- <input type="checkbox" title="$drop.select" name="itemselected[]" value="$id" />
- <a href="item/drop/$id" onclick="return confirmDelete();" class="icon delete s16" title="$drop.delete">$drop.delete</a>
- {{ endif }}
- {{ if $edpost }}
- <a class="icon edit s16" href="$edpost.0" title="$edpost.1"></a>
- {{ endif }}
- </div>
-
+ <div class="wall-item-tools" id="wall-item-tools-$id">
+ $vote
+ $plink
+ $edpost
+ $star
+ $drop
</div>
</div>
+ <div class="wall-item-wrapper-end"></div>
+ <div class="wall-item-like" id="wall-item-like-$id">$like</div>
+ <div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
+ <div class="wall-item-comment-wrapper" >
+ $comment
+ </div>
+
+<div class="wall-item-outside-wrapper-end$indent" ></div>
</div>
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index 35bea4a86..502bdda32 100644
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -1,12 +1,12 @@
{#<div class="wall-item-outside-wrapper$indent wallwall" id="wall-item-outside-wrapper-$id" >
<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
<div class="wall-item-info wallwall" id="wall-item-info-$id">
- <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$id" >
+ <div class="wall-item-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$id" >
<a href="$owner_url" target="redir" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
<img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" style="height: 80px; width: 80px;" alt="$owner_name" /></a>
</div>
<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$wall" /></div>
- <div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$id"
+ <div class="wall-item-photo-wrapper mframe wwfrom" id="wall-item-photo-wrapper-$id"
onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">