fixed #10706: FriendManager Style/Layout template options

docs/changelog/7.x.x.txt

@@ -10,6 +10,7 @@
  - fixed #10704: Commit version tag from AdminBar is not working
  - fixed #10510: Product Thumbnails overlap Controls
  - fixed #10705: 7.7.2 upgrade script (sometimes) removes a table that the 7.7.7 upgrade script assumes is present
+ - fixed #10706: FriendManager Style/Layout template options
 
 7.7.16
  - fixed #10590: Session::DateTime->secondsToInterval doesn't allow 7 weeks

docs/upgrades/upgrade_7.7.16-7.7.17.pl

@@ -31,6 +31,7 @@ my $quiet; # this line required
 my $session = start(); # this line required
 
 # upgrade functions go here
+addFriendManagerSettings($session);
 
 finish($session); # this line required
 
@@ -44,6 +45,13 @@ finish($session); # this line required
 #    print "DONE!\n" unless $quiet;
 #}
 
+sub addFriendManagerSettings {
+    my $session = shift;
+    print "\tAdding Friend Manager Style and Layout template settings... " unless $quiet;
+    $session->setting->add('fmStyleTemplateId', $session->setting->get("userFunctionStyleId"));
+    $session->setting->add('fmLayoutTemplateId', 'N716tpSna0iIQTKxS4gTWA');
+    print "DONE!\n" unless $quiet;
+}
 
 # -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
 

lib/WebGUI/Account/FriendManager.pm

@@ -50,6 +50,33 @@ sub canView {
 
 #-------------------------------------------------------------------
 
+=head2 getLayoutTemplateId ( )
+
+Returns the template Id for the account layout. See L<WebGUI::Account::getLayoutTemplateId>.
+
+=cut
+
+sub getLayoutTemplateId {
+    my $self = shift;
+    return $self->session->setting->get("fmLayoutTemplateId") || $self->SUPER::getLayoutTemplateId;
+}
+
+
+#-------------------------------------------------------------------
+
+=head2 getStyleTemplateId ( )
+
+Returns the template Id for the main style. See L<WebGUI::Account::getStyleTemplateId>.
+
+=cut
+
+sub getStyleTemplateId {
+    my $self = shift;
+    return $self->session->setting->get("fmStyleTemplateId") || $self->SUPER::getStyleTemplateId;
+}
+
+#-------------------------------------------------------------------
+
 =head2 editSettingsForm ( )
 
 Creates form elements for the settings page custom to this account module.
@@ -62,6 +89,20 @@ sub editSettingsForm {
     my $i18n    = WebGUI::International->new($session,'Account_FriendManager');
     my $f       = WebGUI::HTMLForm->new($session);
 
+    $f->template(
+        name      => "fmStyleTemplateId",
+        value     => $self->getStyleTemplateId,
+        namespace => "style",
+        label     => $i18n->get("style template label"),
+        hoverHelp => $i18n->get("style template hoverHelp"),
+    );
+    $f->template(
+        name      => "fmLayoutTemplateId",
+        value     => $self->getLayoutTemplateId,
+        namespace => "Account/Layout",
+        label     => $i18n->get("layout template label"),
+        hoverHelp => $i18n->get("layout template hoverHelp"),
+    );
     $f->group(
         name      => "groupIdAdminFriends",
         value     => $session->setting->get('groupIdAdminFriends'),
@@ -115,12 +156,13 @@ sub editSettingsFormSave {
     my $setting = $session->setting;
     my $form    = $session->form;
 
-    $setting->set("fmViewTemplateId",  $form->process("fmViewTemplateId",  "template"));
-    $setting->set("fmEditTemplateId",  $form->process("fmEditTemplateId",  "template"));
-    my $groupsToManageFriends = $form->process("groupsToManageFriends", "group");
-    $setting->set("groupsToManageFriends",  $groupsToManageFriends);
-    $setting->set("groupIdAdminFriends",    $form->process("groupIdAdminFriends",    "group"));
-    $setting->set("overrideAbleToBeFriend", $form->process("overrideAbleToBeFriend", "yesNo"));
+    $setting->set( "fmStyleTemplateId",      $form->process( "fmStyleTemplateId",      "template" ) );
+    $setting->set( "fmLayoutTemplateId",     $form->process( "fmLayoutTemplateId",     "template" ) );
+    $setting->set( "fmViewTemplateId",       $form->process( "fmViewTemplateId",       "template" ) );
+    $setting->set( "fmEditTemplateId",       $form->process( "fmEditTemplateId",       "template" ) );
+    $setting->set( "groupsToManageFriends",  $form->process( "groupsToManageFriends",  "group" ) );
+    $setting->set( "groupIdAdminFriends",    $form->process( "groupIdAdminFriends",    "group" ) );
+    $setting->set( "overrideAbleToBeFriend", $form->process( "overrideAbleToBeFriend", "yesNo" ) );
 }
 
 #-------------------------------------------------------------------

lib/WebGUI/i18n/English/Account_FriendManager.pm

@@ -12,6 +12,26 @@ our $I18N = {
         message     => q{Group to manage friends, to assign people to one another and to view the interface for managing friends.},
         lastUpdated => 0,
     },
+    
+    'style template label' => {
+        message     => q|Style Template|,
+        lastUpdated => 0
+	},
+
+    'style template hoverHelp' => {
+        message     => q|Select a style template from the list to enclose the Friend Manager tab in.|,
+        lastUpdated => 0
+	},
+
+    'layout template label' => {
+        message     => q|Layout Template|,
+        lastUpdated => 0
+	},
+
+    'layout template hoverHelp' => {
+        message     => q{Choose a layout template in which to enclose the content from the various methods within the Friend Manager tab},
+        lastUpdated => 0
+    },
 
     'view template label' => {
         message     => q{View Template},