Merge branch 'pull'

4 files changed, 39 insertions, 5 deletions

diff --git a/view/theme/dispy/icons.png b/view/theme/dispy/icons.png
index 2f0459bd3..f42330d65 100644
--- a/view/theme/dispy/icons.png
+++ b/view/theme/dispy/icons.png
diff --git a/view/theme/dispy/icons.svg b/view/theme/dispy/icons.svg
index 998e2641f..7b82b94ea 100644
--- a/view/theme/dispy/icons.svg
+++ b/view/theme/dispy/icons.svg
@@ -52,7 +52,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.9403009"
-     inkscape:cx="73.744486"
+     inkscape:cx="64.725266"
      inkscape:cy="108.36719"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
      inkscape:window-width="1065"
      inkscape:window-height="742"
      inkscape:window-x="40"
-     inkscape:window-y="61"
+     inkscape:window-y="50"
      inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
@@ -2168,5 +2168,23 @@
        transform="translate(22,0)"
        width="250"
        height="200" />
+    <g
+       transform="translate(-2.0523e-4,-5e-4)"
+       id="g4823">
+      <path
+         style="fill:#e6e6e6"
+         d="m 12,16 -12.00914477,0 0,-13.6988082 2.83893857,-2.12898488 11.8211932,0 0,14.04031008 z"
+         id="path4821"
+         inkscape:connector-curvature="0"
+         transform="translate(232.52235,913.88168)"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         sodipodi:nodetypes="cccccccccccccszscc"
+         transform="translate(232.52235,913.88168)"
+         inkscape:connector-curvature="0"
+         id="path4819"
+         d="m -0.00914477,2.3011918 2.83893857,-2.12898488 11.8211932,0 0,14.04031008 L 13.73679,14.984131 13.640962,1.0093271 3.4856425,0.91349949 1.1272469,2.7572384 12,2.7572384 12,16 -0.00914477,16 z M 8.2958276,12.045759 c -1.8631354,-1.086398 0.045759,-2.6807932 0.045759,-3.6707932 0,-0.99 -0.6423808,-2.2112618 -2.2457592,-2.1833105 C 4.4924492,6.2196066 3.8500685,7.0875 3.8500685,8.4166667 c 0,1.3291666 2.1768916,1.6857063 -0.1958961,3.6876733 z"
+         style="fill:#1a1a1a" />
+    </g>
   </g>
 </svg>
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 6547cf986..9b480385d 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -2023,6 +2023,16 @@ div[id$="wrapper"] br {
 	opacity: 1.0 !important;
 	filter:alpha(opacity=100) !important;
 }
+.filesavetags {
+	margin: 20px 0;
+	opacity: 0.5;
+	filter:alpha(opacity=50);
+}
+.filesavetags:hover {
+	margin: 20px 0;
+	opacity: 1.0 !important;
+	filter:alpha(opacity=100) !important;
+}
 .item-select {
 	opacity: 0.1;
 	filter:alpha(opacity=10);
@@ -2474,6 +2484,9 @@ div[id$="wrapper"] br {
 .dislike {
 	background-position: -190px 0;
 }
+.file-as {
+	background-position: -230px -60px;
+}
 .like {
 	background-position: -211px 0;
 }
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index c67a88635..c9ac20c89 100644
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -4,9 +4,7 @@
 			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
 				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
 				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
-				</a>
+				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"><img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
 				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
 				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
 					<ul>
@@ -37,6 +35,11 @@
 				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 			</div>
 			{{ endif }}
+
+			{{ if $item.filer }}
+				<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
+			{{ endif }}
+
 			{{ if $item.plink }}
 				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
 			{{ endif }}