diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/contacts-top.tpl | 1 | ||||
| -rw-r--r-- | view/follow.tpl | 5 | ||||
| -rw-r--r-- | view/jot-header.tpl | 7 | ||||
| -rw-r--r-- | view/jot.tpl | 3 | ||||
| -rw-r--r-- | view/peoplefind.tpl | 12 | ||||
| -rw-r--r-- | view/settings.tpl | 24 | ||||
| -rw-r--r-- | view/settings_addons.tpl | 2 | ||||
| -rw-r--r-- | view/settings_connectors.tpl | 34 | ||||
| -rw-r--r-- | view/theme/duepuntozero/style.css | 24 | ||||
| -rw-r--r-- | view/theme/testbubble/style.css | 21 |
10 files changed, 89 insertions, 44 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/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/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/duepuntozero/style.css b/view/theme/duepuntozero/style.css index b46a03c38..40c3cb81b 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: 5px; + 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/testbubble/style.css b/view/theme/testbubble/style.css index 341314c1d..dd9d24299 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; @@ -2211,6 +2211,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; |