aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rwxr-xr-xview/categories_widget.tpl13
-rwxr-xr-xview/jot.tpl1
-rwxr-xr-xview/theme/darkzero/style.css8
-rwxr-xr-xview/theme/diabook-aerith/communityhome.tpl1
-rw-r--r--view/theme/diabook-aerith/fpostit/fpostit.php4
-rwxr-xr-xview/theme/diabook-aerith/theme.php3
-rwxr-xr-xview/theme/diabook-blue/communityhome.tpl1
-rw-r--r--view/theme/diabook-blue/fpostit/fpostit.php4
-rwxr-xr-xview/theme/diabook-blue/theme.php3
-rwxr-xr-xview/theme/diabook-red/communityhome.tpl1
-rw-r--r--view/theme/diabook-red/fpostit/fpostit.php4
-rwxr-xr-xview/theme/diabook-red/theme.php3
-rwxr-xr-xview/theme/diabook/communityhome.tpl1
-rw-r--r--view/theme/diabook/fpostit/fpostit.php4
-rwxr-xr-xview/theme/diabook/theme.php3
-rwxr-xr-xview/theme/duepuntozero/style.css22
16 files changed, 53 insertions, 23 deletions
diff --git a/view/categories_widget.tpl b/view/categories_widget.tpl
new file mode 100755
index 000000000..061821beb
--- /dev/null
+++ b/view/categories_widget.tpl
@@ -0,0 +1,13 @@
+<div class="clear"></div>
+<div id="categories-sidebar" class="widget">
+ <h3>$title</h3>
+ <div id="nets-desc">$desc</div>
+
+ <ul class="categories-ul">
+ <li class="tool"><a href="$base" class="categories-link categories-all{{ if $sel_all }} categories-selected{{ endif }}">$all</a></li>
+ {{ for $terms as $term }}
+ <li class="tool"><a href="$base?f=&category=$term.name" class="categories-link{{ if $term.selected }} categories-selected{{ endif }}">$term.name</a></li>
+ {{ endfor }}
+ </ul>
+
+</div>
diff --git a/view/jot.tpl b/view/jot.tpl
index 5fe1f954e..91de628ac 100755
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -15,6 +15,7 @@
<input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="preview" id="jot-preview" value="0" />
<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
+ <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
<div id="jot-text-wrap">
<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>
diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css
index 3b395ff2a..12c7d3c25 100755
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@@ -76,17 +76,21 @@ input#dfrn-url {
}
-#jot-title {
+#jot-title, #jot-category {
background-color: #333333;
border: 1px solid #333333;
}
#jot-title::-webkit-input-placeholder{ color: #555555!important;}
#jot-title:-moz-placeholder{color: #555555!important;}
+#jot-category::-webkit-input-placeholder{ color: #555555!important;}
+#jot-category:-moz-placeholder{color: #555555!important;}
#jot-title:hover,
-#jot-title:focus {
+#jot-title:focus,
+#jot-category:hover,
+#jot-category:focus {
border: 1px solid #cccccc;
}
blockquote {
diff --git a/view/theme/diabook-aerith/communityhome.tpl b/view/theme/diabook-aerith/communityhome.tpl
index 917af49f1..c26d02dc6 100755
--- a/view/theme/diabook-aerith/communityhome.tpl
+++ b/view/theme/diabook-aerith/communityhome.tpl
@@ -34,6 +34,7 @@
{{ if $nv }}
<h3>Find Friends<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></h3>
<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
+<a class="$nv.global_directory.2" href="$nv.global_directory.0" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>
diff --git a/view/theme/diabook-aerith/fpostit/fpostit.php b/view/theme/diabook-aerith/fpostit/fpostit.php
index 65c43a2b9..4505c9946 100644
--- a/view/theme/diabook-aerith/fpostit/fpostit.php
+++ b/view/theme/diabook-aerith/fpostit/fpostit.php
@@ -113,12 +113,12 @@ function showForm($error, $content) {
echo <<<EOF
<div class='wrap1'>
<h2><img class='logo' src='friendika-32.png' align='middle';/>
- Friendika Bookmarklet</h2>
+ Friendica Bookmarklet</h2>
</div>
<div class="wrap2">
<form method="post" action="{$_SERVER['PHP_SELF']}">
- Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)<br /><br />
+ Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br />
Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index e9fe8e0f0..490010750 100755
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -139,7 +139,8 @@ function diabook_aerith_community_info(){
//nav FIND FRIENDS
if(local_user()) {
$nv = array();
- $nv['directory'] = Array('directory', t('Directory'), "", "");
+ $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
+ $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
$nv['match'] = Array('match', t('Similar Interests'), "", "");
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl
index cff75cd40..3b95b376e 100755
--- a/view/theme/diabook-blue/communityhome.tpl
+++ b/view/theme/diabook-blue/communityhome.tpl
@@ -34,6 +34,7 @@
{{ if $nv }}
<h3>Find Friends<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></h3>
<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
+<a class="$nv.global_directory.2" href="$nv.global_directory.0" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>
diff --git a/view/theme/diabook-blue/fpostit/fpostit.php b/view/theme/diabook-blue/fpostit/fpostit.php
index 65c43a2b9..4505c9946 100644
--- a/view/theme/diabook-blue/fpostit/fpostit.php
+++ b/view/theme/diabook-blue/fpostit/fpostit.php
@@ -113,12 +113,12 @@ function showForm($error, $content) {
echo <<<EOF
<div class='wrap1'>
<h2><img class='logo' src='friendika-32.png' align='middle';/>
- Friendika Bookmarklet</h2>
+ Friendica Bookmarklet</h2>
</div>
<div class="wrap2">
<form method="post" action="{$_SERVER['PHP_SELF']}">
- Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)<br /><br />
+ Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br />
Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 3d54ba9ef..891c13cbf 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -139,7 +139,8 @@ function diabook_blue_community_info(){
//nav FIND FRIENDS
if(local_user()) {
$nv = array();
- $nv['directory'] = Array('directory', t('Directory'), "", "");
+ $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
+ $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
$nv['match'] = Array('match', t('Similar Interests'), "", "");
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
diff --git a/view/theme/diabook-red/communityhome.tpl b/view/theme/diabook-red/communityhome.tpl
index 326c766b2..91935a9d3 100755
--- a/view/theme/diabook-red/communityhome.tpl
+++ b/view/theme/diabook-red/communityhome.tpl
@@ -34,6 +34,7 @@
{{ if $nv }}
<h3>Find Friends<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></h3>
<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
+<a class="$nv.global_directory.2" href="$nv.global_directory.0" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>
diff --git a/view/theme/diabook-red/fpostit/fpostit.php b/view/theme/diabook-red/fpostit/fpostit.php
index 65c43a2b9..4505c9946 100644
--- a/view/theme/diabook-red/fpostit/fpostit.php
+++ b/view/theme/diabook-red/fpostit/fpostit.php
@@ -113,12 +113,12 @@ function showForm($error, $content) {
echo <<<EOF
<div class='wrap1'>
<h2><img class='logo' src='friendika-32.png' align='middle';/>
- Friendika Bookmarklet</h2>
+ Friendica Bookmarklet</h2>
</div>
<div class="wrap2">
<form method="post" action="{$_SERVER['PHP_SELF']}">
- Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)<br /><br />
+ Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br />
Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php
index b091295b7..44a76a5e4 100755
--- a/view/theme/diabook-red/theme.php
+++ b/view/theme/diabook-red/theme.php
@@ -139,7 +139,8 @@ function diabook_red_community_info(){
//nav FIND FRIENDS
if(local_user()) {
$nv = array();
- $nv['directory'] = Array('directory', t('Directory'), "", "");
+ $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
+ $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
$nv['match'] = Array('match', t('Similar Interests'), "", "");
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
index 91871a7b9..d344cad31 100755
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
@@ -34,6 +34,7 @@
{{ if $nv }}
<h3>Find Friends<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></h3>
<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
+<a class="$nv.global_directory.2" href="$nv.global_directory.0" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>
diff --git a/view/theme/diabook/fpostit/fpostit.php b/view/theme/diabook/fpostit/fpostit.php
index 65c43a2b9..4505c9946 100644
--- a/view/theme/diabook/fpostit/fpostit.php
+++ b/view/theme/diabook/fpostit/fpostit.php
@@ -113,12 +113,12 @@ function showForm($error, $content) {
echo <<<EOF
<div class='wrap1'>
<h2><img class='logo' src='friendika-32.png' align='middle';/>
- Friendika Bookmarklet</h2>
+ Friendica Bookmarklet</h2>
</div>
<div class="wrap2">
<form method="post" action="{$_SERVER['PHP_SELF']}">
- Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)<br /><br />
+ Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br />
Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 6ac64beda..d6ee57316 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -143,7 +143,8 @@ function diabook_community_info(){
//right_aside FIND FRIENDS
if(local_user()) {
$nv = array();
- $nv['directory'] = Array('directory', t('Directory'), "", "");
+ $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
+ $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
$nv['match'] = Array('match', t('Similar Interests'), "", "");
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 1f897f3b0..38c1fc5bd 100755
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -285,7 +285,7 @@ div.wall-item-content-wrapper.shiny {
float: left;
}
-#jot-title {
+#jot-title, #jot-category {
border: 0px;
margin: 0px;
height: 20px;
@@ -296,11 +296,15 @@ div.wall-item-content-wrapper.shiny {
}
#jot-title::-webkit-input-placeholder{font-weight: normal;}
+#jot-category::-webkit-input-placeholder{font-weight: normal;}
#jot-title:-moz-placeholder{font-weight: normal;}
+#jot-category:-moz-placeholder{font-weight: normal;}
#jot-title:hover,
-#jot-title:focus {
+#jot-title:focus,
+#jot-category:hover,
+#jot-category:focus {
border: 1px solid #cccccc;
}
@@ -322,7 +326,7 @@ div.wall-item-content-wrapper.shiny {
margin-bottom: 10px;
}
-.group-selected, .nets-selected, .fileas-selected {
+.group-selected, .nets-selected, .fileas-selected, .categories-selected {
padding: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
@@ -1881,11 +1885,11 @@ a.mail-list-link {
margin-top: 10px;
}
-.nets-ul, .fileas-ul {
+.nets-ul, .fileas-ul, .categories-ul {
list-style-type: none;
}
-.nets-ul li, .fileas-ul li {
+.nets-ul li, .fileas-ul li, .categories-ul li {
margin-top: 10px;
}
@@ -1896,11 +1900,11 @@ a.mail-list-link {
margin-left: 42px;
}
-.fileas-link {
+.fileas-link, .categories-link {
margin-left: 24px;
}
-.fileas-all {
+.fileas-all, .categories-all {
margin-left: 0px;
}
@@ -2628,12 +2632,12 @@ aside input[type='text'] {
margin-top: 10px;
}
-.body-tag, .filesavetags {
+.body-tag, .filesavetags, .categorytags {
opacity: 0.5;
filter:alpha(opacity=50);
}
-.body-tag:hover, .filesavetags:hover {
+.body-tag:hover, .filesavetags:hover, .categorytags:hover {
opacity: 1.0 !important;
filter:alpha(opacity=100) !important;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 17:31:35 +0000