Merge remote-tracking branch 'origin/master' into feature/add-to-dash…

…board-4537
Icinga · Nov 19, 2014 · cfb0ca1 · cfb0ca1
2 parents f384664 + b5aa08c
commit cfb0ca1
Show file tree

Hide file tree

Showing 58 changed files with 620 additions and 250 deletions.
diff --git a/application/fonts/fontanello-ifont/font/ifont.woff b/application/fonts/fontanello-ifont/font/ifont.woff
diff --git a/...cation/fonts/fontanello-ifont/LICENSE.txt → application/fonts/fontello-ifont/LICENSE.txt b/...cation/fonts/fontanello-ifont/LICENSE.txt → application/fonts/fontello-ifont/LICENSE.txt
diff --git a/...ication/fonts/fontanello-ifont/README.txt → application/fonts/fontello-ifont/README.txt b/...ication/fonts/fontanello-ifont/README.txt → application/fonts/fontello-ifont/README.txt
diff --git a/...cation/fonts/fontanello-ifont/config.json → application/fonts/fontello-ifont/config.json b/...cation/fonts/fontanello-ifont/config.json → application/fonts/fontello-ifont/config.json
@@ -48,6 +48,12 @@
       "code": 59481,
       "src": "fontawesome"
     },
+    {
+      "uid": "0d6ab6194c0eddda2b8c9cedf2ab248e",
+      "css": "attach",
+      "code": 59498,
+      "src": "fontawesome"
+    },
     {
       "uid": "c1f1975c885aa9f3dad7810c53b82074",
       "css": "lock",
@@ -144,6 +150,12 @@
       "code": 59470,
       "src": "fontawesome"
     },
+    {
+      "uid": "ecb97add13804c190456025e43ec003b",
+      "css": "keyboard",
+      "code": 59499,
+      "src": "fontawesome"
+    },
     {
       "uid": "85528017f1e6053b2253785c31047f44",
       "css": "comment",
@@ -234,15 +246,21 @@
       "code": 59457,
       "src": "fontawesome"
     },
+    {
+      "uid": "559647a6f430b3aeadbecd67194451dd",
+      "css": "menu",
+      "code": 59500,
+      "src": "fontawesome"
+    },
     {
       "uid": "e99461abfef3923546da8d745372c995",
-      "css": "conf",
+      "css": "service",
       "code": 59456,
       "src": "fontawesome"
     },
     {
       "uid": "98687378abd1faf8f6af97c254eb6cd6",
-      "css": "conf-alt",
+      "css": "services",
       "code": 59455,
       "src": "fontawesome"
     },
@@ -452,10 +470,16 @@
     },
     {
       "uid": "d407a4707f719b042ed2ad28d2619d7e",
-      "css": "service",
+      "css": "barchart",
       "code": 59420,
       "src": "fontawesome"
     },
+    {
+      "uid": "cd4bfdae4dc89b175ff49330ce29611a",
+      "css": "wifi",
+      "code": 59501,
+      "src": "fontawesome"
+    },
     {
       "uid": "500fc1f109021e4b1de4deda2f7ed399",
       "css": "host",
@@ -480,6 +504,12 @@
       "code": 59419,
       "src": "fontawesome"
     },
+    {
+      "uid": "567e3e257f2cc8fba2c12bf691c9f2d8",
+      "css": "moon",
+      "code": 59502,
+      "src": "fontawesome"
+    },
     {
       "uid": "8772331a9fec983cdb5d72902a6f9e0e",
       "css": "scissors",
@@ -504,6 +534,24 @@
       "code": 59414,
       "src": "fontawesome"
     },
+    {
+      "uid": "266d5d9adf15a61800477a5acf9a4462",
+      "css": "chart-bar",
+      "code": 59505,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "7d1ca956f4181a023de4b9efbed92524",
+      "css": "chart-area",
+      "code": 59504,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "554ee96588a6c9ee632624cd051fe6fc",
+      "css": "chart-pie",
+      "code": 59503,
+      "src": "fontawesome"
+    },
     {
       "uid": "ea2d9a8c51ca42b38ef0d2a07f16d9a7",
       "css": "chart-line",
@@ -534,6 +582,18 @@
       "code": 59412,
       "src": "fontawesome"
     },
+    {
+      "uid": "0f444c61b0d2c9966016d7ddb12f5837",
+      "css": "beaker",
+      "code": 59506,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "ff70f7b3228702e0d590e60ed3b90bea",
+      "css": "magic",
+      "code": 59507,
+      "src": "fontawesome"
+    },
     {
       "uid": "3ed68ae14e9cde775121954242a412b2",
       "css": "sort-name-up",
@@ -558,6 +618,12 @@
       "code": 59406,
       "src": "fontawesome"
     },
+    {
+      "uid": "cda0cdcfd38f5f1d9255e722dad42012",
+      "css": "spinner",
+      "code": 59497,
+      "src": "fontawesome"
+    },
     {
       "uid": "af95ef0ddda80a78828c62d386506433",
       "css": "cubes",

diff --git a/.../fonts/fontanello-ifont/css/animation.css → ...on/fonts/fontello-ifont/css/animation.css b/.../fonts/fontanello-ifont/css/animation.css → ...on/fonts/fontello-ifont/css/animation.css
diff --git a/...onts/fontanello-ifont/css/ifont-codes.css → .../fonts/fontello-ifont/css/ifont-codes.css b/...onts/fontanello-ifont/css/ifont-codes.css → .../fonts/fontello-ifont/css/ifont-codes.css
@@ -27,7 +27,7 @@
 .icon-globe:before { content: '\e819'; } /* '' */
 .icon-cloud:before { content: '\e81a'; } /* '' */
 .icon-flash:before { content: '\e81b'; } /* '' */
-.icon-service:before { content: '\e81c'; } /* '' */
+.icon-barchart:before { content: '\e81c'; } /* '' */
 .icon-down-dir:before { content: '\e81d'; } /* '' */
 .icon-up-dir:before { content: '\e81e'; } /* '' */
 .icon-left-dir:before { content: '\e81f'; } /* '' */
@@ -62,8 +62,8 @@
 .icon-calendar:before { content: '\e83c'; } /* '' */
 .icon-wrench:before { content: '\e83d'; } /* '' */
 .icon-sliders:before { content: '\e83e'; } /* '' */
-.icon-conf-alt:before { content: '\e83f'; } /* '' */
-.icon-conf:before { content: '\e840'; } /* '' */
+.icon-services:before { content: '\e83f'; } /* '' */
+.icon-service:before { content: '\e840'; } /* '' */
 .icon-phone:before { content: '\e841'; } /* '' */
 .icon-file-pdf:before { content: '\e842'; } /* '' */
 .icon-file-word:before { content: '\e843'; } /* '' */
@@ -103,4 +103,15 @@
 .icon-cw:before { content: '\e865'; } /* '' */
 .icon-host:before { content: '\e866'; } /* '' */
 .icon-thumbs-up:before { content: '\e867'; } /* '' */
-.icon-thumbs-down:before { content: '\e868'; } /* '' */
+.icon-thumbs-down:before { content: '\e868'; } /* '' */
+.icon-spinner:before { content: '\e869'; } /* '' */
+.icon-attach:before { content: '\e86a'; } /* '' */
+.icon-keyboard:before { content: '\e86b'; } /* '' */
+.icon-menu:before { content: '\e86c'; } /* '' */
+.icon-wifi:before { content: '\e86d'; } /* '' */
+.icon-moon:before { content: '\e86e'; } /* '' */
+.icon-chart-pie:before { content: '\e86f'; } /* '' */
+.icon-chart-area:before { content: '\e870'; } /* '' */
+.icon-chart-bar:before { content: '\e871'; } /* '' */
+.icon-beaker:before { content: '\e872'; } /* '' */
+.icon-magic:before { content: '\e873'; } /* '' */
diff --git a/...s/fontanello-ifont/css/ifont-embedded.css → ...nts/fontello-ifont/css/ifont-embedded.css b/...s/fontanello-ifont/css/ifont-embedded.css → ...nts/fontello-ifont/css/ifont-embedded.css
diff --git a/.../fontanello-ifont/css/ifont-ie7-codes.css → ...ts/fontello-ifont/css/ifont-ie7-codes.css b/.../fontanello-ifont/css/ifont-ie7-codes.css → ...ts/fontello-ifont/css/ifont-ie7-codes.css
@@ -27,7 +27,7 @@
 .icon-globe { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe819;&nbsp;'); }
 .icon-cloud { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe81a;&nbsp;'); }
 .icon-flash { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe81b;&nbsp;'); }
-.icon-service { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe81c;&nbsp;'); }
+.icon-barchart { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe81c;&nbsp;'); }
 .icon-down-dir { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe81d;&nbsp;'); }
 .icon-up-dir { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe81e;&nbsp;'); }
 .icon-left-dir { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe81f;&nbsp;'); }
@@ -62,8 +62,8 @@
 .icon-calendar { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83c;&nbsp;'); }
 .icon-wrench { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83d;&nbsp;'); }
 .icon-sliders { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83e;&nbsp;'); }
-.icon-conf-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83f;&nbsp;'); }
-.icon-conf { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe840;&nbsp;'); }
+.icon-services { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83f;&nbsp;'); }
+.icon-service { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe840;&nbsp;'); }
 .icon-phone { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe841;&nbsp;'); }
 .icon-file-pdf { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe842;&nbsp;'); }
 .icon-file-word { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe843;&nbsp;'); }
@@ -103,4 +103,15 @@
 .icon-cw { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe865;&nbsp;'); }
 .icon-host { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe866;&nbsp;'); }
 .icon-thumbs-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe867;&nbsp;'); }
-.icon-thumbs-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe868;&nbsp;'); }
+.icon-thumbs-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe868;&nbsp;'); }
+.icon-spinner { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe869;&nbsp;'); }
+.icon-attach { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe86a;&nbsp;'); }
+.icon-keyboard { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe86b;&nbsp;'); }
+.icon-menu { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe86c;&nbsp;'); }
+.icon-wifi { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe86d;&nbsp;'); }
+.icon-moon { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe86e;&nbsp;'); }
+.icon-chart-pie { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe86f;&nbsp;'); }
+.icon-chart-area { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe870;&nbsp;'); }
+.icon-chart-bar { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe871;&nbsp;'); }
+.icon-beaker { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe872;&nbsp;'); }
+.icon-magic { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe873;&nbsp;'); }
diff --git a/.../fonts/fontanello-ifont/css/ifont-ie7.css → ...on/fonts/fontello-ifont/css/ifont-ie7.css b/.../fonts/fontanello-ifont/css/ifont-ie7.css → ...on/fonts/fontello-ifont/css/ifont-ie7.css
@@ -38,7 +38,7 @@
 .icon-globe { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe819;&nbsp;'); }
 .icon-cloud { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe81a;&nbsp;'); }
 .icon-flash { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe81b;&nbsp;'); }
-.icon-service { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe81c;&nbsp;'); }
+.icon-barchart { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe81c;&nbsp;'); }
 .icon-down-dir { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe81d;&nbsp;'); }
 .icon-up-dir { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe81e;&nbsp;'); }
 .icon-left-dir { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe81f;&nbsp;'); }
@@ -73,8 +73,8 @@
 .icon-calendar { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83c;&nbsp;'); }
 .icon-wrench { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83d;&nbsp;'); }
 .icon-sliders { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83e;&nbsp;'); }
-.icon-conf-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83f;&nbsp;'); }
-.icon-conf { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe840;&nbsp;'); }
+.icon-services { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83f;&nbsp;'); }
+.icon-service { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe840;&nbsp;'); }
 .icon-phone { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe841;&nbsp;'); }
 .icon-file-pdf { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe842;&nbsp;'); }
 .icon-file-word { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe843;&nbsp;'); }
@@ -114,4 +114,15 @@
 .icon-cw { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe865;&nbsp;'); }
 .icon-host { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe866;&nbsp;'); }
 .icon-thumbs-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe867;&nbsp;'); }
-.icon-thumbs-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe868;&nbsp;'); }
+.icon-thumbs-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe868;&nbsp;'); }
+.icon-spinner { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe869;&nbsp;'); }
+.icon-attach { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe86a;&nbsp;'); }
+.icon-keyboard { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe86b;&nbsp;'); }
+.icon-menu { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe86c;&nbsp;'); }
+.icon-wifi { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe86d;&nbsp;'); }
+.icon-moon { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe86e;&nbsp;'); }
+.icon-chart-pie { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe86f;&nbsp;'); }
+.icon-chart-area { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe870;&nbsp;'); }
+.icon-chart-bar { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe871;&nbsp;'); }
+.icon-beaker { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe872;&nbsp;'); }
+.icon-magic { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe873;&nbsp;'); }
diff --git a/...tion/fonts/fontanello-ifont/css/ifont.css → ...cation/fonts/fontello-ifont/css/ifont.css b/...tion/fonts/fontanello-ifont/css/ifont.css → ...cation/fonts/fontello-ifont/css/ifont.css
@@ -1,10 +1,10 @@
 @font-face {
   font-family: 'ifont';
-  src: url('../font/ifont.eot?81676749');
-  src: url('../font/ifont.eot?81676749#iefix') format('embedded-opentype'),
-       url('../font/ifont.woff?81676749') format('woff'),
-       url('../font/ifont.ttf?81676749') format('truetype'),
-       url('../font/ifont.svg?81676749#ifont') format('svg');
+  src: url('../font/ifont.eot?81587324');
+  src: url('../font/ifont.eot?81587324#iefix') format('embedded-opentype'),
+       url('../font/ifont.woff?81587324') format('woff'),
+       url('../font/ifont.ttf?81587324') format('truetype'),
+       url('../font/ifont.svg?81587324#ifont') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -14,7 +14,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'ifont';
-    src: url('../font/ifont.svg?81676749#ifont') format('svg');
+    src: url('../font/ifont.svg?81587324#ifont') format('svg');
   }
 }
 */
@@ -78,7 +78,7 @@
 .icon-globe:before { content: '\e819'; } /* '' */
 .icon-cloud:before { content: '\e81a'; } /* '' */
 .icon-flash:before { content: '\e81b'; } /* '' */
-.icon-service:before { content: '\e81c'; } /* '' */
+.icon-barchart:before { content: '\e81c'; } /* '' */
 .icon-down-dir:before { content: '\e81d'; } /* '' */
 .icon-up-dir:before { content: '\e81e'; } /* '' */
 .icon-left-dir:before { content: '\e81f'; } /* '' */
@@ -113,8 +113,8 @@
 .icon-calendar:before { content: '\e83c'; } /* '' */
 .icon-wrench:before { content: '\e83d'; } /* '' */
 .icon-sliders:before { content: '\e83e'; } /* '' */
-.icon-conf-alt:before { content: '\e83f'; } /* '' */
-.icon-conf:before { content: '\e840'; } /* '' */
+.icon-services:before { content: '\e83f'; } /* '' */
+.icon-service:before { content: '\e840'; } /* '' */
 .icon-phone:before { content: '\e841'; } /* '' */
 .icon-file-pdf:before { content: '\e842'; } /* '' */
 .icon-file-word:before { content: '\e843'; } /* '' */
@@ -154,4 +154,15 @@
 .icon-cw:before { content: '\e865'; } /* '' */
 .icon-host:before { content: '\e866'; } /* '' */
 .icon-thumbs-up:before { content: '\e867'; } /* '' */
-.icon-thumbs-down:before { content: '\e868'; } /* '' */
+.icon-thumbs-down:before { content: '\e868'; } /* '' */
+.icon-spinner:before { content: '\e869'; } /* '' */
+.icon-attach:before { content: '\e86a'; } /* '' */
+.icon-keyboard:before { content: '\e86b'; } /* '' */
+.icon-menu:before { content: '\e86c'; } /* '' */
+.icon-wifi:before { content: '\e86d'; } /* '' */
+.icon-moon:before { content: '\e86e'; } /* '' */
+.icon-chart-pie:before { content: '\e86f'; } /* '' */
+.icon-chart-area:before { content: '\e870'; } /* '' */
+.icon-chart-bar:before { content: '\e871'; } /* '' */
+.icon-beaker:before { content: '\e872'; } /* '' */
+.icon-magic:before { content: '\e873'; } /* '' */