aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-10-17 16:37:37 +0200
committerFabio Comuni <fabrix.xm@gmail.com>2011-10-17 16:37:37 +0200
commit2116943964e0c10984976f6d38eba044e35f983a (patch)
treec351abcd1ccd033c36b472f73d087a8343ee638d /view
parent906addf865ccab2c98d5035fc6c1b10d43004dfe (diff)
parent1df892ebbce59ac6293eacbe065ebc71826b4d85 (diff)
downloadvolse-hubzilla-2116943964e0c10984976f6d38eba044e35f983a.tar.gz
volse-hubzilla-2116943964e0c10984976f6d38eba044e35f983a.tar.bz2
volse-hubzilla-2116943964e0c10984976f6d38eba044e35f983a.zip
Merge remote-tracking branch 'friendika/master'
Diffstat (limited to 'view')
-rw-r--r--view/contacts-top.tpl1
-rw-r--r--view/directory_header.tpl1
-rw-r--r--view/follow.tpl5
-rw-r--r--view/jot-header.tpl7
-rw-r--r--view/jot.tpl3
-rw-r--r--view/mail_head.tpl9
-rw-r--r--view/peoplefind.tpl12
-rw-r--r--view/settings.tpl24
-rw-r--r--view/settings_addons.tpl2
-rw-r--r--view/settings_connectors.tpl34
-rw-r--r--view/theme/dispy/jot.tpl3
-rw-r--r--view/theme/duepuntozero/nav.tpl4
-rw-r--r--view/theme/duepuntozero/style.css24
-rw-r--r--view/theme/quattro/jot.tpl77
-rw-r--r--view/theme/quattro/quattro.less182
-rw-r--r--view/theme/quattro/style.css175
-rw-r--r--view/theme/testbubble/style.css34
17 files changed, 539 insertions, 58 deletions
diff --git a/view/contacts-top.tpl b/view/contacts-top.tpl
index 324980093..4dffda1ce 100644
--- a/view/contacts-top.tpl
+++ b/view/contacts-top.tpl
@@ -4,6 +4,7 @@ $finding
<div id="contacts-search-wrapper">
<form id="contacts-search-form" action="$cmd" method="get" >
+<span class="contacts-search-desc">$desc</span>
<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="$search" />
<input type="submit" name="submit" id="contacts-search-submit" value="$submit" />
</form>
diff --git a/view/directory_header.tpl b/view/directory_header.tpl
index ba90b94f8..1f03540f2 100644
--- a/view/directory_header.tpl
+++ b/view/directory_header.tpl
@@ -7,6 +7,7 @@ $finding
<div id="directory-search-wrapper">
<form id="directory-search-form" action="directory" method="get" >
+<span class="dirsearch-desc">$desc</span>
<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" class="button" />
</form>
diff --git a/view/follow.tpl b/view/follow.tpl
index 2c024930c..259e74a93 100644
--- a/view/follow.tpl
+++ b/view/follow.tpl
@@ -1,9 +1,8 @@
<div id="follow-sidebar" class="widget">
- <h3>Find People</h3>
+ <h3>$connect</h3>
+ <div id="connect-desc">$desc</div>
<form action="follow" method="post" />
<input id="side-follow-url" type="text" name="url" size="24" title="$hint" /><input id="side-follow-submit" type="submit" name="submit" value="$follow" />
</form>
- $findSimilar
- $inviteFriends
</div>
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 5eb07db44..22bd0aa5b 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -149,13 +149,6 @@ function initEditor(cb){
}
}
- function jotGetVideo() {
- reply = prompt("$utubeurl");
- if(reply && reply.length) {
- tinyMCE.execCommand('mceInsertRawHTML',false,'[youtube]' + reply + '[/youtube]');
- }
- }
-
function jotVideoURL() {
reply = prompt("$vidurl");
if(reply && reply.length) {
diff --git a/view/jot.tpl b/view/jot.tpl
index aa9892cbb..71b92986d 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -32,9 +32,6 @@
<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
<a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
</div>
- <div id="profile-youtube-wrapper" style="display: $visitor;" >
- <a id="profile-youtube" class="icon youtube" title="$youtube" onclick="jotGetVideo();return false;"></a>
- </div>
<div id="profile-video-wrapper" style="display: $visitor;" >
<a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
</div>
diff --git a/view/mail_head.tpl b/view/mail_head.tpl
index 2aeb3006e..afb65f537 100644
--- a/view/mail_head.tpl
+++ b/view/mail_head.tpl
@@ -1,10 +1,3 @@
<h3>$messages</h3>
-<div class="message-links">
-<ul>
-<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>
-<div class="message-links-end"></div>
+$tab_content
diff --git a/view/peoplefind.tpl b/view/peoplefind.tpl
new file mode 100644
index 000000000..4b3f01b88
--- /dev/null
+++ b/view/peoplefind.tpl
@@ -0,0 +1,12 @@
+<div id="peoplefind-sidebar" class="widget">
+ <h3>$findpeople</h3>
+ <div id="peoplefind-desc">$desc</div>
+ <form action="dirfind" method="post" />
+ <input id="side-peoplefind-url" type="text" name="search" size="24" title="$hint" /><input id="side-peoplefind-submit" type="submit" name="submit" value="$findthem" />
+ </form>
+ <div class="side-link" id="side-match-link"><a href="match" >$similar</a></div>
+ {{ if $inv }}
+ <div class="side-link" id="side-invite-link" ><a href="invite" >$inv</a></div>
+ {{ endif }}
+</div>
+
diff --git a/view/settings.tpl b/view/settings.tpl
index b79fbfe43..3bbfc6ffd 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -4,9 +4,6 @@ $tabs
$nickname_block
-<div id="uexport-link"><a href="uexport" >$uexport</a></div>
-
-
<form action="settings" id="settings-form" method="post" autocomplete="off" >
@@ -95,27 +92,6 @@ $hide_wall
<input type="submit" name="submit" class="settings-submit" value="$submit" />
</div>
-{{ if $mail_disabled }}
-
-{{ else }}
- <h3 class="settings-heading">$h_imap</h3>
- <p>$imap_desc</p>
- {{inc field_custom.tpl with $field=$imap_lastcheck }}{{endinc}}
- {{inc field_input.tpl with $field=$mail_server }}{{endinc}}
- {{inc field_input.tpl with $field=$mail_port }}{{endinc}}
- {{inc field_select.tpl with $field=$mail_ssl }}{{endinc}}
- {{inc field_input.tpl with $field=$mail_user }}{{endinc}}
- {{inc field_password.tpl with $field=$mail_pass }}{{endinc}}
- {{inc field_input.tpl with $field=$mail_replyto }}{{endinc}}
- {{inc field_checkbox.tpl with $field=$mail_pubmail }}{{endinc}}
-
- <div class="settings-submit-wrapper" >
- <input type="submit" name="submit" class="settings-submit" value="$submit" />
- </div>
-{{ endif }}
-
-
-
<h3 class="settings-heading">$h_advn</h3>
diff --git a/view/settings_addons.tpl b/view/settings_addons.tpl
index 8fe0b5194..2cbfd17e9 100644
--- a/view/settings_addons.tpl
+++ b/view/settings_addons.tpl
@@ -3,7 +3,7 @@ $tabs
<h1>$title</h1>
-<form action="settings/addon" method="post" >
+<form action="settings/addon" method="post" autocomplete="off">
$settings_addons
diff --git a/view/settings_connectors.tpl b/view/settings_connectors.tpl
new file mode 100644
index 000000000..0f3357873
--- /dev/null
+++ b/view/settings_connectors.tpl
@@ -0,0 +1,34 @@
+$tabs
+
+<h1>$title</h1>
+
+<div class="connector_statusmsg">$diasp_enabled</div>
+<div class="connector_statusmsg">$ostat_enabled</div>
+
+<form action="settings/connectors" method="post" autocomplete="off">
+
+$settings_connectors
+
+{{ if $mail_disabled }}
+
+{{ else }}
+ <div class="settings-block">
+ <h3 class="settings-heading">$h_imap</h3>
+ <p>$imap_desc</p>
+ {{inc field_custom.tpl with $field=$imap_lastcheck }}{{endinc}}
+ {{inc field_input.tpl with $field=$mail_server }}{{endinc}}
+ {{inc field_input.tpl with $field=$mail_port }}{{endinc}}
+ {{inc field_select.tpl with $field=$mail_ssl }}{{endinc}}
+ {{inc field_input.tpl with $field=$mail_user }}{{endinc}}
+ {{inc field_password.tpl with $field=$mail_pass }}{{endinc}}
+ {{inc field_input.tpl with $field=$mail_replyto }}{{endinc}}
+ {{inc field_checkbox.tpl with $field=$mail_pubmail }}{{endinc}}
+
+ <div class="settings-submit-wrapper" >
+ <input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="$submit" />
+ </div>
+ </div>
+{{ endif }}
+
+</form>
+
diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl
index f6bf91ffa..a2c883e4b 100644
--- a/view/theme/dispy/jot.tpl
+++ b/view/theme/dispy/jot.tpl
@@ -37,9 +37,6 @@
<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
<a id="profile-link" class="icon border link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
</div>
- <div id="profile-youtube-wrapper" class="jot-tool" style="display: none;" >
- <a id="profile-youtube" class="icon border youtube" title="$youtube" onclick="jotGetVideo(); return false;"></a>
- </div>
<div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
<a id="profile-video" class="icon border video" title="$video" onclick="jotVideoURL(); return false;"></a>
</div>
diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl
index b13ea9ae2..afa918065 100644
--- a/view/theme/duepuntozero/nav.tpl
+++ b/view/theme/duepuntozero/nav.tpl
@@ -30,8 +30,8 @@
{{ if $nav.community }}
<a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
{{ endif }}
- {{ if $nav.notifications }}
- <a id="nav-notify-link" class="nav-commlink $nav.notifications.2 $sel.notifications" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
+ {{ if $nav.introductions }}
+ <a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
<span id="intro-update" class="nav-ajax-left"></span>
{{ endif }}
{{ if $nav.messages }}
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index b46a03c38..9bb866e76 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -145,7 +145,6 @@ nav .nav-link {
background-color: transparent !important;
}
-
.nav-commlink.selected {
background-color: #ffffff;
border-bottom: 1px solid #ffffff;
@@ -1849,13 +1848,28 @@ a.mail-list-link {
#side-follow-wrapper {
margin-top: 20px;
}
-#side-follow-url {
+#side-follow-url, #side-peoplefind-url {
margin-top: 5px;
}
-#side-follow-submit {
+#side-follow-submit, #side-peoplefind-submit {
margin-top: 15px;
}
+#side-match-link {
+ margin-top: 10px;
+}
+
+.widget {
+ border: 1px solid #DDDDDD;
+ padding: 8px;
+ margin-top: 5px;
+ -moz-border-radius:5px;
+ -webkit-border-radius:5px;
+ border-radius:5px;
+
+}
+
+
.photo-album-image-wrapper {
float: left;
margin-top: 15px;
@@ -2641,8 +2655,8 @@ a.mail-list-link {
border-color:#204A87;
padding-right: 40px;
background-position: right center;
- background-color: #3465A4;
- color: #FFFFFF;
+ background-color: #D7E3F1;
+ color: #204A87;
text-align: left;
}
.hidden { display: none!important; }
diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl
new file mode 100644
index 000000000..d65ac8b17
--- /dev/null
+++ b/view/theme/quattro/jot.tpl
@@ -0,0 +1,77 @@
+
+<div id="profile-jot-wrapper" >
+ <div id="profile-jot-banner-wrapper">
+ <div id="profile-jot-desc" >&nbsp;</div>
+ <div id="character-counter" class="grey"></div>
+ </div>
+ <div id="profile-jot-banner-end"></div>
+
+ <form id="profile-jot-form" action="$action" method="post" >
+ <input type="hidden" name="type" value="$ptyp" />
+ <input type="hidden" name="profile_uid" value="$profile_uid" />
+ <input type="hidden" name="return" value="$return_path" />
+ <input type="hidden" name="location" id="jot-location" value="$defloc" />
+ <input type="hidden" name="coord" id="jot-coord" value="" />
+ <input type="hidden" name="title" id="jot-title" value="" />
+ <input type="hidden" name="post_id" value="$post_id" />
+
+ <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+ <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
+
+ {{ if $content }}<script>initEditor();</script>{{ endif }}
+
+<div id="profile-jot-submit-wrapper" style="display:none">
+ <div id="profile-upload-wrapper" style="display: $visitor;" >
+ <div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload">image upload</a></div>
+ </div>
+ <div id="profile-attach-wrapper" style="display: $visitor;" >
+ <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach">attach file</a></div>
+ </div>
+
+ <div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+ <a id="profile-link" class="link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;">enter link</a>
+ </div>
+ <div id="profile-video-wrapper" style="display: $visitor;" >
+ <a id="profile-video" class="video" title="$video" onclick="jotVideoURL();return false;">video url</a>
+ </div>
+ <div id="profile-audio-wrapper" style="display: $visitor;" >
+ <a id="profile-audio" class="audio" title="$audio" onclick="jotAudioURL();return false;">audio url</a>
+ </div>
+ <div id="profile-location-wrapper" style="display: $visitor;" >
+ <a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;">set location</a>
+ </div>
+ <div id="profile-nolocation-wrapper" style="display: none;" >
+ <a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;">no location</a>
+ </div>
+ <div id="profile-title-wrapper" style="display: $visitor;" >
+ <a id="profile-title" class="article" title="$title" onclick="jotTitle();return false;">title</a>
+ </div>
+ <div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
+ <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="$lockstate" title="$permset" >permissions</a>$bang
+ </div>
+<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
+ <div id="profile-jot-perms-end"></div>
+
+ <div id="profile-jot-plugin-wrapper">
+ $jotplugins
+ </div>
+
+ <div id="profile-rotator-wrapper" style="display: $visitor;" >
+ <img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+ </div>
+
+ <div style="display: none;">
+ <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+ $acl
+ <hr style="clear:both"/>
+ <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
+ <div id="profile-jot-email-end"></div>
+ $jotnets
+ </div>
+ </div>
+
+</div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 31a25694f..9f47cf099 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -374,4 +374,186 @@ section {
border: 1px solid @CommentBoxEmptyBorderColor;
padding:0.3em;
}
+#profile-jot-plugin-wrapper,
+#profile-jot-submit-wrapper {
+ margin-top: 10px;
+}
+
+
+#profile-jot-submit {
+ float: left;
+}
+#profile-upload-wrapper{
+ float: left;
+ margin-left: 10px;
+}
+#profile-attach-wrapper,
+#profile-rotator,
+#profile-link-wrapper,
+#profile-youtube-wrapper,
+#profile-video-wrapper,
+#profile-audio-wrapper,
+#profile-location-wrapper,
+#profile-nolocation-wrapper,
+#profile-title-wrapper {
+ float: left;
+ margin-left: 20px;
+}
+
+#profile-jot-perms {
+ float: left;
+ margin-left: 35px;
+ margin-right: 35px;
+}
+
+#profile-jot-perms-end {
+ /*clear: left;*/
+ height: 20px;
+}
+
+#profile-jot-plugin-end{
+ clear: both;
+}
+.profile-jot-net {
+ float: left;
+ margin-right: 10px;
+ margin-top: 5px;
+ margin-bottom: 5px;
+}
+
+#profile-jot-networks-end {
+ clear: both;
+}
+
+#profile-jot-end, #about-jot-end {
+ margin-bottom: 15px;
+}
+#about-jot-submit-wrapper {
+ margin-top: 15px;
+}
+/** buttons **/
+input[type="submit"] {
+ border: 1px solid;
+ background-color: @BodyColor;
+ font: bold 85%;
+ color: @Grey1;
+ height: 20px;
+ padding: 10px 5px;
+ border-radius: 8px;
+ -moz-border-radius: 8px;
+ -webkit-border-radius: 8px;
+}
+
+
+/** acl **/
+#photo-edit-perms-select,
+#photos-upload-permissions-wrapper,
+#profile-jot-acl-wrapper{
+ display:block!important;
+}
+
+
+
+#acl-wrapper {
+ width: 690px;
+ float:left;
+}
+#acl-search {
+ float:right;
+ background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+ padding-right:20px;
+}
+#acl-showall {
+ float: left;
+ display: block;
+ width: auto;
+ height: 18px;
+ background-color: #cccccc;
+ background-image: url("../../../images/show_all_off.png");
+ background-position: 7px 7px;
+ background-repeat: no-repeat;
+ padding: 7px 5px 0px 30px;
+ -webkit-border-radius: 5px ;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ color: #999999;
+}
+#acl-showall.selected {
+ color: #000000;
+ background-color: #ff9900;
+ background-image: url("../../../images/show_all_on.png");
+}
+
+#acl-list {
+ height: 210px;
+ border: 1px solid #cccccc;
+ clear: both;
+ margin-top: 30px;
+ overflow: auto;
+}
+#acl-list-content {
+
+}
+.acl-list-item {
+ display: block;
+ width: 150px;
+ height: 30px;
+ border: 1px solid #cccccc;
+ margin: 5px;
+ float: left;
+}
+.acl-list-item img{
+ width:22px;
+ height: 22px;
+ float: left;
+ margin: 4px;
+}
+.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
+.acl-list-item a {
+ font-size: 8px;
+ display: block;
+ width: 40px;
+ height: 10px;
+ float: left;
+ color: #999999;
+ background-color: #cccccc;
+ background-position: 3px 3px;
+ background-repeat: no-repeat;
+ margin-right: 5px;
+ -webkit-border-radius: 2px ;
+ -moz-border-radius: 2px;
+ border-radius: 2px;
+ padding-left: 15px;
+}
+#acl-wrapper a:hover {
+ text-decoration: none;
+ color:#000000;
+}
+.acl-button-show { background-image: url("../../../images/show_off.png"); }
+.acl-button-hide { background-image: url("../../../images/hide_off.png"); }
+
+.acl-button-show.selected {
+ color: #000000;
+ background-color: #9ade00;
+ background-image: url("../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+ color: #000000;
+ background-color: #ff4141;
+ background-image: url("../../../images/hide_on.png");
+}
+.acl-list-item.groupshow { border-color: #9ade00; }
+.acl-list-item.grouphide { border-color: #ff4141; }
+/** /acl **/
+
+/** tab buttons **/
+ul.tabs {
+ list-style-type: none;
+ padding-bottom: 10px;
+
+ li {
+ float: left;
+ margin-left: 20px;
+ }
+}
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index f3237801d..56c4bc967 100644
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -641,3 +641,178 @@ section {
border: 1px solid #999999;
padding: 0.3em;
}
+#profile-jot-plugin-wrapper, #profile-jot-submit-wrapper {
+ margin-top: 10px;
+}
+#profile-jot-submit {
+ float: left;
+}
+#profile-upload-wrapper {
+ float: left;
+ margin-left: 10px;
+}
+#profile-attach-wrapper,
+#profile-rotator,
+#profile-link-wrapper,
+#profile-youtube-wrapper,
+#profile-video-wrapper,
+#profile-audio-wrapper,
+#profile-location-wrapper,
+#profile-nolocation-wrapper,
+#profile-title-wrapper {
+ float: left;
+ margin-left: 20px;
+}
+#profile-jot-perms {
+ float: left;
+ margin-left: 35px;
+ margin-right: 35px;
+}
+#profile-jot-perms-end {
+ /*clear: left;*/
+
+ height: 20px;
+}
+#profile-jot-plugin-end {
+ clear: both;
+}
+.profile-jot-net {
+ float: left;
+ margin-right: 10px;
+ margin-top: 5px;
+ margin-bottom: 5px;
+}
+#profile-jot-networks-end {
+ clear: both;
+}
+#profile-jot-end, #about-jot-end {
+ margin-bottom: 15px;
+}
+#about-jot-submit-wrapper {
+ margin-top: 15px;
+}
+/** buttons **/
+input[type="submit"] {
+ border: 1px solid;
+ background-color: #2d2d2d;
+ font: bold 85%;
+ color: #ffffff;
+ height: 20px;
+ padding: 10px 5px;
+ border-radius: 8px;
+ -moz-border-radius: 8px;
+ -webkit-border-radius: 8px;
+}
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+ display: block!important;
+}
+#acl-wrapper {
+ width: 690px;
+ float: left;
+}
+#acl-search {
+ float: right;
+ background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+ padding-right: 20px;
+}
+#acl-showall {
+ float: left;
+ display: block;
+ width: auto;
+ height: 18px;
+ background-color: #cccccc;
+ background-image: url("../../../images/show_all_off.png");
+ background-position: 7px 7px;
+ background-repeat: no-repeat;
+ padding: 7px 5px 0px 30px;
+ -webkit-border-radius: 5px ;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ color: #999999;
+}
+#acl-showall.selected {
+ color: #000000;
+ background-color: #ff9900;
+ background-image: url("../../../images/show_all_on.png");
+}
+#acl-list {
+ height: 210px;
+ border: 1px solid #cccccc;
+ clear: both;
+ margin-top: 30px;
+ overflow: auto;
+}
+.acl-list-item {
+ display: block;
+ width: 150px;
+ height: 30px;
+ border: 1px solid #cccccc;
+ margin: 5px;
+ float: left;
+}
+.acl-list-item img {
+ width: 22px;
+ height: 22px;
+ float: left;
+ margin: 4px;
+}
+.acl-list-item p {
+ height: 12px;
+ font-size: 10px;
+ margin: 0px;
+ padding: 2px 0px 1px;
+ overflow: hidden;
+}
+.acl-list-item a {
+ font-size: 8px;
+ display: block;
+ width: 40px;
+ height: 10px;
+ float: left;
+ color: #999999;
+ background-color: #cccccc;
+ background-position: 3px 3px;
+ background-repeat: no-repeat;
+ margin-right: 5px;
+ -webkit-border-radius: 2px ;
+ -moz-border-radius: 2px;
+ border-radius: 2px;
+ padding-left: 15px;
+}
+#acl-wrapper a:hover {
+ text-decoration: none;
+ color: #000000;
+}
+.acl-button-show {
+ background-image: url("../../../images/show_off.png");
+}
+.acl-button-hide {
+ background-image: url("../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+ color: #000000;
+ background-color: #9ade00;
+ background-image: url("../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+ color: #000000;
+ background-color: #ff4141;
+ background-image: url("../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+ border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+ border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons **/
+ul.tabs {
+ list-style-type: none;
+ padding-bottom: 10px;
+}
+ul.tabs li {
+ float: left;
+ margin-left: 20px;
+}
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 341314c1d..4a3edc163 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -823,7 +823,7 @@ profile-jot-banner-wrapper {
/* ======== */
.tabs {
- width: 450px;
+ width: 600px;
list-style: none;
padding: 10px;
margin: 0px 0px 10px 0px;
@@ -2105,10 +2105,17 @@ margin-left: 0px;
.openid {
background: url(login-bg.gif) no-repeat;
background-position: 0 50%;
- padding-left: 18px;
+ padding-left: 18px !important;
width: 385px;
}
+.openid {
+ width: 150px !important;
+}
+#login-password {
+ width: 168px !important;
+}
+
#profile-tabs-wrapper {
padding-top: 10px;
}
@@ -2211,6 +2218,25 @@ margin-left: 0px;
padding: 5px;
}
+.settings-block {
+ margin-top: 20px;
+ -moz-box-shadow: 1px 2px 6px 0px #959494;
+ -webkit-box-shadow: 1px 2px 6px 0px #959494;
+ box-shadow: 1px 2px 6px 0px #959494;
+ background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #f8f8f8), color-stop(1, #f6f6f6) );
+ background:-moz-linear-gradient( center top, #f8f8f8 5%, #f6f6f6 100% );
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f8f8f8', endColorstr='#f6f6f6');
+ background-color:#f8f8f8;
+ -moz-border-radius:5px;
+ -webkit-border-radius:5px;
+ border-radius:5px;
+ border:1px solid #eee;
+ color:#a6a6a6;
+ text-shadow:-1px 0px 0px #bdbdbd;
+ border: 1px solid #cdcdcd;
+ padding: 5px;
+}
+
#register-form div,
#profile-edit-form div {
clear: both;
@@ -2595,6 +2621,10 @@ tr {
width: 150px;
}
+.directory-end {
+ clear: both;
+}
+
/* ========= */
/* = Admin = */
/* ========= */