From 0bf2f769aa3276ed0c8e6fd71c7e985165aaa734 Mon Sep 17 00:00:00 2001 From: Ahmed Mouer Date: Sat, 1 Nov 2014 11:50:26 -0400 Subject: [PATCH 1/5] Added local CSS file and made some changes to theme --- themes/bartik/css/local-css.css | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 themes/bartik/css/local-css.css diff --git a/themes/bartik/css/local-css.css b/themes/bartik/css/local-css.css new file mode 100644 index 0000000..d77c4af --- /dev/null +++ b/themes/bartik/css/local-css.css @@ -0,0 +1,9 @@ +#header.with-secondary-menu{ + background-image: none; + background-color: #DDD; + } + +#footer-wrapper { + background: none repeat scroll 0% 0% #DDD; + } + \ No newline at end of file From fd6f580c882b23d57a5ce317cc785e4c336be9d3 Mon Sep 17 00:00:00 2001 From: Ahmed Mouer Date: Sat, 1 Nov 2014 12:07:35 -0400 Subject: [PATCH 2/5] changes to the local css files, added them to Bartik --- themes/bartik/bartik.info | 1 + 1 file changed, 1 insertion(+) diff --git a/themes/bartik/bartik.info b/themes/bartik/bartik.info index c394ebd..c7712f4 100644 --- a/themes/bartik/bartik.info +++ b/themes/bartik/bartik.info @@ -9,6 +9,7 @@ stylesheets[all][] = css/layout.css stylesheets[all][] = css/style.css stylesheets[all][] = css/colors.css stylesheets[print][] = css/print.css +stylesheets[all][] = css/local-css.css regions[header] = Header regions[help] = Help From 39c212b27f38cc6dcfabdd91577cb6f5ee961797 Mon Sep 17 00:00:00 2001 From: Ahmed Mouer Date: Sat, 1 Nov 2014 12:09:06 -0400 Subject: [PATCH 3/5] Changes to the Romance/Personals field, removed conflicts --- .../ahmedm/ahmedm.features.field_base.inc | 126 +++++++++++++ .../ahmedm/ahmedm.features.field_instance.inc | 176 ++++++++++++++++++ sites/all/modules/ahmedm/ahmedm.features.inc | 23 +++ sites/all/modules/ahmedm/ahmedm.info | 19 ++ sites/all/modules/ahmedm/ahmedm.module | 7 + 5 files changed, 351 insertions(+) create mode 100644 sites/all/modules/ahmedm/ahmedm.features.field_base.inc create mode 100644 sites/all/modules/ahmedm/ahmedm.features.field_instance.inc create mode 100644 sites/all/modules/ahmedm/ahmedm.features.inc create mode 100644 sites/all/modules/ahmedm/ahmedm.info create mode 100644 sites/all/modules/ahmedm/ahmedm.module diff --git a/sites/all/modules/ahmedm/ahmedm.features.field_base.inc b/sites/all/modules/ahmedm/ahmedm.features.field_base.inc new file mode 100644 index 0000000..5551390 --- /dev/null +++ b/sites/all/modules/ahmedm/ahmedm.features.field_base.inc @@ -0,0 +1,126 @@ + 1, + 'cardinality' => 1, + 'deleted' => 0, + 'entity_types' => array( + 0 => 'node', + ), + 'field_name' => 'body', + 'foreign keys' => array( + 'format' => array( + 'columns' => array( + 'format' => 'format', + ), + 'table' => 'filter_format', + ), + ), + 'indexes' => array( + 'format' => array( + 0 => 'format', + ), + ), + 'locked' => 0, + 'module' => 'text', + 'settings' => array(), + 'translatable' => 0, + 'type' => 'text_with_summary', + ); + + // Exported field_base: 'field_category_romance_iam' + $field_bases['field_category_romance_iam'] = array( + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, + 'entity_types' => array(), + 'field_name' => 'field_category_romance_iam', + 'foreign keys' => array(), + 'indexes' => array( + 'value' => array( + 0 => 'value', + ), + ), + 'locked' => 0, + 'module' => 'list', + 'settings' => array( + 'allowed_values' => array( + 'Man' => 'Man', + 'Woman' => 'Woman', + 'Halal' => 'Halal', + 'Haram' => 'Haram', + ), + 'allowed_values_function' => '', + ), + 'translatable' => 0, + 'type' => 'list_text', + ); + + // Exported field_base: 'field_category_romance_seeking' + $field_bases['field_category_romance_seeking'] = array( + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, + 'entity_types' => array(), + 'field_name' => 'field_category_romance_seeking', + 'foreign keys' => array(), + 'indexes' => array( + 'value' => array( + 0 => 'value', + ), + ), + 'locked' => 0, + 'module' => 'list', + 'settings' => array( + 'allowed_values' => array( + 'Man' => 'Man', + 'Woman' => 'Woman', + 'Halal' => 'Halal', + 'Haram' => 'Haram', + ), + 'allowed_values_function' => '', + ), + 'translatable' => 0, + 'type' => 'list_text', + ); + + // Exported field_base: 'field_location' + $field_bases['field_location'] = array( + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, + 'entity_types' => array(), + 'field_name' => 'field_location', + 'foreign keys' => array(), + 'indexes' => array( + 'value' => array( + 0 => 'value', + ), + ), + 'locked' => 0, + 'module' => 'list', + 'settings' => array( + 'allowed_values' => array( + 'Washington, DC' => 'Washington, DC', + 'Virginia' => 'Virginia', + 'Maryland' => 'Maryland', + ), + 'allowed_values_function' => '', + ), + 'translatable' => 0, + 'type' => 'list_text', + ); + + return $field_bases; +} diff --git a/sites/all/modules/ahmedm/ahmedm.features.field_instance.inc b/sites/all/modules/ahmedm/ahmedm.features.field_instance.inc new file mode 100644 index 0000000..ba81288 --- /dev/null +++ b/sites/all/modules/ahmedm/ahmedm.features.field_instance.inc @@ -0,0 +1,176 @@ + 'romance_personals', + 'default_value' => NULL, + 'deleted' => 0, + 'description' => '', + 'display' => array( + 'default' => array( + 'label' => 'hidden', + 'module' => 'text', + 'settings' => array(), + 'type' => 'text_default', + 'weight' => 0, + ), + 'teaser' => array( + 'label' => 'hidden', + 'module' => 'text', + 'settings' => array( + 'trim_length' => 600, + ), + 'type' => 'text_summary_or_trimmed', + 'weight' => 0, + ), + ), + 'entity_type' => 'node', + 'field_name' => 'body', + 'label' => 'Body', + 'required' => FALSE, + 'settings' => array( + 'display_summary' => TRUE, + 'text_processing' => 1, + 'user_register_form' => FALSE, + ), + 'widget' => array( + 'module' => 'text', + 'settings' => array( + 'rows' => 20, + 'summary_rows' => 5, + ), + 'type' => 'text_textarea_with_summary', + 'weight' => -4, + ), + ); + + // Exported field_instance: 'node-romance_personals-field_category_romance_iam' + $field_instances['node-romance_personals-field_category_romance_iam'] = array( + 'bundle' => 'romance_personals', + 'default_value' => NULL, + 'deleted' => 0, + 'description' => '', + 'display' => array( + 'default' => array( + 'label' => 'above', + 'module' => 'list', + 'settings' => array(), + 'type' => 'list_default', + 'weight' => 2, + ), + 'teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + ), + 'entity_type' => 'node', + 'field_name' => 'field_category_romance_iam', + 'label' => 'I am', + 'required' => 1, + 'settings' => array( + 'user_register_form' => FALSE, + ), + 'widget' => array( + 'active' => 1, + 'module' => 'options', + 'settings' => array(), + 'type' => 'options_buttons', + 'weight' => -2, + ), + ); + + // Exported field_instance: 'node-romance_personals-field_category_romance_seeking' + $field_instances['node-romance_personals-field_category_romance_seeking'] = array( + 'bundle' => 'romance_personals', + 'default_value' => NULL, + 'deleted' => 0, + 'description' => '', + 'display' => array( + 'default' => array( + 'label' => 'above', + 'module' => 'list', + 'settings' => array(), + 'type' => 'list_default', + 'weight' => 3, + ), + 'teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + ), + 'entity_type' => 'node', + 'field_name' => 'field_category_romance_seeking', + 'label' => 'Seeking', + 'required' => 1, + 'settings' => array( + 'user_register_form' => FALSE, + ), + 'widget' => array( + 'active' => 1, + 'module' => 'options', + 'settings' => array(), + 'type' => 'options_buttons', + 'weight' => -1, + ), + ); + + // Exported field_instance: 'node-romance_personals-field_location' + $field_instances['node-romance_personals-field_location'] = array( + 'bundle' => 'romance_personals', + 'default_value' => NULL, + 'deleted' => 0, + 'description' => '', + 'display' => array( + 'default' => array( + 'label' => 'above', + 'module' => 'list', + 'settings' => array(), + 'type' => 'list_default', + 'weight' => 1, + ), + 'teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + ), + 'entity_type' => 'node', + 'field_name' => 'field_location', + 'label' => 'location', + 'required' => 1, + 'settings' => array( + 'user_register_form' => FALSE, + ), + 'widget' => array( + 'active' => 1, + 'module' => 'options', + 'settings' => array(), + 'type' => 'options_buttons', + 'weight' => -3, + ), + ); + + // Translatables + // Included for use with string extractors like potx. + t('Body'); + t('I am'); + t('Seeking'); + t('location'); + + return $field_instances; +} diff --git a/sites/all/modules/ahmedm/ahmedm.features.inc b/sites/all/modules/ahmedm/ahmedm.features.inc new file mode 100644 index 0000000..8a7da4e --- /dev/null +++ b/sites/all/modules/ahmedm/ahmedm.features.inc @@ -0,0 +1,23 @@ + array( + 'name' => t('Romance/Personals'), + 'base' => 'node_content', + 'description' => '', + 'has_title' => '1', + 'title_label' => t('Posting Title'), + 'help' => '', + ), + ); + drupal_alter('node_info', $items); + return $items; +} diff --git a/sites/all/modules/ahmedm/ahmedm.info b/sites/all/modules/ahmedm/ahmedm.info new file mode 100644 index 0000000..209edaa --- /dev/null +++ b/sites/all/modules/ahmedm/ahmedm.info @@ -0,0 +1,19 @@ +name = AhmedM +core = 7.x +package = Features +version = 7.x-1.0-beta2 +project = ahmedm +dependencies[] = features +dependencies[] = list +dependencies[] = options +dependencies[] = text +features[features_api][] = api:2 +features[field_base][] = body +features[field_base][] = field_category_romance_iam +features[field_base][] = field_category_romance_seeking +features[field_base][] = field_location +features[field_instance][] = node-romance_personals-body +features[field_instance][] = node-romance_personals-field_category_romance_iam +features[field_instance][] = node-romance_personals-field_category_romance_seeking +features[field_instance][] = node-romance_personals-field_location +features[node][] = romance_personals diff --git a/sites/all/modules/ahmedm/ahmedm.module b/sites/all/modules/ahmedm/ahmedm.module new file mode 100644 index 0000000..5ed6195 --- /dev/null +++ b/sites/all/modules/ahmedm/ahmedm.module @@ -0,0 +1,7 @@ + Date: Wed, 5 Nov 2014 15:03:58 -0500 Subject: [PATCH 4/5] changes to the module that i have worked on so far: version 3 --- sites/all/modules/ahmedm/ahmedm.info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/all/modules/ahmedm/ahmedm.info b/sites/all/modules/ahmedm/ahmedm.info index 209edaa..442d7ba 100644 --- a/sites/all/modules/ahmedm/ahmedm.info +++ b/sites/all/modules/ahmedm/ahmedm.info @@ -1,7 +1,7 @@ name = AhmedM core = 7.x package = Features -version = 7.x-1.0-beta2 +version = 7.x-1.0-beta3 project = ahmedm dependencies[] = features dependencies[] = list From 33d334a18b279360d6ae6eecc69cf738abf77e3b Mon Sep 17 00:00:00 2001 From: Ahmed Mouer Date: Wed, 5 Nov 2014 15:04:45 -0500 Subject: [PATCH 5/5] new changes to the css of the website --- themes/bartik/css/local-css.css | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/themes/bartik/css/local-css.css b/themes/bartik/css/local-css.css index d77c4af..52ace6f 100644 --- a/themes/bartik/css/local-css.css +++ b/themes/bartik/css/local-css.css @@ -1,9 +1,31 @@ #header.with-secondary-menu{ background-image: none; background-color: #DDD; + height: 50px; + min-height:24px; + } #footer-wrapper { background: none repeat scroll 0% 0% #DDD; } - \ No newline at end of file + +.views-field.views-field-created { + color: #808080; + font-size: 0.7em; + + } +.views-field-field-location { + color: #222; + font: Inherit; + font-size: 0.9em; + + } +.views-field-field-category-romance-iam, .views-field-field-category-romance-seeking +{ color: blue; +} +#footer-wrapper { + height: 25px; + } + +