Return-Path: X-Original-To: apmail-incubator-bloodhound-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-bloodhound-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AC9AB9735 for ; Sun, 1 Apr 2012 01:28:45 +0000 (UTC) Received: (qmail 94998 invoked by uid 500); 1 Apr 2012 01:28:45 -0000 Delivered-To: apmail-incubator-bloodhound-commits-archive@incubator.apache.org Received: (qmail 94979 invoked by uid 500); 1 Apr 2012 01:28:45 -0000 Mailing-List: contact bloodhound-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bloodhound-dev@incubator.apache.org Delivered-To: mailing list bloodhound-commits@incubator.apache.org Received: (qmail 94971 invoked by uid 99); 1 Apr 2012 01:28:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2012 01:28:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2012 01:28:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D99E6238890B; Sun, 1 Apr 2012 01:28:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1307982 - in /incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard: layouts/templates/bootstrap.html web_ui.py Date: Sun, 01 Apr 2012 01:28:21 -0000 To: bloodhound-commits@incubator.apache.org From: gjm@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120401012821.D99E6238890B@eris.apache.org> Author: gjm Date: Sun Apr 1 01:28:21 2012 New Revision: 1307982 URL: http://svn.apache.org/viewvc?rev=1307982&view=rev Log: Dashboard code import: BH_Dashboard: Using schema to position widgets in dashboard (bootstrap layout) Modified: incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/layouts/templates/bootstrap.html incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/web_ui.py Modified: incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/layouts/templates/bootstrap.html URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/layouts/templates/bootstrap.html?rev=1307982&r1=1307981&r2=1307982&view=diff ============================================================================== --- incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/layouts/templates/bootstrap.html (original) +++ incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/layouts/templates/bootstrap.html Sun Apr 1 01:28:21 2012 @@ -33,23 +33,21 @@ ${w.content} - -
-
- - - ${widget_container(w)} - - -
-
- - - ${widget_container(w)} - +
+ + + ${bsdiv(_ui)} + + + + ${widget_container(widgets[widx])} -
-
+ + +
+ + + ${bsdiv(ui)}
Note: See Modified: incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/web_ui.py URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/web_ui.py?rev=1307982&r1=1307981&r2=1307982&view=diff ============================================================================== --- incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/web_ui.py (original) +++ incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/web_ui.py Sun Apr 1 01:28:21 2012 @@ -125,15 +125,15 @@ class DashboardModule(Component): schema = { 'div' : [ { - 'class' : 'row', + '_class' : 'row', 'div' : [ { - 'class' : 'span8', - 'widgets' : [1,3] + '_class' : 'span8', + 'widgets' : [0,2] }, { - 'class' : 'span4', - 'widgets' : [2] + '_class' : 'span4', + 'widgets' : [1] } ] }