Merge include files into .module

However, let's make sure to do #1181226: Remove viewfield_views_query_alter() function first.

Let's also do #1221440: Bogus default value in field widget first, since that is touching surrounding functions.

Attached patch removes the /theme directory and performs many (but not all) changes discussed in #1071212: Fix viewfield rendering.

The argument parsing functions are merely moved without changes.

Re-considered. Let's just do the code reshuffling here.

Thanks for reporting, reviewing, and testing! Committed to 7.x-2.x.

A new development snapshot will be available within the next 12 hours. This improvement will be available in the next official release.

Guess it would make sense to backport this for easier cross-version diffs... (?)

--- viewfield.css
+++ viewfield.css
@@ -1,5 +1,4 @@

odd, this file doesn't exist yet, according to http://drupalcode.org/project/viewfield.git/tree/refs/heads/6.x-2.x ...?

+++ viewfield.module
@@ -140,6 +183,20 @@ function viewfield_widget_settings($op, $widget) {
+function theme_viewfield_select($element) {
...
 function viewfield_widget(&$form, &$form_state, $field, $items, $delta = 0) {
@@ -268,3 +325,62 @@ function viewfield_theme() {

Let's move theme_viewfield_select() below viewfield_theme() -- not in between widget functions.

Speaking of, viewfield_theme() needs to be adjusted for the include/file path.

Thanks, looks good.

Though the patch doesn't contain ./viewfield.css at all anymore now -- let's make sure we don't lose it ;)