diff --git a/copyright.graphics b/copyright.graphics
index 1b94791..d8c00ba 100644
--- a/copyright.graphics
+++ b/copyright.graphics
@@ -28,6 +28,7 @@ Attribution ShareAlike 2.5 license
design/icons/multimedia-dell-dj-pocket_tango.svg
design/icons/multimedia-player-ipod-mini-blue_tango.svg
design/icons/multimedia-player-motorola-rokr_tango.svg
+ design/icons/package-x-generic_tango.svg
design/icons/preferences-desktop-locale_tango.svg
design/icons/preferences-system_tango.svg
design/icons/system-log-out_tango.svg
diff --git a/design/cryptobox_backgrounds.svg b/design/cryptobox_backgrounds.svg
index b8d2d03..4686c5c 100644
--- a/design/cryptobox_backgrounds.svg
+++ b/design/cryptobox_backgrounds.svg
@@ -15,7 +15,7 @@
sodipodi:version="0.32"
inkscape:version="0.44.1"
sodipodi:docbase="/home/lars/subversion/cryptobox/trunk/design"
- sodipodi:docname="background_frame_corner.svg"
+ sodipodi:docname="cryptobox_backgrounds.svg"
inkscape:export-filename="/home/lars/subversion/cryptobox/branches/pythonrewrite/www-data/background_frame_corner.png"
inkscape:export-xdpi="76.669998"
inkscape:export-ydpi="76.669998">
@@ -67,7 +67,7 @@
style="stop-color:#d2d2d2;stop-opacity:1;" />
+ gradientTransform="matrix(-1.205649,0,0,-1,-676.181,633.2943)" />
image/svg+xml
+ CryptoBox: background items
+ 02006-09-01
+
+
+ Sense.Lab e.V. (http://senselab.org)
+
+
+
+
+
+ Sense.Lab e.V. (http://senselab.org)
+
+
+
+
+ Sense.Lab e.V. (http://senselab.org)
+
+
+ https://systemausfall.org/svn/cryptobox/tags/v0.3.3/design/cryptobox_backgrounds.svgh
+ https://systemausfall.org/svn/cryptobox/tags/v0.3.3/design/cryptobox_backgrounds.svg
+
+
+ backgrounds cryptobox
+
+
+
+
+
+
+
+
+
+ 160x80
+ id="tspan9966">240x120
register_passive2register_passive2160x80
+ x="301.40115"
+ y="431.95465"
+ id="tspan1945">240x120
footer_linefooter_line494x3
+
+
diff --git a/design/icons/preferences-desktop-locale_tango.svg b/design/icons/preferences-desktop-locale_tango.svg
deleted file mode 100644
index e5e87cd..0000000
--- a/design/icons/preferences-desktop-locale_tango.svg
+++ /dev/null
@@ -1,828 +0,0 @@
-
-
-
diff --git a/plugins/help/plugin_icon.gif b/plugins/help/plugin_icon.gif
index 32595ee..950e6d1 100644
Binary files a/plugins/help/plugin_icon.gif and b/plugins/help/plugin_icon.gif differ
diff --git a/plugins/help/plugin_icon.png b/plugins/help/plugin_icon.png
index c379200..f82dd23 100644
Binary files a/plugins/help/plugin_icon.png and b/plugins/help/plugin_icon.png differ
diff --git a/plugins/logs/plugin_icon.gif b/plugins/logs/plugin_icon.gif
index a5f8618..9baccec 100644
Binary files a/plugins/logs/plugin_icon.gif and b/plugins/logs/plugin_icon.gif differ
diff --git a/plugins/logs/plugin_icon.png b/plugins/logs/plugin_icon.png
index 1fbb4f0..11813bb 100644
Binary files a/plugins/logs/plugin_icon.png and b/plugins/logs/plugin_icon.png differ
diff --git a/plugins/network/plugin_icon.gif b/plugins/network/plugin_icon.gif
index b186f88..5dc465e 100644
Binary files a/plugins/network/plugin_icon.gif and b/plugins/network/plugin_icon.gif differ
diff --git a/plugins/network/plugin_icon.png b/plugins/network/plugin_icon.png
index 0a1ee2d..56a3b9f 100644
Binary files a/plugins/network/plugin_icon.png and b/plugins/network/plugin_icon.png differ
diff --git a/plugins/partition/language.hdf b/plugins/partition/language.hdf
index 6f430cb..9299fc0 100644
--- a/plugins/partition/language.hdf
+++ b/plugins/partition/language.hdf
@@ -38,7 +38,7 @@ Help {
PartMode = You may choose between 'automatic' and 'manual' partitioning. Automatic partitioning creates only one partition for the whole disk. With manual partition you can split the disk into multiple parts of different size.
ConfigPartition = This CryptoBox is configured to store its runtime settings on a separate disk partition. It will be created automatically if necessary. This reduces the available size of the disk by 5 megabyte.
RemoveExistingContainers = Whenever you change the partition table of a disk, you will loose all volumes that were previously defined inside of it.
- PartitionList = Choose a size for your partitions and add it to the list by clicking on 'Add'. Nothing will get written to your disk until you click on 'Write new partition table' below. Be very careful: you will erase all data on this disk.
+ PartitionList = Choose the size for a new partition and add it to the list by clicking on 'Add partition'. Nothing will get written to your disk until you click on 'Write new partition table' below. Be very careful: you will erase all data on this disk.
}
diff --git a/plugins/plugin_icon_unknown.gif b/plugins/plugin_icon_unknown.gif
index 7bee58e..d5722d8 100644
Binary files a/plugins/plugin_icon_unknown.gif and b/plugins/plugin_icon_unknown.gif differ
diff --git a/plugins/plugin_icon_unknown.png b/plugins/plugin_icon_unknown.png
index d6e9b3a..769723d 100644
Binary files a/plugins/plugin_icon_unknown.png and b/plugins/plugin_icon_unknown.png differ
diff --git a/plugins/plugin_manager/plugin_icon.gif b/plugins/plugin_manager/plugin_icon.gif
index 4c0b2c9..8d1e41c 100644
Binary files a/plugins/plugin_manager/plugin_icon.gif and b/plugins/plugin_manager/plugin_icon.gif differ
diff --git a/plugins/plugin_manager/plugin_icon.png b/plugins/plugin_manager/plugin_icon.png
index 236169c..50fe0f7 100644
Binary files a/plugins/plugin_manager/plugin_icon.png and b/plugins/plugin_manager/plugin_icon.png differ
diff --git a/plugins/plugin_manager/plugin_list.cs b/plugins/plugin_manager/plugin_list.cs
index 51ce8cb..b53dcaa 100644
--- a/plugins/plugin_manager/plugin_list.cs
+++ b/plugins/plugin_manager/plugin_list.cs
@@ -41,7 +41,10 @@
each:x = Settings.PluginList ?>
-
+
" alt="" class="logo" />
checked="checked" />
checked="checked" />
checked="checked" />
@@ -97,7 +100,10 @@
loop:index = #0, #100, #1 ?>
-
+
" alt="" class="logo" />
checked="checked" />
checked="checked" />
checked="checked" />
diff --git a/plugins/plugin_manager/plugin_manager.css b/plugins/plugin_manager/plugin_manager.css
index 17a1cf2..09058bf 100644
--- a/plugins/plugin_manager/plugin_manager.css
+++ b/plugins/plugin_manager/plugin_manager.css
@@ -10,6 +10,12 @@ table.plugin_list td, table.plugin_list th {
table.plugin_list td img {
width: 24px;
height: 24px;
+ vertical-align: middle;
+}
+
+table.plugin_list td img.logo {
+ width: 32px;
+ height: 32px;
}
table.plugin_list a img {
diff --git a/plugins/shutdown/plugin_icon.gif b/plugins/shutdown/plugin_icon.gif
index 96fd8f7..4c0a92d 100644
Binary files a/plugins/shutdown/plugin_icon.gif and b/plugins/shutdown/plugin_icon.gif differ
diff --git a/plugins/shutdown/plugin_icon.png b/plugins/shutdown/plugin_icon.png
index 9d537e7..aa501c9 100644
Binary files a/plugins/shutdown/plugin_icon.png and b/plugins/shutdown/plugin_icon.png differ
diff --git a/plugins/system_preferences/plugin_icon.gif b/plugins/system_preferences/plugin_icon.gif
index 9f60626..ef2cc1b 100644
Binary files a/plugins/system_preferences/plugin_icon.gif and b/plugins/system_preferences/plugin_icon.gif differ
diff --git a/plugins/system_preferences/plugin_icon.png b/plugins/system_preferences/plugin_icon.png
index 1355333..944e66c 100644
Binary files a/plugins/system_preferences/plugin_icon.png and b/plugins/system_preferences/plugin_icon.png differ
diff --git a/plugins/user_manager/plugin_icon.gif b/plugins/user_manager/plugin_icon.gif
index 04a9d51..cc17170 100644
Binary files a/plugins/user_manager/plugin_icon.gif and b/plugins/user_manager/plugin_icon.gif differ
diff --git a/plugins/user_manager/plugin_icon.png b/plugins/user_manager/plugin_icon.png
index e035d2b..dc8ef9b 100644
Binary files a/plugins/user_manager/plugin_icon.png and b/plugins/user_manager/plugin_icon.png differ
diff --git a/plugins/volume_details/plugin_icon.gif b/plugins/volume_details/plugin_icon.gif
index 013c691..5261c06 100644
Binary files a/plugins/volume_details/plugin_icon.gif and b/plugins/volume_details/plugin_icon.gif differ
diff --git a/plugins/volume_details/plugin_icon.png b/plugins/volume_details/plugin_icon.png
index d15b3b3..68e78ae 100644
Binary files a/plugins/volume_details/plugin_icon.png and b/plugins/volume_details/plugin_icon.png differ
diff --git a/plugins/volume_format_fs/plugin_icon.gif b/plugins/volume_format_fs/plugin_icon.gif
index 479611f..9a159b0 100644
Binary files a/plugins/volume_format_fs/plugin_icon.gif and b/plugins/volume_format_fs/plugin_icon.gif differ
diff --git a/plugins/volume_format_fs/plugin_icon.png b/plugins/volume_format_fs/plugin_icon.png
index 85f58d3..d5dcb80 100644
Binary files a/plugins/volume_format_fs/plugin_icon.png and b/plugins/volume_format_fs/plugin_icon.png differ
diff --git a/plugins/volume_mount/plugin_icon.gif b/plugins/volume_mount/plugin_icon.gif
index 5106ecd..bec3e7f 100644
Binary files a/plugins/volume_mount/plugin_icon.gif and b/plugins/volume_mount/plugin_icon.gif differ
diff --git a/plugins/volume_mount/plugin_icon.png b/plugins/volume_mount/plugin_icon.png
index 952890b..c69537b 100644
Binary files a/plugins/volume_mount/plugin_icon.png and b/plugins/volume_mount/plugin_icon.png differ
diff --git a/plugins/volume_props/plugin_icon.gif b/plugins/volume_props/plugin_icon.gif
index 65b482b..ef2cc1b 100644
Binary files a/plugins/volume_props/plugin_icon.gif and b/plugins/volume_props/plugin_icon.gif differ
diff --git a/plugins/volume_props/plugin_icon.png b/plugins/volume_props/plugin_icon.png
index 20d6d59..0156714 100644
Binary files a/plugins/volume_props/plugin_icon.png and b/plugins/volume_props/plugin_icon.png differ
diff --git a/www-data/cryptobox.css b/www-data/cryptobox.css
index e722811..8b75d98 100644
--- a/www-data/cryptobox.css
+++ b/www-data/cryptobox.css
@@ -425,11 +425,11 @@ table#volume_area td.volume_plugin_active, table#volume_area td.volume_plugin_pa
}
table#volume_area td.volume_plugin_active {
- background-image: url(register_active3.png);
+ background-image: url(register_active.png);
}
table#volume_area td.volume_plugin_passive {
- background-image: url(register_passive2.png);
+ background-image: url(register_passive.png);
}
table#volume_area td.volume_plugin_active img, table#volume_area td.volume_plugin_passive img {
diff --git a/www-data/register_active.gif b/www-data/register_active.gif
new file mode 100644
index 0000000..f0e8b87
Binary files /dev/null and b/www-data/register_active.gif differ
diff --git a/www-data/register_active.png b/www-data/register_active.png
new file mode 100644
index 0000000..3a8b254
Binary files /dev/null and b/www-data/register_active.png differ
diff --git a/www-data/register_active2.gif b/www-data/register_active2.gif
deleted file mode 100644
index 7f69389..0000000
Binary files a/www-data/register_active2.gif and /dev/null differ
diff --git a/www-data/register_active2.png b/www-data/register_active2.png
deleted file mode 100644
index 2025208..0000000
Binary files a/www-data/register_active2.png and /dev/null differ
diff --git a/www-data/register_active3.gif b/www-data/register_active3.gif
deleted file mode 100644
index b1fe1f5..0000000
Binary files a/www-data/register_active3.gif and /dev/null differ
diff --git a/www-data/register_active3.png b/www-data/register_active3.png
deleted file mode 100644
index 3ddf0d8..0000000
Binary files a/www-data/register_active3.png and /dev/null differ
diff --git a/www-data/register_passive.gif b/www-data/register_passive.gif
new file mode 100644
index 0000000..c362012
Binary files /dev/null and b/www-data/register_passive.gif differ
diff --git a/www-data/register_passive.png b/www-data/register_passive.png
new file mode 100644
index 0000000..9af4787
Binary files /dev/null and b/www-data/register_passive.png differ
diff --git a/www-data/register_passive2.gif b/www-data/register_passive2.gif
deleted file mode 100644
index 3a52181..0000000
Binary files a/www-data/register_passive2.gif and /dev/null differ
diff --git a/www-data/register_passive2.png b/www-data/register_passive2.png
deleted file mode 100644
index 6381fe0..0000000
Binary files a/www-data/register_passive2.png and /dev/null differ