Changeset 1505:7950fa72f6c4

Timestamp:

03/09/10 20:31:21 (5 months ago)

Author:

Ferllings <cedric@…>

Branch:

default

Message:

[django] Started Admin visualisation section

Location:

src/domogik/ui/djangodomo/core

Files:

• templates/admin/organization/rooms.html (modified) (1 diff)
• templates/admin/visualization/devices.html (added)
• templates/design/js/ui.action-binary.js (modified) (1 diff)
• templates/design/js/ui.action-range.js (modified) (3 diffs)
• templates/design/js/ui.icons.js (modified) (1 diff)
• templates/design/skins/default/css/page-admin-visualization.css (added)
• templates/design/skins/default/css/ui-icons.css (modified) (5 diffs)
• templates/design/skins/default/css/ui-page-block.css (modified) (3 diffs)
• templates/design/skins/default/css/ui-page-section.css (modified) (2 diffs)
• templates/design/skins/default/images/room/kidsroom_16.png (added)
• templates/design/skins/default/images/room/kidsroom_32.png (added)
• templates/design/skins/default/images/room/kidsroom_64.png (added)
• templates/design/skins/default/images/src/chambre_enfant.svg (added)
• templates/design/skins/default/images/status/info_16.png (added)
• templates/design/skins/default/images/status/info_32.png (added)
• templates/design/skins/default/images/status/info_64.png (added)
• templates/layout_admin.html (modified) (1 diff)
• templates/show/room.html (modified) (1 diff)
• urls.py (modified) (1 diff)
• views.py (modified) (2 diffs)

src/domogik/ui/djangodomo/core/templates/admin/organization/rooms.html

@@ -15 +15 @@
 
 # You should have received a copy of the GNU General Public License
-# along with Domogik.  If not, see
-<http://www.gnu.org/licenses/>
-.
-
-# Author : Cédric Trévisan <cedric@domogik.org> {% endcomment %}
+# along with Domogik.  If not, see <http://www.gnu.org/licenses/>.
+
+# Author : Cédric Trévisan <cedric@domogik.org>
+{% endcomment %}
 
 

src/domogik/ui/djangodomo/core/templates/design/js/ui.action-binary.js

@@ -1 @@
-function widgetmini_binary(widgetmini_id, function_id, widget_type) {
+function widgetmini_binary(widgetmini_id, function_id, widget_usage) {
     $('#' + widgetmini_id).addClass('widgetmini_binary')
         .click(function () {process_binary(function_id)})
         .keypress(function (e) {if (e.which == 13 || e.which == 32) {process_binary(function_id);}})
-        .addClass('icon32-widget-' + widget_type)
+        .addClass('icon32-usage-' + widget_usage)
         .addClass('binary_0')
         .attr("tabindex", 0);
 }
 
-function widget_binary(widget_id, function_id, widget_type) {
+function widget_binary(widget_id, function_id, widget_usage) {
     $('#' + widget_id).addClass('widget_binary')
-        .addClass('icon32-widget-' + widget_type)
+        .addClass('icon32-usage-' + widget_usage)
         .addClass('binary_0');
     $('#' + widget_id + " .on").click(function () {process_binary(function_id, 1)});

src/domogik/ui/djangodomo/core/templates/design/js/ui.action-range.js

@@ -1 @@
-function widgetmini_range(widgetmini_id, function_id, widget_type, min_value, max_value, default_value, unit) {
+function widgetmini_range(widgetmini_id, function_id, widget_usage, min_value, max_value, default_value, unit) {
     var percent_value = (default_value / (max_value - min_value)) * 100;
     $("#range_data").data(function_id, {min : min_value, max : max_value, value : default_value, unit : unit});
@@ -23 +23 @@
 
         $('#' + widgetmini_id + ' .range_value')
-            .addClass('icon32-widget-' + widget_type)
+            .addClass('icon32-usage-' + widget_usage)
             .toggle(function () {open_range(function_id)},
                 function () {close_range(function_id)});
@@ -30 +30 @@
 }
 
-function widget_range(widget_id, function_id, widget_type, min_value, max_value, default_value, unit) {
+function widget_range(widget_id, function_id, widget_usage, min_value, max_value, default_value, unit) {
     $('#' + widget_id).addClass('widget_range')
-        .addClass('icon32-widget-' + widget_type);
+        .addClass('icon32-usage-' + widget_usage);
     $('#' + widget_id + " .up").click(function () {plus_range(function_id)});
     $('#' + widget_id + " .down").click(function () {minus_range(function_id)});

src/domogik/ui/djangodomo/core/templates/design/js/ui.icons.js

@@ -1 +1 @@
 var area_icons = ["grndfloor", "firstfloor", "basement"];
-var room_icons = ["kitchen", "bedroom", "tvlounge", "bathroom", "office"];
+var room_icons = ["kitchen", "bedroom", "tvlounge", "bathroom", "office", 'kidsroom'];

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

@@ -29 +29 @@
 .icon64-room-bathroom { background-image:url(../images/room/bathroom_64.png);}
 .icon64-room-office { background-image:url(../images/room/office_64.png);}
+.icon64-room-kidsroom { background-image:url(../images/room/kidsroom_64.png);}
 
 .icon32-room- { background-image:url(../images/unknown_32.png);}
@@ -36 +37 @@
 .icon32-room-bathroom { background-image:url(../images/room/default_room_32.png);}
 .icon32-room-office { background-image:url(../images/room/default_room_32.png);}
+.icon32-room-kidsroom { background-image:url(../images/room/kidsroom_32.png);}
 
 .icon16-room- { background-image:url(../images/unknown_16.png);}
@@ -43 +45 @@
 .icon16-room-bathroom { background-image:url(../images/room/default_room_16.png);}
 .icon16-room-office { background-image:url(../images/room/default_room_16.png);}
+.icon16-room-kidsroom { background-image:url(../images/room/kidsroom_16.png);}
 
 /* Usage icons */
@@ -87 +90 @@
 
 /* Status icons */
+.icon64-status-true {background-image:url(../images/status/check_64.png);}
+.icon64-status-false {background-image:url(../images/status/wrong_64.png);}
+.icon64-status-active {background-image:url(../images/status/green_indicator_64.png);}
+.icon64-status-inactive {background-image:url(../images/status/grey_indicator_64.png);}
+.icon64-status-error {background-image:url(../images/status/wrong_64.png);}
+.icon64-status-ok {background-image:url(../images/status/check_64.png);}
+.icon64-status-info {background-image:url(../images/status/info_64.png);}
+
+.icon32-status-true {background-image:url(../images/status/check_32.png);}
+.icon32-status-false {background-image:url(../images/status/wrong_32.png);}
+.icon32-status-active {background-image:url(../images/status/green_indicator_32.png);}
+.icon32-status-inactive {background-image:url(../images/status/grey_indicator_32.png);}
+.icon32-status-error {background-image:url(../images/status/wrong_32.png);}
+.icon32-status-ok {background-image:url(../images/status/check_32.png);}
+.icon32-status-info {background-image:url(../images/status/info_32.png);}
+
 .icon16-status-true {background-image:url(../images/status/check_16.png);}
 .icon16-status-false {background-image:url(../images/status/wrong_16.png);}
@@ -93 +112 @@
 .icon16-status-error {background-image:url(../images/status/wrong_16.png);}
 .icon16-status-ok {background-image:url(../images/status/check_16.png);}
+.icon16-status-info {background-image:url(../images/status/info_16.png);}
 
 /* Tmp icons */

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

@@ -13 +13 @@
 }
 
-.block dl, .block dt, .block dd {
-    padding:0;
-    margin:0;
-}
-
 /* Header section */
 
@@ -25 +20 @@
     min-height: 64px;
     padding-bottom: 1em;
+    font-weight:normal;
 }
 
@@ -46 +42 @@
     background-position:left 50%;
     background-repeat:no-repeat;
-}
- 
-.block .temp {
-    padding:0.5em 0.5em 0 32px;
-    font-size:1.5em;
-    float:right;
-    background-position:left 50%;
-    background-repeat:no-repeat;
-    line-height:32px;
-    min-height:32px;
 }
 

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

@@ -53 +53 @@
 }
 
+#messages.info {
+    background-color:#B0CEFF;
+    border:1px solid #003E99;
+}
+
+.instructions {
+    padding:1em 1em 1em 50px;
+    margin:1em 0 1em 0;
+    -moz-border-radius: 0.8em;
+    -webkit-border-radius: 0.8em;
+    background-position:left 50%;
+    background-repeat: no-repeat;
+    font-weight:bold;
+    font-style:italic;
+    background-color:#B0CEFF;
+    border:1px solid #003E99;
+}
+
 /* Subsection */
 
@@ -62 +80 @@
     -webkit-border-radius: 0.8em;
     background-color:#eeeeee;
+}
+
+.subsection h2 {
+    padding-left:18px;
+    background-position:left 50%;
+    background-repeat: no-repeat;
 }
 

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

@@ -64 +64 @@
             <ul id="modules_list">
             </ul>
+            <div class="subnav2"><a href="#">{% trans "Visualization" %}</a></div>
+            <ul>
+                <li><a href="{% url admin_visualization_devices_view %}" class='{{ nav2_visualization_devices }}'>{% trans "Devices" %}</a></li>
+            </ul>
         </div>
     </div>

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

@@ -61 +61 @@
                                                                 openbutton: "#openextended_{{ device.id }}",
                                                         });
-                            widgetmini_binary("widgetmini_{{ device.id }}1", "{{ device.id }}1", "light");
-                            widget_binary("widget_{{ device.id }}1", "{{ device.id }}1", "light");
-                            widgetmini_range("widgetmini_{{ device.id }}2", "{{ device.id }}2", "light", 0, 100, 12, '%');
-                            widget_range("widget_{{ device.id }}2", "{{ device.id }}2", "light", 0, 100, 12, '%');
+                            widgetmini_binary("widgetmini_{{ device.id }}1", "{{ device.id }}1", 1);
+                            widget_binary("widget_{{ device.id }}1", "{{ device.id }}1", 1);
+                            widgetmini_range("widgetmini_{{ device.id }}2", "{{ device.id }}2", 1, 0, 100, 12, '%');
+                            widget_range("widget_{{ device.id }}2", "{{ device.id }}2", 1, 0, 100, 12, '%');
                         });
                     // ]]>

src/domogik/ui/djangodomo/core/urls.py

@@ -56 +56 @@
     url(r'admin/organization/house/$', 'admin_organization_house', name="admin_organization_house_view"),
     url(r'admin/module/(?P<module_name>\w+)/$', 'admin_modules_module', name="admin_modules_module_view"),
+    url(r'admin/visualization/device/$', 'admin_visualization_devices', name="admin_visualization_devices_view"),
 
     url(r'show/$', 'show_house', name="show_view"),

src/domogik/ui/djangodomo/core/views.py

@@ -577 +577 @@
     area_id = room.area_id
     area_name = (__db.get_area_by_id(area_id)).name
-    page_title = _("Visualisation Dispositif")
+    page_title = _("View")
     return __go_to_page(
         request, 'show/device.html',
@@ -589 +589 @@
         house=resultHouse
     )
+
+def admin_visualization_devices(request):
+    """
+    Method called when the admin devices visualization page is accessed
+    @param request : HTTP request
+    @return an HttpResponse object
+    """
+    if not __is_user_admin(request):
+        return index(request)
+
+    status = request.GET.get('status', '')
+    msg = request.GET.get('msg', '')
+    try:
+        resultAllRooms = Rooms.getAllWithDevices()
+        resultAllRooms.merge_uiconfig()
+    except ResourceNotAvailableException:
+        return render_to_response('error/ResourceNotAvailableException.html')
+        
+    page_title = _("Devices visualization")
+    return __go_to_page(
+        request, 'admin/visualization/devices.html',
+        page_title,
+        nav1_admin = "selected",
+        nav2_visualization_devices = "selected",
+        status=status,
+        msg=msg,
+        rooms_list=resultAllRooms.room,
+    )