diff --git a/images/icons/10/link.png b/images/icons/10/link.png
new file mode 100644
index 0000000000..0619f4511b
Binary files /dev/null and b/images/icons/10/link.png differ
diff --git a/images/icons/16/link.png b/images/icons/16/link.png
new file mode 100644
index 0000000000..afec9cc300
Binary files /dev/null and b/images/icons/16/link.png differ
diff --git a/images/icons/22/link.png b/images/icons/22/link.png
new file mode 100644
index 0000000000..e819ad3ac8
Binary files /dev/null and b/images/icons/22/link.png differ
diff --git a/images/icons/48/link.png b/images/icons/48/link.png
new file mode 100644
index 0000000000..b32eec5293
Binary files /dev/null and b/images/icons/48/link.png differ
diff --git a/images/icons/Makefile b/images/icons/Makefile
new file mode 100644
index 0000000000..39428d1545
--- /dev/null
+++ b/images/icons/Makefile
@@ -0,0 +1,31 @@
+
+IMAGES=add.png edit.png gear.png info.png menu.png \
+ notify_off.png star.png delete.png feed.png group.png \
+ lock.png notice.png notify_on.png user.png link.png
+
+DESTS=10/ 16/ 22/ 48/ \
+ $(addprefix 10/, $(IMAGES)) \
+ $(addprefix 16/, $(IMAGES)) \
+ $(addprefix 22/, $(IMAGES)) \
+ $(addprefix 48/, $(IMAGES))
+
+all: $(DESTS)
+
+%/:
+ mkdir $@
+
+10/%.png: %.png
+ convert $< -resize 10x10 $@
+
+16/%.png: %.png
+ convert $< -resize 16x16 $@
+
+22/%.png: %.png
+ convert $< -resize 22x22 $@
+
+48/%.png: %.png
+ convert $< -resize 48x48 $@
+
+
+
+
diff --git a/images/icons/link.png b/images/icons/link.png
new file mode 100644
index 0000000000..743bdf0f93
Binary files /dev/null and b/images/icons/link.png differ
diff --git a/images/icons/make.sh b/images/icons/make.sh
deleted file mode 100644
index 3481174116..0000000000
--- a/images/icons/make.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-sizes="10 16 22 48"
-
-for s in $sizes
-do
- echo "=[ ${s}x${s} ]===="
- [ -d $s ] || mkdir $s
- for f in *.png
- do
- convert $f -resize ${s}x${s} $s/$f
- echo -n "#"
- done
- echo
-done
-echo "Ok."
diff --git a/include/conversation.php b/include/conversation.php
index acbbc9bd5e..8dcc1bff41 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -134,8 +134,6 @@ function conversation(&$a, $items, $mode, $update) {
$cmnt_tpl = get_markup_template('comment_item.tpl');
- $like_tpl = get_markup_template('like.tpl');
- $noshare_tpl = get_markup_template('like_noshare.tpl');
$tpl = get_markup_template('wall_item.tpl');
$wallwall = get_markup_template('wallwall_item.tpl');
$droptpl = get_markup_template('wall_item_drop.tpl');
@@ -393,13 +391,18 @@ function conversation(&$a, $items, $mode, $update) {
if($page_writeable) {
if($toplevelpost) {
- $likebuttons = replace_macros(((($shareable)) ? $like_tpl : $noshare_tpl),array(
+ /*$likebuttons = replace_macros(((($shareable)) ? $like_tpl : $noshare_tpl),array(
'$id' => $item['id'],
'$likethis' => t("I like this \x28toggle\x29"),
'$nolike' => t("I don't like this \x28toggle\x29"),
'$share' => t('Share'),
'$wait' => t('Please wait')
- ));
+ ))*/
+ $likebuttons = array(
+ 'like' => array( t("I like this \x28toggle\x29"), t("like")),
+ 'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")),
+ );
+ if ($shareable) $likebuttons['share'] = array( t('Share this'), t('share'));
}
if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
@@ -421,9 +424,8 @@ function conversation(&$a, $items, $mode, $update) {
}
$edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes'))
- ? ''
- : '');
+ ? array($a->get_baseurl()."/editpost/".$item['id'], t("Edit"))
+ : False);
$drop = '';
@@ -432,7 +434,11 @@ function conversation(&$a, $items, $mode, $update) {
if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
$dropping = true;
- $drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id'], '$select' => t('Select'), '$delete' => t('Delete')));
+ $drop = array(
+ 'dropping' => $dropping,
+ 'select' => t('Select'),
+ 'delete' => t('Delete'),
+ );
$star = false;
@@ -535,7 +541,8 @@ function conversation(&$a, $items, $mode, $update) {
'$vote' => $likebuttons,
'$like' => $like,
'$dislike' => $dislike,
- '$comment' => $comment
+ '$comment' => $comment,
+ '$wait' => t('Please wait'),
));
diff --git a/view/like.tpl b/view/like.tpl
deleted file mode 100644
index f4f2e1671f..0000000000
--- a/view/like.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/view/like_noshare.tpl b/view/like_noshare.tpl
deleted file mode 100644
index 2c467c3c26..0000000000
--- a/view/like_noshare.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index 1f5cbcaeb3..0850d739d7 100644
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -19,15 +19,29 @@
$lock
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
index add2cd5a09..d880dd9d49 100644
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -24,15 +24,30 @@
$lock
$title
diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl
index a4508b067c..a81eda7652 100644
--- a/view/theme/duepuntozero/wall_item.tpl
+++ b/view/theme/duepuntozero/wall_item.tpl
@@ -31,15 +31,30 @@
$body
diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl
index daad6ad149..a958ba65ae 100644
--- a/view/theme/duepuntozero/wallwall_item.tpl
+++ b/view/theme/duepuntozero/wallwall_item.tpl
@@ -35,15 +35,30 @@
$body
diff --git a/view/theme/loozah/wall_item.tpl b/view/theme/loozah/wall_item.tpl
index a4508b067c..a81eda7652 100644
--- a/view/theme/loozah/wall_item.tpl
+++ b/view/theme/loozah/wall_item.tpl
@@ -31,15 +31,30 @@
$body
diff --git a/view/theme/loozah/wallwall_item.tpl b/view/theme/loozah/wallwall_item.tpl
index daad6ad149..a958ba65ae 100644
--- a/view/theme/loozah/wallwall_item.tpl
+++ b/view/theme/loozah/wallwall_item.tpl
@@ -35,15 +35,30 @@
$body
diff --git a/view/theme/quattro/icons.less b/view/theme/quattro/icons.less
index c5dc1937ba..525ca48d82 100644
--- a/view/theme/quattro/icons.less
+++ b/view/theme/quattro/icons.less
@@ -44,7 +44,7 @@
}
&.s48 {
width:48px; height: 48px;
- .icons(22);
+ .icons(48);
}
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 95dd61adb7..1be65ea917 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -21,10 +21,18 @@ body {
-webkit-border-radius: @arguments;
border-radius: @arguments;
}
-
.roundbottom (@radius: 5px){ .rounded(0, 0, @radius, @radius); }
.roundtop (@radius: 5px){ .rounded(@radius, @radius, 0, 0); }
+.opaque(@v: 0.5){
+ opacity: @v;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+
a, a:link { color: @Link; text-decoration: none; }
a:visited { color: @LinkVisited; text-decoration: none; }
a:hover {color: @LinkHover; text-decoration: underline; }
@@ -257,7 +265,7 @@ section {
/* wall item */
.tread-wrapper {
- background-color: @ThreadBackgroundColor;
+ background-color: @ThreadBackgroundColor;
position: relative;
padding: 10px;
margin-bottom: 20px;
@@ -268,7 +276,6 @@ section {
.wall-item-container {
display: table;
width: 780px;
- margin-bottom: 10px;
.wall-item-item,
.wall-item-bottom { display: table-row; }
@@ -290,22 +297,51 @@ section {
.wall-item-photo-menu { display: none; }
}
+ .wall-item-location {
+ word-wrap: break-word;
+ width: 50px;
+ }
.wall-item-content {
display: table-cell;
- font-size: 12px;
+ font-size: 16px;
max-width: 720px;
word-wrap: break-word;
}
.wall-item-content img { max-width: 710px; }
.wall-item-links,
- .wall-item-actions { display: table-cell; }
+ .wall-item-actions {
+ display: table-cell;
+ vertical-align: middle;
+
+ .icon {
+ .opaque(0.5);
+ }
+ .icon:hover {
+ .opaque(1.0);
+ }
+ }
.wall-item-ago { padding-right: 40px; }
+ .wall-item-name { font-weight: bold; }
+
+ .wall-item-actions-author { float: left; width: 25%; margin-top: 0.5em; }
+ .wall-item-actions-social { float: left; width: 50%; margin-top: 0.5em;
+ a { margin-right: 3em; }
+ }
+ .wall-item-actions-tools { float: right; width: 25%;
+ a { float: right; }
+ input { float: right; }
+ }
}
+
+
+
.wall-item-container.comment {
+ margin-top: 50px;
.wall-item-photo { width: 32px; height: 32px; margin-left: 16px;}
.wall-item-photo-menu-button {
top: 13px !important;
left: 10px !important;
}
+ .wall-item-links { padding-left: 12px; }
}
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index ad50ee3271..4d9e12540a 100644
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -121,34 +121,34 @@
height: 48px;
}
.icon.s48.notify {
- background-image: url("../../../images/icons/22/notify_off.png");
+ background-image: url("../../../images/icons/48/notify_off.png");
}
.icon.s48.gear {
- background-image: url("../../../images/icons/22/gear.png");
+ background-image: url("../../../images/icons/48/gear.png");
}
.icon.s48.add {
- background-image: url("../../../images/icons/22/add.png");
+ background-image: url("../../../images/icons/48/add.png");
}
.icon.s48.delete {
- background-image: url("../../../images/icons/22/delete.png");
+ background-image: url("../../../images/icons/48/delete.png");
}
.icon.s48.edit {
- background-image: url("../../../images/icons/22/edit.png");
+ background-image: url("../../../images/icons/48/edit.png");
}
.icon.s48.star {
- background-image: url("../../../images/icons/22/star.png");
+ background-image: url("../../../images/icons/48/star.png");
}
.icon.s48.menu {
- background-image: url("../../../images/icons/22/menu.png");
+ background-image: url("../../../images/icons/48/menu.png");
}
.icon.s48.link {
- background-image: url("../../../images/icons/22/link.png");
+ background-image: url("../../../images/icons/48/link.png");
}
.icon.s48.lock {
- background-image: url("../../../images/icons/22/lock.png");
+ background-image: url("../../../images/icons/48/lock.png");
}
.icon.s48.unlock {
- background-image: url("../../../images/icons/22/unlock.png");
+ background-image: url("../../../images/icons/48/unlock.png");
}
/* global */
body {
@@ -507,7 +507,6 @@ section {
.wall-item-container {
display: table;
width: 780px;
- margin-bottom: 10px;
}
.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
display: table-row;
@@ -534,9 +533,13 @@ section {
.wall-item-container .wall-item-info .wall-item-photo-menu {
display: none;
}
+.wall-item-container .wall-item-location {
+ word-wrap: break-word;
+ width: 50px;
+}
.wall-item-container .wall-item-content {
display: table-cell;
- font-size: 12px;
+ font-size: 16px;
max-width: 720px;
word-wrap: break-word;
}
@@ -545,10 +548,56 @@ section {
}
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
display: table-cell;
+ vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+ opacity: 0.5;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
+ opacity: 1;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
}
.wall-item-container .wall-item-ago {
padding-right: 40px;
}
+.wall-item-container .wall-item-name {
+ font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+ float: left;
+ width: 25%;
+ margin-top: 0.5em;
+}
+.wall-item-container .wall-item-actions-social {
+ float: left;
+ width: 50%;
+ margin-top: 0.5em;
+}
+.wall-item-container .wall-item-actions-social a {
+ margin-right: 3em;
+}
+.wall-item-container .wall-item-actions-tools {
+ float: right;
+ width: 25%;
+}
+.wall-item-container .wall-item-actions-tools a {
+ float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+ float: right;
+}
+.wall-item-container.comment {
+ margin-top: 50px;
+}
.wall-item-container.comment .wall-item-photo {
width: 32px;
height: 32px;
@@ -558,3 +607,6 @@ section {
top: 13px !important;
left: 10px !important;
}
+.wall-item-container.comment .wall-item-links {
+ padding-left: 12px;
+}
diff --git a/view/theme/testbubble/wall_item.tpl b/view/theme/testbubble/wall_item.tpl
index 47f062affb..29cf657056 100644
--- a/view/theme/testbubble/wall_item.tpl
+++ b/view/theme/testbubble/wall_item.tpl
@@ -26,16 +26,32 @@
diff --git a/view/theme/testbubble/wallwall_item.tpl b/view/theme/testbubble/wallwall_item.tpl
index 4fe677ab4d..70c13bc976 100644
--- a/view/theme/testbubble/wallwall_item.tpl
+++ b/view/theme/testbubble/wallwall_item.tpl
@@ -24,10 +24,30 @@
$lock
$title
diff --git a/view/wall_fake_drop.tpl b/view/wall_fake_drop.tpl
deleted file mode 100644
index db34441d55..0000000000
--- a/view/wall_fake_drop.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index 39cb33f0fe..7db8b86977 100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -2,6 +2,7 @@
$star.starred
{{ if $lock }}
$lock{{ endif }}
+
{{ endif }}
diff --git a/view/wall_item_drop.tpl b/view/wall_item_drop.tpl
deleted file mode 100644
index 30fa6c3356..0000000000
--- a/view/wall_item_drop.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-