@@ -244,6 +244,52 @@ function style_generator_form($param = NULL, $style_name = NULL) { $theme_name = arg(4); + // IMAGE REGEX!!!!!!!!!!!!!!!!!111111 + + // CSS REGEX!!!!!!!!!!!!!!!!!! + + + $regex = "~(?:\s*)(.*)(?::\s*)(.+)(?:.*;\s*)(?:/\*\s*(?:style:\s*(.*)\s+)\s*\*/)~i"; + + $form['style'][$theme_name] = array( + + '#type' => 'fieldset', + '#title' => 'Stylesheets', + '#tree' => TRUE, + + ); + + $style_list = style_get_stylesheets($theme_name, $style_name); + foreach ($style_list as $full_filename) { + + drupal_set_message($full_filename); + + $style = drupal_load_stylesheet($full_filename, FALSE); + $new_style = preg_replace_callback($regex, "_style_generate_form_fields", $style); + $img_regex = "~(.*)\s*{\s*(?:\s*)url\((.*)\)(?:.*)\s*}~im"; + preg_replace_callback($img_regex, "_style_image", $style); + $form['style'][$theme_name][$full_filename] = _style_generate_form_fields('', $full_filename, TRUE); + } + + $form['style']['style_name'] = array( + '#type' => 'value', + '#value' => $style_name, + ); + $form['style']['theme_name'] = array( + '#type' => 'value', + '#value' => $theme_name, + ); + $form['style']['save'] = array( + '#type' => 'submit', + '#value' => t('Save'), + ); + + return $form; +} + +function style_get_stylesheets($theme_name, $style_name) { + drupal_set_message("style_get_stylesheets ({$theme_name}, {$style_name}) "); + if ($style_name == "self") { $theme_info_file = drupal_get_path('theme', $theme_name) . '/' . $theme_name . '.info'; $theme_info = drupal_parse_info_file($theme_info_file); @@ -277,40 +323,24 @@ function style_generator_form($param = NULL, $style_name = NULL) { } - - - // CSS REGEX!!!!!!!!!!!!!!!!!! - - $regex = "~(?:\s*)(.*)(?::\s*)(.+)(?:.*;\s*)(?:/\*\s*(?:style:\s*(.*)\s+)\s*\*/)~i"; + $full_style_list = array(); + + foreach ($style_list as $filename) { - $form['style'][$theme_name] = array( + if ($style_name == "self") $full_filename = drupal_get_path('theme', $theme_name) . '/' . $filename; + else $full_filename = $dir . '/' . $filename; - '#type' => 'fieldset', - '#title' => 'Stylesheets', - - ); + $full_style_list[]= $full_filename; + } - $array = $style_list; - foreach ($array as $filename) { - if ($style_name == "self") $full_filename = drupal_get_path('theme', $theme_name) . '/' . $filename; - else $full_filename = $dir . '/' . $filename; - drupal_set_message($full_filename); - - $style = drupal_load_stylesheet($full_filename, FALSE); - $new_style = preg_replace_callback($regex, "_style_stylesheet", $style); + return $full_style_list; - $img_regex = "~(.*)\s*{\s*(?:\s*)url\((.*)\)(?:.*)\s*}~im"; - preg_replace_callback($img_regex, "_style_image", $style); - $form['style'][$theme_name][$filename] = _style_stylesheet('', $filename, TRUE); - } - // IMAGE REGEX!!!!!!!!!!!!!!!!!111111 + +} + +function style_make_form() { + - $form['style']['save'] = array( - '#type' => 'submit', - '#value' => t('Save'), - ); - - return $form; } @@ -325,10 +355,126 @@ function style_generator_form_submit($form, &$form_state) { } + drupal_set_message("<b>form</b>". kprint_r($form, TRUE)); + + $theme_name = $form_state['values']['theme_name']; + $style_name = $form_state['values']['style_name']; + //$regex = "~(?:\s*)(.*)(?::\s*)(.+)(?:.*;\s*)(?:/\*\s*(?:style:\s*(.*)\s+)\s*\*/)~i"; + $regex = "~(?:\n*)(\s*)(.*)(?::\s*)(.+)(?:.*;\s*)(?:/\*\s*(?:style:\s*(.*)\s+)\s*\*/)~m"; + + + $style_list = style_get_stylesheets($theme_name, $style_name); + foreach ($style_list as $full_filename) { + + drupal_set_message($full_filename); + + + $style = drupal_load_stylesheet($full_filename, FALSE); + + // add our static form values to this + + drupal_set_message("form['#post'][$theme_name][$full_filename]" . kprint_r($form['#post'][$theme_name][$full_filename], TRUE)); + + _style_replace('', $form['#post'][$theme_name][$full_filename]); + + $style = preg_replace_callback($regex, "_style_replace", $style); + drupal_set_message("<pre>" . $style . "</pre>"); + } + drupal_set_message(kprint_r($variables, TRUE)); + + +} + +function _style_replace($matches = NULL, $enter_form_items = NULL) { + + static $form_items; + if (isset($enter_form_items)) { + $form_items = $enter_form_items; + return; + + } + if (!isset($form_items) || $form_items == NULL) { + + //$form_items = array(); + } + + drupal_set_message("form items" . kprint_r($form_items, TRUE)); + + drupal_set_message("0: " . $matches['0']); + drupal_set_message("1 (indent): " . $matches['1']); + drupal_set_message("2: (property_type) " . $matches['2']); + + drupal_set_message("3: (property_value) " . $matches['3']); + + drupal_set_message("4: (property_label) " . $matches['4']); + $indent = $matches['1']; + + $property_type = $matches['2']; + $property_value = $matches['3']; + $property_label = $matches['4']; + drupal_set_message("form_items[property_label] (form_items[{$property_label}]) " . $form_items[$property_label]); + drupal_set_message("compare ". $form_items[$property_label] . "!=?" . $property_value); + + if (isset($form_items[$property_label])) { + + // check if the matches differ + drupal_set_message("compare ". $form_items[$property_label] . "!=?" . $property_value); + if ($form_items[$property_label] != $property_value) { + // replace + $return = "{$property_type}: " . $form_items[$property_label] . "; /* style: {$property_label} */"; + $matches['0'] = "\n" . $indent . $return; + } + return $matches['0']; + + } + + if (strlen($property_label) > 0) { + } +} +function _style_generate_form_fields($matches = NULL, $stylesheet = NULL, $return = NULL) { + + static $form_items; + if (!isset($form_items) || $form_items == NULL) { + + $form_items = array(); + } + + $property_type = $matches['1']; + $property_value = $matches['2']; + $property_label = $matches['3']; + + if (strlen($property_label) > 0) { + $form_items[$property_label] = array( + '#type' => 'textfield', + '#title' => $property_label, + '#value' => $property_value, + '#attributes' => array('class' => $property_type), + ); + } + + + if ($return == TRUE) { + if (count($form_items) > 0) { + $form = array(); + $form += array( + '#type' => 'fieldset', + '#title' => $stylesheet, + ); + $form += $form_items; + + $form_items = NULL; + return $form; + } + } + else { + return $matches; + + } + } @@ -627,48 +773,6 @@ function style_form_alter(&$form, $form_state, $form_id) { } -function _style_stylesheet($matches = NULL, $stylesheet = NULL, $return = NULL) { - - static $form_items; - if (!isset($form_items) || $form_items == NULL) { - - $form_items = array(); - } - - $property_type = $matches['1']; - $property_value = $matches['2']; - $property_label = $matches['3']; - - if (strlen($property_label) > 0) { - $form_items[$property_label] = array( - '#type' => 'textfield', - '#title' => $property_label, - '#value' => $property_value, - '#attributes' => array('class' => $property_type), - ); - } - - - if ($return == TRUE) { - if (count($form_items) > 0) { - $form = array(); - $form += array( - '#type' => 'fieldset', - '#title' => $stylesheet, - ); - $form += $form_items; - - $form_items = NULL; - return $form; - } - } - else { - return $matches; - - } - -} - function style_test_ahah() { $code = "<pre>"; style.module 477d5ab25615dc72caa876a9c5eb435ef113b113 Tony Narlock kiwi@kiwi.(none) http://github.com/skiquel/drupal-style/commit/f9bc1942623876c4724822b67e817c5d6af32d4c f9bc1942623876c4724822b67e817c5d6af32d4c 2009-03-06T11:40:39-08:00 2009-03-06T11:40:39-08:00 now replace functionality is working, and it saves indentation! :D 5d4948e2722c6e97bdfc846296b4a56ee8ca6c33 Tony Narlock kiwi@kiwi.(none)