diff --git a/template-extension/distributed/samples/my-picture.tpl b/template-extension/distributed/samples/my-picture.tpl
index 715f3fa2f..0d47a8273 100644
--- a/template-extension/distributed/samples/my-picture.tpl
+++ b/template-extension/distributed/samples/my-picture.tpl
@@ -33,47 +33,65 @@
{if !empty($PLUGIN_PICTURE_BEFORE)}{$PLUGIN_PICTURE_BEFORE}{/if}
diff --git a/themes/dark/images/s26_outline_ffff80.png b/themes/dark/images/s26_outline_ffff80.png
new file mode 100644
index 000000000..2232f0395
Binary files /dev/null and b/themes/dark/images/s26_outline_ffff80.png differ
diff --git a/themes/dark/images/s26_outline_ffffff.png b/themes/dark/images/s26_outline_ffffff.png
new file mode 100644
index 000000000..d440b68d9
Binary files /dev/null and b/themes/dark/images/s26_outline_ffffff.png differ
diff --git a/themes/dark/theme.css b/themes/dark/theme.css
index 56d441091..c52d69767 100644
--- a/themes/dark/theme.css
+++ b/themes/dark/theme.css
@@ -6,7 +6,7 @@ INPUT.rateButtonSelected /* <= why IE doesn't inherit this ? */ {
}
H2, #menubar DT {
- color: #fff48e;
+ color: #ffff80;
}
@@ -67,9 +67,17 @@ UL.thumbnails SPAN.wrap2:hover,
/* links */
A, INPUT.rateButton {
color: #fff;
- border: 0;
}
A:hover {
- color: #FFF48E;
-}
\ No newline at end of file
+ color: #ffff80;
+}
+
+.pwg-icon {
+ background-image: url(images/s26_outline_ffffff.png);
+}
+
+A:hover .pwg-icon {
+ background-image: url(images/s26_outline_ffff80.png);
+}
+
diff --git a/themes/default/icon/category_children.png b/themes/default/icon/category_children.png
deleted file mode 100644
index 7205c3f61..000000000
Binary files a/themes/default/icon/category_children.png and /dev/null differ
diff --git a/themes/default/icon/category_representant_random.png b/themes/default/icon/category_representant_random.png
deleted file mode 100644
index dfa69846f..000000000
Binary files a/themes/default/icon/category_representant_random.png and /dev/null differ
diff --git a/themes/default/iconset.css b/themes/default/iconset.css
index 5be7cbde4..3f03d0a48 100644
--- a/themes/default/iconset.css
+++ b/themes/default/iconset.css
@@ -65,11 +65,9 @@ A.pwg-state-default, A.pwg-state-default:visited, A.pwg-state-default:hover {
.pwg-icon-repeat-play {background-position: -156px -130px}
.pwg-icon-repeat-stop {background-position: -182px -130px}
+.pwg-icon-map {background-position: 0 -156px}
-A.pwg-button {
- border: 1px solid blue;
-}
-.pwg-state-default:hover {
- border-color: green;
+A.pwg-state-default:hover {
+ border: 0 !important; /*don't add bottom border on hover*/
}
diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index 4739b88b3..9afef3d5a 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -1,4 +1,3 @@
-
{* Example of resizeable *}
{*
{include file='include/autosize.inc.tpl'}
@@ -38,51 +37,63 @@
-{include file='picture_toolbar.tpl'}
+ {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'}
+
{$ELEMENT_CONTENT}
diff --git a/themes/default/template/picture_nav_buttons.tpl b/themes/default/template/picture_nav_buttons.tpl
index 0bb50bd8f..03000676b 100644
--- a/themes/default/template/picture_nav_buttons.tpl
+++ b/themes/default/template/picture_nav_buttons.tpl
@@ -1,67 +1,88 @@
-
-
- {'caddie'|@translate}
-
-{/if}{*caddie management END*}
-
{$ELEMENT_CONTENT}
{if isset($COMMENT_IMG)}
diff --git a/themes/default/theme.css b/themes/default/theme.css
index ee84b150a..10d3834a1 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -136,11 +136,6 @@ UL.categoryActions LI {
display: inline;
}
-UL.categoryActions A IMG, UL.categoryActions A {
- border: 0;
- margin-bottom: -5px;
-}
-
/* begin chronology/calendar elements*/
.content .calendarViews {
display: block;
@@ -343,22 +338,16 @@ UL.thumbnails IMG {
#imageToolBar {
text-align: center;
- position: relative;
clear: both;
margin-bottom: 4px;
padding: 0;
height: 28px;
}
-#imageToolBar A, #imageToolBar IMG {
- display: block;
- border: 0;
- margin: 0; padding: 0;
-}
-#imageToolBar A { width: 48px; }
-#imageToolBar IMG { margin: 2px auto; }
-#imageToolBar .randomButtons A { float: left; }
-#imageToolBar .navButtons A { float: right; }
+#imageToolBar .actionButtons { float: left; }
+#imageToolBar .navigationButtons { float: right; }
+#imageToolBar .pwg-button {width:42px;}
+
#theImage {
clear: left;
@@ -728,11 +717,8 @@ UL.thumbnails SPAN.thumbLegend {
/**
* Default colors
*/
-#imageToolBar * {
- background: inherit;
-}
-/* So that non-links are slightly greyed out */
+ /* So that non-links are slightly greyed out */
.content .navigationBar, .calItemEmpty, TD.calDayCellEmpty {
color: #b0b0b0;
}
- {/if}
- {if isset($U_SLIDESHOW_STOP) }
- 
- {/if}
- 
- {if isset($current.U_DOWNLOAD) }
- 
- {/if}
- {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if}
- {if isset($favorite) }
- 
- {/if}
- {if !empty($U_SET_AS_REPRESENTATIVE) }
- 
- {/if}
- {if isset($U_ADMIN) }
- 
- {/if}
- {if isset($U_CADDIE) }{*caddie management BEGIN*}
+ 
- {/if}{*caddie management END*}
- 
