Changeset 2525:a604214cd3ca

Timestamp:

07/29/10 13:05:37 (6 weeks ago)

Author:

Ferllings <cedric@…>

Branch:

default

Message:

[ihm] Removed House icon (licence issue)

Location:

src/domogik/ui/djangodomo/core/templates

Files:

• admin/plugins/plugin.html (modified) (1 diff)
• design/skins/default/css/page-admin-plugins.css (modified) (2 diffs)
• design/skins/default/css/ui-icons.css (modified) (1 diff)
• design/skins/default/images/house/default_16.png (deleted)
• design/skins/default/images/house/default_32.png (deleted)
• design/skins/default/images/house/default_64.png (deleted)
• layout_admin.html (modified) (1 diff)
• layout_show.html (modified) (1 diff)
• show/area.html (modified) (1 diff)
• show/house.edit.html (modified) (1 diff)

src/domogik/ui/djangodomo/core/templates/admin/plugins/plugin.html

@@ -193 +193 @@
         <span class="subtitle">{{ plugin.description }}</span>
     </h1>
-        <ul class='infos'>
-            <li><span class='label'>{% trans "Version" %}:</span> {{ plugin.version }}</li>
-            <li><span class='label'>{% trans "Documentation" %}:</span> <a href='{{ plugin.documentation }}'>Wiki</a></li>
-            <li><span class='label'>{% trans "Host" %}:</span> {{ plugin.host }}</li>
-            {% ifnotequal plugin.name "rest" %}
-                <li><span class='label'>{% trans "Technology" %}:</span> {{ plugin.technology }}</li>
-                <li>
-                {% ifequal plugin.status "ON" %}
-                    <div class='icon16-text-right icon16-status-active'><span class='label'>{% trans "Status" %}:</span><span class='offscreen'>{% trans "Running" %}</span></div>
-                {% else %}
-                    <div class='icon16-text-right icon16-status-inactive'><span class='label'>{% trans "Status" %}:</span><span class='offscreen'>{% trans "Stopped" %}</span></div>                        
-                {% endifequal %}
-                </li>
-            {% endifnotequal %}
-        </ul>
-    <div class='clear'></div>
+    <ul class='infos'>
+        <li><span class='label'>{% trans "Version" %}:</span> {{ plugin.version }}</li>
+        <li><span class='label'>{% trans "Documentation" %}:</span> <a href='{{ plugin.documentation }}'>Wiki</a></li>
+        <li><span class='label'>{% trans "Host" %}:</span> {{ plugin.host }}</li>
+        {% ifnotequal plugin.name "rest" %}
+            <li><span class='label'>{% trans "Technology" %}:</span> {{ plugin.technology }}</li>
+            <li>
+            {% ifequal plugin.status "ON" %}
+                <div class='icon16-text-right icon16-status-active'><span class='label'>{% trans "Status" %}:</span><span class='offscreen'>{% trans "Running" %}</span></div>
+            {% else %}
+                <div class='icon16-text-right icon16-status-inactive'><span class='label'>{% trans "Status" %}:</span><span class='offscreen'>{% trans "Stopped" %}</span></div>                        
+            {% endifequal %}
+            </li>
+        {% endifnotequal %}
+    </ul>
 {% endblock %}
 

src/domogik/ui/djangodomo/core/templates/design/skins/default/css/page-admin-plugins.css

@@ +1 @@
+#contentheader {
+    text-align:right;
+}
+
+h1 {
+    float:left;
+}
+
 ul.infos {
     border:1px solid #cccccc;
@@ -4 +12 @@
     -webkit-border-radius: 0.8em;
     padding:1em;
+    display: inline-block;
+    text-align:left;
 }
 

src/domogik/ui/djangodomo/core/templates/design/skins/default/css/ui-icons.css

@@ -2 +2 @@
 /* CSS Document */
 
-.icon64-house-default { background-image:url(../images/house/default_64.png);}
-.icon32-house-default { background-image:url(../images/house/default_32.png);}
-.icon16-house-default { background-image:url(../images/house/default_16.png);}
+.icon64-house-default { background-image:url(../images/device_usage/todo_64.png);}
+.icon32-house-default { background-image:url(../images/device_usage/todo_32.png);}
+.icon16-house-default { background-image:url(../images/device_usage/todo_16.png;}
 
 /* Area icons */

src/domogik/ui/djangodomo/core/templates/layout_admin.html

@@ -23 +23 @@
 
 {% block global_css %}
-    <link rel="icon shortcut" type="image/png" href="/design/skins/{{ request.session.user.skin_used|default:'default' }}/images/house/default_16.png" />
+    <link rel="icon shortcut" type="image/png" href="/design/skins/{{ request.session.user.skin_used|default:'default' }}/images/device_usage/todo_16.png" />
     <link href="/design/skins/{{ request.session.user.skin_used|default:'default' }}/css/ui-buttons.css" rel="stylesheet" type="text/css" />
     <link href="/design/skins/{{ request.session.user.skin_used|default:'default' }}/css/ui-forms.css" rel="stylesheet" type="text/css" />

src/domogik/ui/djangodomo/core/templates/layout_show.html

@@ -23 +23 @@
 
 {% block global_css %}
-    <link rel="icon shortcut" type="image/png" href="/design/skins/{{ request.session.user.skin_used|default:'default' }}/images/house/default_16.png" />
+    <link rel="icon shortcut" type="image/png" href="/design/skins/{{ request.session.user.skin_used|default:'default' }}/images/device_usage/todo_16.png" />
     <link href="/design/skins/{{ request.session.user.skin_used|default:'default' }}/css/page-show.css" rel="stylesheet" type="text/css" />
     <link href="/design/skins/{{ request.session.user.skin_used|default:'default' }}/css/ui-breadcrumb.css" rel="stylesheet" type="text/css" />

src/domogik/ui/djangodomo/core/templates/show/area.html

@@ -41 +41 @@
 
 {% block css %}
-    <link rel="icon shortcut" type="image/png" href="/design/skins/{{ request.session.user.skin_used|default:'default' }}/images/house/default_16.png" />
 {% endblock %}
 

src/domogik/ui/djangodomo/core/templates/show/house.edit.html

@@ -80 +80 @@
             if (finishedactions == totalactions) {
                 if (erroractions == 0) {
-                console.log(json);
                     var jsonstr = JSON.stringify(json).replace(/"/g, '"');
                     $.getREST(['base', 'ui_config', 'set', 'name', 'house', 'reference', '0', 'key', 'widgets', 'value', jsonstr],