@@ -222,8 +237,130 @@
#end
+
+ ## bjones86 - SAK-24423 - joinable site settings title
+ #if( $joinGroupEnabled || $joinNotificationEnabled || $joinExcludeFromPublicListEnabled || $joinLimitAccountTypesEnabled ||
+ $joinGroupEnabledLocalDisabledGlobal || $joinNotifyEnabledLocalDisabledGlobal || $joinExcludeEnabledLocalDisabledGlobal ||
+ $joinLimitEnabledLocalDisabledGlobal )
+
$tlang.getString( "ediacc.additionJoinAccessOptions" )
+ #end
+
+ ## bjones86 - SAK-24423 - joinable site settings - joiner group
+ #if( $joinGroupEnabled || $joinGroupEnabledLocalDisabledGlobal )
+
+
+
+ #if( $joinGroupEnabledLocalDisabledGlobal )
+
$tlang.getString( "ediacc.groupEnabledLocalDiabledGlobal" )
+ #end
+
+ #end
+
+ ## bjones86 - SAK-24423 - joinable site settings - join notification
+ #if( $joinNotificationEnabled || $joinNotifyEnabledLocalDisabledGlobal )
+
+
+
+
+ #if( $joinNotifyEnabledLocalDisabledGlobal )
+
$tlang.getString( "ediacc.notifyEnabledLocalDisabledGlobal" )
+ #end
+ #end
+
+ ## bjones86 - SAK-24423 - joinable site settings - exclude from public list
+ #if( $joinExcludeFromPublicListEnabled || $joinExcludeEnabledLocalDisabledGlobal )
+
+
+
+
+ #if( $joinExcludeEnabledLocalDisabledGlobal )
+
$tlang.getString( "ediacc.excludeEnabledLocalDisabledGlobal" )
+ #end
+ #end
+
+ ## bjones86 - SAK-24423 - joinable site settings - limit by account types
+ #if( $joinLimitAccountTypesEnabled || $joinLimitEnabledLocalDisabledGlobal )
+
+
+
+
+
+ #if( $joinLimitEnabledLocalDisabledGlobal )
+
$tlang.getString( "ediacc.limitEnabledLocalDisabledGlobal" )
+ #end
+
+
+ #foreach( $category in $joinableAccountTypeCategories )
+ #if( !$category )
+ #foreach( $accType in $joinableAccountTypes )
+
+
+
+
+ #end
+ #end
+
+
+ $category
+ #foreach( $accType in $joinableAccountTypes )
+ #if( $accType.category == $category )
+ #set( $checkboxName = "$accType.category$accType.type" )
+
+
+
+
+ #end
+ #end
+
+ #end
+ #end
+
+
Index: site-manage-tool/tool/src/webapp/vm/sitebrowser/chef_sitebrowser_list.vm
===================================================================
--- site-manage-tool/tool/src/webapp/vm/sitebrowser/chef_sitebrowser_list.vm (revision 133106)
+++ site-manage-tool/tool/src/webapp/vm/sitebrowser/chef_sitebrowser_list.vm (working copy)
@@ -134,11 +134,62 @@
- #if ($site.isJoinable())
- $tlang.getString("list.joinable")
+ #if( $site.isJoinable() )
+
+ ## bjones86 - SAK-24423 - if site browser joining is disabled, just use the normal strings
+ #if( !$siteBrowserJoinEnabled )
+ $tlang.getString( "list.joinable" )
+
+ ## bjones86 - SAK-24423 - otherwise, provide the ability to join from the site browser
#else
- $tlang.getString("list.notjoinable")
+ #if( !$currentUser.Id || $currentUser.Id == "" )
+
+ $tlang.getString( "join.joinNow" )
+
+ #else
+
+ ## Check if they're already a member of the site
+ #set( $currentUserEid = $currentUser.Eid )
+ #set( $alreadyMember = false )
+ #set( $members = $site.Members )
+ #foreach( $member in $members )
+ #if( $member.UserEid == $currentUserEid )
+ #set( $alreadyMember = true )
+ #break
#end
+ #end
+
+ ## Check if the site is joinable but public excluded
+ #set( $publicExcluded = false )
+ #foreach( $key in $siteMap.keySet() )
+ #if( $key == $site.Id )
+ #set( $publicExcluded = $siteMap.get( $key ) )
+ #break
+ #end
+ #end
+
+ #if( $alreadyMember )
+ $tlang.getString( "list.alreadyMember" )
+
+ #elseif( $publicExcluded )
+ $tlang.getString( "list.joinableButExclude" )
+
+ #else
+
+ $tlang.getString( "join.joinNow" )
+
+ #end
+ #end
+ #end
+ #else
+ #if( !$siteBrowserJoinEnabled )
+ $tlang.getString( "list.notjoinable" )
+ #else
+ $tlang.getString( "join.notJoinable" )
+ #end
+ #end
|
Index: site-manage-tool/tool/src/webapp/vm/sitebrowser/chef_sitebrowser_visit.vm
===================================================================
--- site-manage-tool/tool/src/webapp/vm/sitebrowser/chef_sitebrowser_visit.vm (revision 133106)
+++ site-manage-tool/tool/src/webapp/vm/sitebrowser/chef_sitebrowser_visit.vm (working copy)
@@ -9,6 +9,11 @@
#toolbar($menu)
#end
+ ## bjones86 - SAK-24423 - alert messages needed for site browser join
+ #if( $alertMessage )
+ $tlang.getString( "gen.alert" ) $validator.escapeHtml( $alertMessage )
+ #end
+
|