# HG changeset patch
# User Raimund Renkert <rrenkert@intevation.de>
# Date 1377859979 -7200
# Node ID 92a960b691a4a0e8a1c7d0e1e672507eca3adb72
# Parent  63396d62a292aee4226d970f57afe33db4db0f5d# Parent  73341090a12d0d038f2cbd52fd1cb8e394387d7f
merged.

diff -r 73341090a12d -r 92a960b691a4 app/view/Viewport.js
--- a/app/view/Viewport.js	Fri Aug 30 11:24:07 2013 +0200
+++ b/app/view/Viewport.js	Fri Aug 30 12:52:59 2013 +0200
@@ -162,9 +162,9 @@
                         }
                     },
                     "->",
-                    {xtype: 'box', autoEl: {tag: 'img', src:'gfx/user.png'}},
+                    {xtype: 'box', autoEl: {tag: 'img', src:'gfx/user-identity.png'}},
                     {xtype: "tbtext", id:"userinfo", text:""},
-                    {xtype: 'box', autoEl: {tag: 'img', src:'gfx/usergroup.png'}},
+                    {xtype: 'box', autoEl: {tag: 'img', src:'gfx/network-workgroup.png'}},
                     {xtype: "tbtext", id:"groupinfo", text:""}
                     ]
                 }
diff -r 73341090a12d -r 92a960b691a4 app/view/kommentare/List.js
--- a/app/view/kommentare/List.js	Fri Aug 30 11:24:07 2013 +0200
+++ b/app/view/kommentare/List.js	Fri Aug 30 12:52:59 2013 +0200
@@ -22,13 +22,13 @@
                 items: [
                     {
                         text: 'Hinzufügen',
-                        icon: 'gfx/plus.gif',
+                        icon: 'gfx/list-add.png',
                         action: 'add',
                         probeId: this.probeId
                     },
                     {
                         text: 'Löschen',
-                        icon: 'gfx/minus.gif',
+                        icon: 'gfx/list-remove.png',
                         action: 'delete'
                     }
                 ]
diff -r 73341090a12d -r 92a960b691a4 app/view/messungen/List.js
--- a/app/view/messungen/List.js	Fri Aug 30 11:24:07 2013 +0200
+++ b/app/view/messungen/List.js	Fri Aug 30 12:52:59 2013 +0200
@@ -22,13 +22,13 @@
                 items: [
                     {
                         text: 'Hinzufügen',
-                        icon: 'gfx/plus.gif',
+                        icon: 'gfx/list-add.png',
                         action: 'add',
                         probeId: this.probeId
                     },
                     {
                         text: 'Löschen',
-                        icon: 'gfx/minus.gif',
+                        icon: 'gfx/list-remove.png',
                         action: 'delete'
                     }
                 ]
diff -r 73341090a12d -r 92a960b691a4 app/view/messwerte/List.js
--- a/app/view/messwerte/List.js	Fri Aug 30 11:24:07 2013 +0200
+++ b/app/view/messwerte/List.js	Fri Aug 30 12:52:59 2013 +0200
@@ -23,14 +23,14 @@
                 items: [
                     {
                         text: 'Hinzufügen',
-                        icon: 'gfx/plus.gif',
+                        icon: 'gfx/list-add.png',
                         action: 'add',
                         probeId: this.probeId,
                         parentId: this.parentId
                     },
                     {
                         text: 'Löschen',
-                        icon: 'gfx/minus.gif',
+                        icon: 'gfx/list-remove.png',
                         action: 'delete'
                     }
                 ]
diff -r 73341090a12d -r 92a960b691a4 app/view/mkommentare/List.js
--- a/app/view/mkommentare/List.js	Fri Aug 30 11:24:07 2013 +0200
+++ b/app/view/mkommentare/List.js	Fri Aug 30 12:52:59 2013 +0200
@@ -23,14 +23,14 @@
                 items: [
                     {
                         text: 'Hinzufügen',
-                        icon: 'gfx/plus.gif',
+                        icon: 'gfx/list-add.png',
                         action: 'add',
                         probeId: this.probeId,
                         parentId: this.parentId
                     },
                     {
                         text: 'Löschen',
-                        icon: 'gfx/minus.gif',
+                        icon: 'gfx/list-remove.png',
                         action: 'delete'
                     }
                 ]
diff -r 73341090a12d -r 92a960b691a4 app/view/orte/List.js
--- a/app/view/orte/List.js	Fri Aug 30 11:24:07 2013 +0200
+++ b/app/view/orte/List.js	Fri Aug 30 12:52:59 2013 +0200
@@ -22,13 +22,13 @@
                 items: [
                     {
                         text: 'Hinzufügen',
-                        icon: 'gfx/plus.gif',
+                        icon: 'gfx/list-add.png',
                         action: 'add',
                         probeId: this.probeId
                     },
                     {
                         text: 'Löschen',
-                        icon: 'gfx/minus.gif',
+                        icon: 'gfx/list-remove.png',
                         action: 'delete'
                     }
                 ]
diff -r 73341090a12d -r 92a960b691a4 app/view/proben/List.js
--- a/app/view/proben/List.js	Fri Aug 30 11:24:07 2013 +0200
+++ b/app/view/proben/List.js	Fri Aug 30 12:52:59 2013 +0200
@@ -21,17 +21,17 @@
                 items: [
                     {
                         text: 'Hinzufügen',
-                        icon: 'gfx/plus.gif',
+                        icon: 'gfx/list-add.png',
                         action: 'add'
                     },
                     {
                         text: 'Import',
-                        icon: 'gfx/plus.gif',
+                        icon: 'gfx/svn-commit.png',
                         action: 'import'
                     },
                     {
                         text: 'Export',
-                        icon: 'gfx/document-save-as-6.png',
+                        icon: 'gfx/svn-update.png',
                         action: 'export'
                     }
                 ]
diff -r 73341090a12d -r 92a960b691a4 app/view/status/List.js
--- a/app/view/status/List.js	Fri Aug 30 11:24:07 2013 +0200
+++ b/app/view/status/List.js	Fri Aug 30 12:52:59 2013 +0200
@@ -23,14 +23,14 @@
                 items: [
                     {
                         text: 'Hinzufügen',
-                        icon: 'gfx/plus.gif',
+                        icon: 'gfx/list-add.png',
                         action: 'add',
                         probeId: this.probeId,
                         parentId: this.parentId
                     },
                     {
                         text: 'Löschen',
-                        icon: 'gfx/minus.gif',
+                        icon: 'gfx/list-remove.png',
                         action: 'delete'
                     }
                 ]
diff -r 73341090a12d -r 92a960b691a4 app/view/zusatzwerte/List.js
--- a/app/view/zusatzwerte/List.js	Fri Aug 30 11:24:07 2013 +0200
+++ b/app/view/zusatzwerte/List.js	Fri Aug 30 12:52:59 2013 +0200
@@ -22,13 +22,13 @@
                 items: [
                     {
                         text: 'Hinzufügen',
-                        icon: 'gfx/plus.gif',
+                        icon: 'gfx/list-add.png',
                         action: 'add',
                         probeId: this.probeId
                     },
                     {
                         text: 'Löschen',
-                        icon: 'gfx/minus.gif',
+                        icon: 'gfx/list-remove.png',
                         action: 'delete'
                     }
                 ]
diff -r 73341090a12d -r 92a960b691a4 gfx/list-add.png
Binary file gfx/list-add.png has changed
diff -r 73341090a12d -r 92a960b691a4 gfx/list-remove.png
Binary file gfx/list-remove.png has changed
diff -r 73341090a12d -r 92a960b691a4 gfx/network-workgroup.png
Binary file gfx/network-workgroup.png has changed
diff -r 73341090a12d -r 92a960b691a4 gfx/svn-commit.png
Binary file gfx/svn-commit.png has changed
diff -r 73341090a12d -r 92a960b691a4 gfx/svn-update.png
Binary file gfx/svn-update.png has changed
diff -r 73341090a12d -r 92a960b691a4 gfx/user-identity.png
Binary file gfx/user-identity.png has changed
diff -r 73341090a12d -r 92a960b691a4 index.html
--- a/index.html	Fri Aug 30 11:24:07 2013 +0200
+++ b/index.html	Fri Aug 30 12:52:59 2013 +0200
@@ -3,7 +3,7 @@
 <head>
     <title>Lada</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <link rel="stylesheet" type="text/css" href="extjs/resources/css/ext-all.css">
+    <link rel="stylesheet" type="text/css" href="extjs/resources/css/ext-all-gray.css">
     <script type="text/javascript" src="extjs/ext-all-debug.js"></script>
     <script type="text/javascript" src="app.js"></script>
     <script type="text/javascript" src=""></script>