Index: vsite/vsite.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/openscholar_vsite/vsite/vsite.module,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 vsite.module
--- vsite/vsite.module	3 Aug 2010 19:46:56 -0000	1.1.2.2
+++ vsite/vsite.module	4 Aug 2010 00:07:00 -0000
@@ -838,7 +838,7 @@ function vsite_private_site_login(){
 function vsite_vsite_generic_settings($space, $value = array()){
   $a_settings = array();
   
-  //Disable the shield
+  // Make the Site Private
   $a_settings['private_vsite'] = array(
     'form' => array(
       '#prefix' => "<br />",
Index: vsite_design/vsite_design.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/openscholar_vsite/vsite_design/Attic/vsite_design.module,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 vsite_design.module
--- vsite_design/vsite_design.module	3 Aug 2010 19:46:57 -0000	1.1.2.2
+++ vsite_design/vsite_design.module	4 Aug 2010 00:07:00 -0000
@@ -46,13 +46,6 @@ function vsite_design_theme(){
     'arguments' => array('form' => NULL),
   );
 
-  $items['vsite_design_theme_shieldpicker'] = array(
-    'arguments' => array('file' => array()),
-    'template' => 'vsite_design-theme-shieldpicker',
-    'path' => $path."/shield",
-    //'file' => 'theme.inc',
-  );
-
   return $items;
 }
 
@@ -132,20 +125,6 @@ function vsite_design_imagecache_default
       ),
     ),
   );
-  $presets['vsite_design_default_shield'] = array (
-    'presetname' => 'vsite_design_default_shield',
-    'actions' => array (
-      0 => array (
-        'weight' => '0',
-        'module' => 'imagecache',
-        'action' => 'imagecache_scale_and_crop',
-        'data' => array (
-          'width' => '62',
-          'height' => '75',
-        ),
-      ),
-    ),
-  );
   return $presets;
 }
 
@@ -196,53 +175,6 @@ function vsite_design_preprocess_page(&$
   $vars['styles'] = drupal_get_css();
 }
 
-
-/**
- * Implement Hook vsite_generic_settings
- * @return array
- */
-function vsite_design_vsite_generic_settings($space, $value = array()){
-  $a_settings = array();
-
-  //Disable the shield
-  $a_settings['disable_shield'] = array(
-    'form' => array(
-      '#prefix' => "<br />",
-      '#type' => 'checkbox',
-      '#title' => t('Disable Shields'),
-      '#attributes' => array('onChange' => "vsite_design_grey_out(this);"),
-      '#default_value' => is_array($value) && array_key_exists('disable_shield',$value) ? $value['disable_shield']:0,
-      '#description' => "Select the shield that you wish to appear in the 'shield widget' on your site.  Click disable to display none.",
-    )
-  );
-
-  //The shield List
-  $s_shield_dir = drupal_get_path('module','vsite_design')."/theme/shield/shields";
-  $a_shields = file_scan_directory($s_shield_dir, '.*', array('.', '..'));
-
-  $shield_options = array();
-  foreach ($a_shields as $shield)  $shield_options[$shield->filename] = theme('vsite_design_theme_shieldpicker', $shield);
-
-  $a_settings['shield'] = array(
-    'form' => array(
-      '#prefix' => "<div class='shield_wrapper'>",
-      '#title' => t('Shield'),
-      '#type' => 'radios',
-      '#options' => $shield_options,
-      '#default_value' => is_array($value) && array_key_exists('shield',$value) ? $value['shield']: drupal_get_path('module','vsite_design')."/theme/shield/shields/harvard_shield.png",
-      '#suffix' => '</div><div class="clearfix"></div>',
-    ),
-    'css' => array(drupal_get_path('module', 'vsite_design') . '/theme/shield/vsite_design-shield-picker.css'),
-    'js' => array(
-      drupal_get_path('module', 'vsite_design') . '/theme/shield/vsite_design-shield-picker.js',
-      drupal_get_path('module', 'vsite_design') . '/theme/shield/vsite_design.greyout.js',
-    ),
-  );
-  //END Shield List
-
-  return $a_settings;
-}
-
 /**
  * The main theme for the "theme selector" form
  * @param $form
@@ -387,4 +319,4 @@ function _vsite_design_get_conditional_s
   }
 
   return $conditional_styles;
-}
\ No newline at end of file
+}
Index: vsite_widgets/vsite_widgets.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/openscholar_vsite/vsite_widgets/Attic/vsite_widgets.module,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 vsite_widgets.module
--- vsite_widgets/vsite_widgets.module	28 Jul 2010 02:42:23 -0000	1.1.2.1
+++ vsite_widgets/vsite_widgets.module	4 Aug 2010 00:07:00 -0000
@@ -7,7 +7,6 @@ include_once('vsite_widgets.features.inc
  */
 function vsite_widgets_block($op = 'list', $delta = 0, $edit = array()) {
   if ($op == 'list') {
-    $blocks[0]['info'] = t('Scholar site shield');
     $blocks[1]['info'] = t('Scholar site search');
     $blocks[2]['info'] = t('ShareThis Button - Allows you to share posts using popular online services');
     $blocks[3]['info'] = t('Google Translate');
@@ -15,8 +14,6 @@ function vsite_widgets_block($op = 'list
   }
   elseif ($op == 'view') {
     switch ($delta) {
-      case 0:
-       return vsite_widgets_shield();
       case 1:
        return vsite_widgets_search_widget();
       case 2:
@@ -79,37 +76,9 @@ function vsite_widget_googletranslate(){
 	
 }
 
-function vsite_widgets_shield(){
-  	$scholar = vsite_get_vsite();
-	$output = '';
-	if(array_key_exists('generic',$scholar->settings) && array_key_exists('disable_shield',$scholar->settings['generic']) && $scholar->settings['generic']['disable_shield']){
-		return $output;
-	}//Disabled?
-
-	if(array_key_exists('generic',$scholar->settings) && array_key_exists('shield',$scholar->settings['generic'])){
-		$s_filename = array_pop(explode('/',$scholar->settings['generic']['shield']));
-		$output = '<div id="scholar-shield"><img src="/'.drupal_get_path('module','vsite_design')."/theme/shield/shields/".$s_filename.'" /> </div>';
-	}
-
-	$block['subject'] = t('');
-	$block['content'] = $output;
-
-	return $block;
-}
-
 function vsite_widgets_vsite_widgets(){
 
 	return array(
-  
-    'vsite_widgets_2' => array(
-      'module' => 'vsite_widgets',
-      'delta' => '0',
-      'weight' => 20,
-      'region' => 'header_right',
-      'status' => '0',
-      'label' => 'Scholar site shield',
-      'type' => 'context_ui',
-    ),
 
    'vsite_widgets_3' => array(
       'module' => 'vsite_widgets',
Index: vsitehelp/help/Familiarize-Yourself-with-the-Basics.html
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/openscholar_vsite/vsitehelp/help/Attic/Familiarize-Yourself-with-the-Basics.html,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 Familiarize-Yourself-with-the-Basics.html
--- vsitehelp/help/Familiarize-Yourself-with-the-Basics.html	28 Jul 2010 02:37:35 -0000	1.1.2.1
+++ vsitehelp/help/Familiarize-Yourself-with-the-Basics.html	4 Aug 2010 00:07:00 -0000
@@ -1,6 +1,6 @@
 <div id="node-71" class="node node-mine node-type-help">
   <div class="node-inner">
             <div class="content">
-      <p>Once logged in you'll be sent to your site. We'll take a moment to become familiar with some basic elements of your web site.</p><h3>General Layout</h3><p>By default the site is laid out in a manner similar to many web sites. There is a header area where you'll find the photo you uploaded; your name and professional title, address, and, by default, the Harvard shield. By default there are three menu options in the primary menu: <strong>Bio/CV</strong>, <strong>Classes</strong>, and <strong>Publications</strong>. As no content has yet been added you'll otherwise see an essentially blank site.</p><h3>"Add.." Links</h3><p>Click on <strong>Bio/CV</strong> and you'll be presented with another blank page, this time with two additional tabs: <strong>Biography</strong>, and <strong>Curriculum Vitae</strong>. You'll also see a new link <strong>"Add your Bio"</strong>, distinguished as a red link with a plus sign.</p><p>These <strong>"Add.."</strong> links will be visible on pages wherever you can add new material. They are context-specific so if you're on the <strong>Bio</strong> page an<strong> "Add your Bio"</strong> link appears. If on your <strong>Publications</strong> page, an <strong>"Add publication"</strong> link appears.</p><p>To add new content you'll want to look for these <strong>"Add.."</strong> links in red and with a plus sign.</p><p>&nbsp;</p><p>&nbsp;</p>    </div>
+      <p>Once logged in you'll be sent to your site. We'll take a moment to become familiar with some basic elements of your web site.</p><h3>General Layout</h3><p>By default the site is laid out in a manner similar to many web sites. There is a header area where you'll find the photo you uploaded; your name and professional title, and address. By default there are three menu options in the primary menu: <strong>Bio/CV</strong>, <strong>Classes</strong>, and <strong>Publications</strong>. As no content has yet been added you'll otherwise see an essentially blank site.</p><h3>"Add.." Links</h3><p>Click on <strong>Bio/CV</strong> and you'll be presented with another blank page, this time with two additional tabs: <strong>Biography</strong>, and <strong>Curriculum Vitae</strong>. You'll also see a new link <strong>"Add your Bio"</strong>, distinguished as a red link with a plus sign.</p><p>These <strong>"Add.."</strong> links will be visible on pages wherever you can add new material. They are context-specific so if you're on the <strong>Bio</strong> page an<strong> "Add your Bio"</strong> link appears. If on your <strong>Publications</strong> page, an <strong>"Add publication"</strong> link appears.</p><p>To add new content you'll want to look for these <strong>"Add.."</strong> links in red and with a plus sign.</p><p>&nbsp;</p><p>&nbsp;</p>    </div>
       </div> <!-- /node-inner -->
 </div> <!-- /node -->
Index: vsitehelp/help/Other-Settings.html
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/openscholar_vsite/vsitehelp/help/Attic/Other-Settings.html,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 Other-Settings.html
--- vsitehelp/help/Other-Settings.html	28 Jul 2010 02:37:35 -0000	1.1.2.1
+++ vsitehelp/help/Other-Settings.html	4 Aug 2010 00:07:00 -0000
@@ -2,10 +2,7 @@
   <div class="node-inner">
             <div class="content">
       <p><strong>Other Settings</strong>, under <strong>Settings</strong> in the Control Panel, is where you should find choices for displaying 
-      miscellaneous settings on your site such as academic shield selection,  the Admin Menu Bar, and various other settings</p>
-      
-      <strong>Academic Shield</strong><p>By default your site was created with a standard Harvard shield in the right header area. You can change this to a number of other shields, or choose not to show a shield. To move the shield to another location on your site go to <strong>Site Layout.
-      </strong></p>
+      miscellaneous settings on your site such as the Admin Menu Bar, and various other settings</p>
       
       <strong>Admin Menu Bar</strong><p>By default when you're logged in and looking at your site there'll be a small button to link back to your Control Panel. Some site owners may want the full Admin Menu Bar to always appear. 
       By checking "Display Admin Menu Bar", the menu will appear at all times once logged in.</p>
