[datapress] r154 committed - groupability

[codesite...@google.com]

Revision: 154
Author: edward.benson
Date: Thu Feb 24 05:13:21 2011
Log: groupability
http://code.google.com/p/datapress/source/detail?r=154

Modified:
/trunk/plugin/configurator/configurator.js.php
/trunk/plugin/configurator/exhibit-configurator.php
/trunk/plugin/configurator/exhibit-inputbox-views.php
/trunk/plugin/model/view.php
/trunk/plugin/wp-exhibit-insert-exhibit.php
/trunk/plugin/wp-exhibit.php

=======================================
--- /trunk/plugin/configurator/configurator.js.php Wed Feb 23 19:21:35 2011
+++ /trunk/plugin/configurator/configurator.js.php Thu Feb 24 05:13:21 2011
@@ -42,7 +42,7 @@
next_id++;
var liid = listId + "_" + next_id;
var opStr = "";
- opStr = opStr + "<li id='" + liid + "'>" + caption + " ";
+ opStr = opStr + "<li class=\"ui-state-default\" id='" + liid + "'><span
style=\"float:left;\" class=\"ui-icon ui-icon-arrowthick-2-n-s\"></span>" +
caption + " ";
SimileAjax.jQuery.each(fields, function(key, value) {
var field_name = prefix + "_" + next_id + "_" + key;
if (alreadyBase64Encoded) {
@@ -58,7 +58,7 @@
if ((editinfo != undefined) && (editinfo.editable)) {
opStr = opStr + "[ <a href='#' onclick='editExhibitElementLink(\"" +
editinfo.tabid + "\", \"" + liid + "\"); return false;'>edit</a> ]";
}
- opStr = opStr + "</li>";
+ opStr = opStr + "</li><script>jQuery(\"#" + liid
+ "\").parent().sortable();</script>";
SimileAjax.jQuery('#' + listId).append(opStr);
return removeID(liid);
}
=======================================
--- /trunk/plugin/configurator/exhibit-configurator.php Thu Sep 10 12:47:53
2009
+++ /trunk/plugin/configurator/exhibit-configurator.php Thu Feb 24 05:13:21
2011
@@ -136,6 +136,8 @@
if ( 0 === strpos( $content_func, 'media' ) ) {
wp_enqueue_style( 'media' );
}
+
+wp_enqueue_style("dp-jquery");

do_action('admin_print_styles');
do_action('admin_print_scripts');
=======================================
--- /trunk/plugin/configurator/exhibit-inputbox-views.php Tue Sep 8
11:39:23 2009
+++ /trunk/plugin/configurator/exhibit-inputbox-views.php Thu Feb 24
05:13:21 2011
@@ -1,4 +1,8 @@
<div class="outer-tabs-panel-header">
+<script>
+ jQuery("#views-list").sortable();
+</script>
+
<div class="current">
<ul id="views-list">
</ul>
=======================================
--- /trunk/plugin/model/view.php Wed Feb 23 18:51:08 2011
+++ /trunk/plugin/model/view.php Thu Feb 24 05:13:21 2011
@@ -30,8 +30,9 @@
'height' => NULL,
'topBandUnit' => NULL,
'bottomBandUnit' => NULL,
- 'extra_attributes' => NULL
- );
+ 'extra_attributes' => NULL,
+ 'ungrouped' => NULL
+ );

function WpExhibitView($opts = NULL) {
parent::WpExhibitModel($opts);
=======================================
--- /trunk/plugin/wp-exhibit-insert-exhibit.php Wed Feb 23 19:10:18 2011
+++ /trunk/plugin/wp-exhibit-insert-exhibit.php Thu Feb 24 05:13:21 2011
@@ -66,18 +66,40 @@

// add views
$view_html = "";
+
+ if ($currentView == 'preview') {
+ foreach ($exhibit->get('views') as $view) {
+ $view_html .= $view->htmlContent();
+ return "$tracker_html $view_html";
+ }
+
+ }
+ else {
+
+ $grouped_html = "";
+
foreach ($exhibit->get('views') as $view) {
- $view_html = $view_html . $view->htmlContent();
- $view_html = $view_html . "\n";
- if ($currentView == 'preview') {
- break;
- }
- }
+ if ($view->get('ungrouped') == NULL) {
+ $grouped_html .= "\n" . $view->htmlContent();
+ }
+ }
+ $printedGroup = 0;
+ foreach ($exhibit->get('views') as $view) {
+ if (($view->get('ungrouped') == NULL) && (0 == $printedGroup))
{
+ $view_html .= "<div
ex:role=\"viewPanel\">$grouped_html</div>";
+ $printedGroup = 1;
+ }
+ else {
+ //$view_html .= "\n" . $view->htmlContent();
+ }
+ }
+
+ }

if ($view_html == "") {
$view_html = "<div ex:role=\"view\"></div>";
}
-
+ // ex:role=\"viewPanel\">
return "$tracker_html $view_html";
}

@@ -127,7 +149,7 @@
</tr>
<tr valign=\"top\">
$left_facet_html
- <td colspan='$exhibit_colspan'
ex:role=\"viewPanel\">$view_html</td>
+ <td colspan='$exhibit_colspan'>$view_html</td>
$right_facet_html
</tr>
<tr>
=======================================
--- /trunk/plugin/wp-exhibit.php Wed Feb 16 13:04:01 2011
+++ /trunk/plugin/wp-exhibit.php Thu Feb 24 05:13:21 2011
@@ -216,7 +216,7 @@

wp_register_script( 'exhibit-time', 'http://projects.csail.mit.edu/datapress/exhibit-files/exhibit-api/extensions/time/time-extension.js',
array( 'exhibit-api' ) );

wp_register_script( 'dp-jquery', "$wp_datapress_plugin_url/js/jquery-1.3.2.min.js",
array() );
-wp_register_script( 'dp-jquery-ui', "$wp_datapress_plugin_url/js/jquery-ui-1.7.2.custom.min.js",
array('dp-jquery')
);
+wp_register_script( 'dp-jquery-ui', "$wp_datapress_plugin_url/js/jquery-ui-1.7.3.custom.min.js",
array('dp-jquery')
);

wp_register_script( 'dp-mce', "$wp_datapress_plugin_url/tinymce/jquery.tinymce.js",
array('dp-jquery') );

@@ -236,7 +236,7 @@
*
---------------------------------------------------------------------------
*/

wp_register_style( 'dp-configurator', "$wp_datapress_plugin_url/css/wpexhibit.css");
-wp_register_style( 'dp-jquery', "$wp_datapress_plugin_url/css/jquery-ui-1.7.2.custom.css");
+wp_register_style( 'dp-jquery', "$wp_datapress_plugin_url/js/jQueryUI1.7.3/smoothness/jquery-ui-1.7.3.custom.css");

wp_register_style( 'dp-template', "$wp_datapress_plugin_url/css/template.css");

include_once('facet_widget.php');