? .DS_Store
? .buildpath
? .project
? .settings
? service_links_001.patch
? service_links_002.patch
? service_links_003.patch
? service_links_admin.css
? service_links_node.css
Index: service_links.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/service_links/Attic/service_links.admin.inc,v
retrieving revision 1.1.2.6
diff -u -p -r1.1.2.6 service_links.admin.inc
--- service_links.admin.inc	18 Aug 2009 17:54:03 -0000	1.1.2.6
+++ service_links.admin.inc	14 Jun 2010 22:56:13 -0000
@@ -13,7 +13,7 @@ function theme_service_links_drag_table(
   $table = array();
 
   foreach (element_children($form['service_links_show']) as $service_id) {
-    $service = &$form['service_links_show'][$service_id]; 
+    $service = &$form['service_links_show'][$service_id];
     $col = array();
 
     $service['name'] = array('#value' => $service['#title']);
@@ -22,7 +22,7 @@ function theme_service_links_drag_table(
     $service['service'] = array('#value' => $service['#service']);
     $col[] = drupal_render($service['service']);
 
-    $service['show'] = array('#type' => 'checkbox', 
+    $service['show'] = array('#type' => 'checkbox',
       '#value' => $service['#default_value'],
       '#id' => $service['#id'],
       '#name' => $service['#name']);
@@ -35,7 +35,7 @@ function theme_service_links_drag_table(
     $table['weights'][] = $service['#weight'];
     $table['rows'][] = array('data' => $col, 'class' => 'draggable');
   }
-  
+
   if (empty($table['rows'])) {
     $table['rows'][] = array(array('data' => t('No service available.'), 'colspan' => '5'));
   }
@@ -43,48 +43,64 @@ function theme_service_links_drag_table(
 
   $table['header'] = array(t('Service Name'), t('Service Group'), t('Show'), t('Weight'));
   drupal_add_tabledrag('service_links', 'order', 'sibling', 'service-weight');
-  return theme('table', $table['header'], $table['rows'], array('id' => 'service_links')); 
+  return theme('table', $table['header'], $table['rows'], array('id' => 'service_links'));
 }
 
 /**
  * Menu callback administration settings for general options.
  */
 function service_links_admin_settings() {
+  drupal_add_css(drupal_get_path('module', 'service_links') . '/css/service_links_admin.css');
+  $form = array();
 
   $form['where_to_show_the_links'] = array(
     '#type' => 'fieldset',
+    '#collapsible' => TRUE,
+    '#collapsed' => FALSE,
     '#title' => t('Where to show the service links'),
     '#description' => t('Set the node types and categories you want to display links for.'),
+    '#group' => 'show_where',
   );
   $form['where_to_show_the_links']['service_links_node_types'] = array(
     '#type' => 'checkboxes',
     '#title' => t('Node types'),
     '#default_value' => variable_get('service_links_node_types', array()),
     '#options' => node_get_types('names'),
+    '#attributes' => array('class' => 'container-inline'),
+    '#group' => 'show_where',
   );
   if (module_exists('taxonomy')) {
+    $terms = _service_links_get_terms();
+    $count = count($terms);
     $form['where_to_show_the_links']['service_links_category_types'] = array(
       '#type' => 'select',
       '#multiple' => TRUE,
       '#title' => t('Categories'),
       '#default_value' => variable_get('service_links_category_types', array()),
-      '#options' => _service_links_get_terms(),
+      '#options' => $terms,
+      '#size' => ($count > 10 ? 10 : $count),
+      '#group' => 'show_where',
     );
   }
 
   $form['how_to_show_the_links'] = array(
     '#type' => 'fieldset',
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
     '#title' => t('When and how to show the links'),
+    '#group' => 'show_how',
   );
   $form['how_to_show_the_links']['service_links_in_links'] = array(
-    '#type' => 'select',
+    '#type' => 'radios',
     '#title' => t('Service links in links'),
     '#default_value' => variable_get('service_links_in_links', 0),
     '#options' => array(0 => t('Disabled'), 1 => t('Teaser view'), 2 => t('Full-page view'), 3 => t('Teasers and full-page view')),
     '#description' => t('When to display the services in the links section.'),
+    '#group' => 'show_how',
+    '#attributes' => array('class' => 'container-inline'),
   );
   $form['how_to_show_the_links']['service_links_in_node'] = array(
-    '#type' => 'select',
+    '#type' => 'radios',
     '#title' => t('Service links in nodes'),
     '#default_value' => variable_get('service_links_in_node', 2),
     '#options' => array(
@@ -93,9 +109,11 @@ function service_links_admin_settings() 
       SERVICE_LINKS_IN_FULL => t('Full-page view'),
       SERVICE_LINKS_IN_BOTH => t('Teasers and full-page view')),
     '#description' => t('When to display the services after the node text.'),
+    '#attributes' => array('class' => 'container-inline'),
+    '#group' => 'show_how',
   );
   $form['how_to_show_the_links']['service_links_style'] = array(
-    '#type' => 'select',
+    '#type' => 'radios',
     '#title' => t('Service links style'),
     '#default_value' => variable_get('service_links_style', 1),
     '#options' => array(
@@ -103,23 +121,31 @@ function service_links_admin_settings() 
       SERVICE_LINKS_STYLE_IMAGE => t('Only Image'),
       SERVICE_LINKS_STYLE_IMAGE_AND_TEXT => t('Image and Text')
     ),
+    '#attributes' => array('class' => 'container-inline'),
+    '#group' => 'show_how',
   );
   $form['how_to_show_the_links']['service_links_new_window'] = array(
-    '#type' => 'select',
+    '#type' => 'radios',
     '#title' => t('Open link in...'),
     '#default_value' => variable_get('service_links_new_window', 0),
     '#options' => array(0 => t('Same window'), 1 => t('New window')),
+    '#attributes' => array('class' => 'container-inline'),
+    '#group' => 'show_how',
   );
 
   $form['short_links'] = array(
     '#type' => 'fieldset',
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
     '#title' => t('Short Links'),
+    '#group' => 'short',
   );
   $form['short_links']['service_links_short_links_use'] = array(
     '#type' => 'select',
     '#title' => t('Use short links'),
     '#default_value' => variable_get('service_links_short_links_use', 0),
     '#options' => array(0 => t('Never'), 1 => t('Only when requested'), 2 => t('Always')),
+    '#group' => 'short',
   );
   if (variable_get('service_links_short_links_use', 0) > 0) {
     $form['short_links']['service_links_short_links_type'] = array(
@@ -127,6 +153,7 @@ function service_links_admin_settings() 
       '#title' => t('How generate short links'),
       '#default_value' => variable_get('service_links_short_links_type', 1),
       '#options' => array(1 => t('Use node/xxx alias'), 2 => t('Use TinyURL.com service'), 3 => t('Redirect only the Domain name'), 4 => t('Combo: domain redirect and node/xxx alias')),
+      '#group' => 'short',
     );
     $form['short_links']['service_links_domain_redirect'] = array(
       '#type' => 'textfield',
@@ -134,20 +161,40 @@ function service_links_admin_settings() 
       '#description' => t('Write here the complete address without trailing slash %name', array('%name' => '(http://www.example.com)') ),
       '#default_value' => variable_get('service_links_domain_redirect', ''),
       '#size' => 40,
+      '#group' => 'short',
     );
     $form['#validate'][] = 'service_links_admin_services_validate';
   }
 
+  $form['links_title'] = array(
+    '#type' => 'fieldset',
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
+    '#title' => t('Links Title'),
+    '#group' => 'title',
+    );
+
+  $form['links_title']['service_links_links_title'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Title of Links Section'),
+    '#default_value' => variable_get('service_links_links_title', t('Bookmark/Search this post with')),
+    '#group' => 'title',
+    );
+
   if (module_exists('aggregator2')) {
     $form['aggregator2_settings'] = array(
       '#type' => 'fieldset',
+      '#collapsible' => TRUE,
+      '#collapsed' => TRUE,
       '#title' => t('Aggregator2 settings'),
+      '#group' => 'aggregator',
     );
     $form['aggregator2_settings']['service_links_agg2_link'] = array(
       '#type' => 'checkbox',
       '#title' => t('Use link to original article aggregated by aggregator2 module'),
       '#return_value' => 1,
       '#default_value' => variable_get('service_links_agg2_link', 0),
+      '#group' => 'aggregator',
     );
   }
 
@@ -165,7 +212,7 @@ function service_links_admin_services_va
     if (preg_match("/\/$/", $form_state['values']['service_links_domain_redirect'])) {
       form_set_error('service_links_domain_redirect', t('No trailing slash!'));
     }
-  }  
+  }
 }
 
 /**
Index: service_links.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/service_links/service_links.module,v
retrieving revision 1.26.4.10
diff -u -p -r1.26.4.10 service_links.module
--- service_links.module	19 Jan 2010 20:12:03 -0000	1.26.4.10
+++ service_links.module	14 Jun 2010 22:56:14 -0000
@@ -9,10 +9,10 @@
  * A module that adds Digg, del.icio.us, reddit, Technorati etc. links to nodes.
  */
 
-define('SERVICE_LINKS_STYLE_TEXT',1);
-define('SERVICE_LINKS_STYLE_IMAGE',2);
-define('SERVICE_LINKS_STYLE_IMAGE_AND_TEXT',3);
-define('SERVICE_LINKS_STYLE_FISHEYE',4);
+define('SERVICE_LINKS_STYLE_TEXT', 1);
+define('SERVICE_LINKS_STYLE_IMAGE', 2);
+define('SERVICE_LINKS_STYLE_IMAGE_AND_TEXT', 3);
+define('SERVICE_LINKS_STYLE_FISHEYE', 4);
 
 define('SERVICE_LINKS_DISABLED', 0);
 define('SERVICE_LINKS_IN_TEASER', 1);
@@ -90,6 +90,7 @@ function service_links_nodeapi(&$node, $
       break;
     case 'view':
       if (isset($node->service_links) && user_access('access service links')) {
+        drupal_add_css(drupal_get_path('module', 'service_links') . '/css/service_links_node.css');
         switch (variable_get('service_links_in_node', 0)) {
           case 1:
             if ($teaser) {
@@ -493,7 +494,8 @@ function theme_service_links_build_link(
 }
 
 function theme_service_links_node_format($links) {
-  return '<div class="service-links"><div class="service-label">'. t('Bookmark/Search this post with:') .' </div>'. theme('links', $links) .'</div>';
+  $title = variable_get('service_links_links_title', 'Bookmark/Search this post with');
+  return '<div class="service-links"><div class="service-label">'. t('@title', array('@title' => $title)) .' </div>'. theme('links', $links) .'</div>';
 }
 
 function theme_service_links_block_format($items, $style = SERVICE_LINKS_STYLE_IMAGE_AND_TEXT) {
Index: css/service_links_fisheye.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/service_links/css/Attic/service_links_fisheye.css,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 service_links_fisheye.css
--- css/service_links_fisheye.css	3 Apr 2009 11:21:22 -0000	1.1.2.1
+++ css/service_links_fisheye.css	14 Jun 2010 22:56:14 -0000
@@ -1,30 +1,41 @@
+/* $Id$ */
+
+/**
+ * @file
+ * Style Sheet for Service Links module - Fisheye block.
+ */
+ 
 .fisheye{
-	text-align: center;
 	height: 50px;
+	text-align: center;
 	position: relative;
 }
+
 .fisheyeContainer {
-	position: absolute;
-	height: 50px;
 	/*background: url(bg.gif);*/
+	height: 50px;
 	padding-left: 20px;
+	position: absolute;
 }
+
 a.fisheyeItem:hover {text-decoration: none}
 a.fisheyeItem {
+	color: #000;	
+	display: block;	
+	font-weight: bold;	
+	position: absolute;	
 	text-align: center;
-	color: #000;
-	font-weight: bold;
 	text-decoration: none;
+	top: 0;	
 	width: 16px;
-	position: absolute;
-	display: block;
-	top: 0;
 }
+
 .fisheyeItem img {
 	border: none; 
 	margin: 5px 10px 0px; 
 	width: 100%; 
 }
+
 .fisheyeContainer span {
 	display: none; 
 	padding-left: 20px;