From 32246a8dc5143d14694d74e4191f2a0b5e1c9213 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 12 Nov 2014 10:26:38 -0600 Subject: [PATCH 001/111] Remove BOM from de-DE locale --- locale/de-DE/definitions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/de-DE/definitions.php b/locale/de-DE/definitions.php index 79bcbdd97..8b031d44b 100644 --- a/locale/de-DE/definitions.php +++ b/locale/de-DE/definitions.php @@ -1,4 +1,4 @@ - Date: Mon, 15 Dec 2014 11:20:28 -0600 Subject: [PATCH 002/111] Fire off an event to allow plugins to register their own rules Closes #53 --- controllers/class.rulescontroller.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/controllers/class.rulescontroller.php b/controllers/class.rulescontroller.php index 056979765..4e5a2c101 100644 --- a/controllers/class.rulescontroller.php +++ b/controllers/class.rulescontroller.php @@ -43,6 +43,13 @@ public static function GetRules() { $TempRules[$className] = $Rule->Name(); } } + + // TODO: Don't reuse badge model? + $Model = Yaga::BadgeModel(); + $Model->EventArguments['Rules'] = &$TempRules; + $Model->FireAs = 'Yaga'; + $Model->FireEvent('AfterGetRules'); + if(empty($TempRules)) { $Rules = serialize(FALSE); } From 51e41cc3d39812bf811122d8bbc644e0556c79db Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 15 Dec 2014 12:38:35 -0600 Subject: [PATCH 003/111] Support awarding multiple users with a single award. --- settings/class.hooks.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/settings/class.hooks.php b/settings/class.hooks.php index 5e1a94504..53b8ced4b 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -726,13 +726,20 @@ private function _AwardBadges($Sender, $Handler) { $Criteria = (object) unserialize($Badge->RuleCriteria); $Result = $Rule->Award($Sender, $User, $Criteria); if($Result) { - if(is_numeric($Result)) { - $AwardedUserID = $Result; + $AwardedUserIDs = array(); + if(is_array($Result)) { + $AwardedUserIDs = $Result; + } + else if(is_numeric($Result)) { + $AwardedUserIDs[] = $Result; } else { - $AwardedUserID = $UserID; + $AwardedUserIDs[] = $UserID; + } + + foreach($AwardedUserIDs as $AwardedUserID) { + $BadgeAwardModel->Award($Badge->BadgeID, $AwardedUserID, $UserID); } - $BadgeAwardModel->Award($Badge->BadgeID, $AwardedUserID, $UserID); } } } From bb20ebeb035aa0f11691402babdbd03ae0ab4786 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Sun, 21 Dec 2014 11:55:22 -0600 Subject: [PATCH 004/111] Add points to the event arguments for the after reaction save event. --- models/class.reactionmodel.php | 1 + 1 file changed, 1 insertion(+) diff --git a/models/class.reactionmodel.php b/models/class.reactionmodel.php index 64215bf86..7c84d7c4a 100644 --- a/models/class.reactionmodel.php +++ b/models/class.reactionmodel.php @@ -187,6 +187,7 @@ public function Set($ID, $Type, $AuthorID, $UserID, $ActionID) { $this->SetUserScore($ID, $Type, $UserID, $Score); // Give the user points commesurate with reaction activity UserModel::GivePoints($AuthorID, $Points, 'Reaction'); + $EventArgs['Points'] = $Points; $this->FireEvent('AfterReactionSave', $EventArgs); return $Reaction; } From 43cfa82db8aabff893b5106f7caed835f7cb0a95 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Sun, 21 Dec 2014 13:44:01 -0600 Subject: [PATCH 005/111] Make giving out points more... Yaga-y --- library/class.yaga.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/library/class.yaga.php b/library/class.yaga.php index 2f0d37c25..5ca838712 100644 --- a/library/class.yaga.php +++ b/library/class.yaga.php @@ -98,4 +98,18 @@ public static function RankModel() { } return self::$_RankModel; } + + /** + * Alias for UserModel::GivePoints() + * + * May be expanded in future versions. + * + * @param int $UserID + * @param int $Value + * @param string $Source + * @param int $Timestamp + */ + public static function GivePoints($UserID, $Value, $Source = 'Other', $Timestamp = FALSE) { + UserModel::GivePoints($UserID, $Value, $Source, $Timestamp); + } } From 1fba6bd61ae4e7c938e82c3ad0aad28a80f69ca3 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 24 Dec 2014 08:56:33 -0600 Subject: [PATCH 006/111] Switch models over to Yaga::GivePoints --- models/class.badgeawardmodel.php | 2 +- models/class.badgemodel.php | 2 +- models/class.reactionmodel.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/models/class.badgeawardmodel.php b/models/class.badgeawardmodel.php index 1fddd2922..3d64d8e5a 100644 --- a/models/class.badgeawardmodel.php +++ b/models/class.badgeawardmodel.php @@ -74,7 +74,7 @@ public function Award($BadgeID, $UserID, $InsertUserID = NULL, $Reason = '') { )); // Record the points for this badge - UserModel::GivePoints($UserID, $Badge->AwardValue, 'Badge'); + Yaga::GivePoints($UserID, $Badge->AwardValue, 'Badge'); // Increment the user's badge count $this->SQL->Update('User') diff --git a/models/class.badgemodel.php b/models/class.badgemodel.php index cc381332b..4f1bec53c 100644 --- a/models/class.badgemodel.php +++ b/models/class.badgemodel.php @@ -130,7 +130,7 @@ public function Delete($BadgeID) { // Remove their points foreach($UserIDs as $UserID) { - UserModel::GivePoints($UserID, -1 * $Badge->AwardValue, 'Badge'); + Yaga::GivePoints($UserID, -1 * $Badge->AwardValue, 'Badge'); } // Remove the award rows $this->SQL->Delete('BadgeAward', array('BadgeID' => $BadgeID)); diff --git a/models/class.reactionmodel.php b/models/class.reactionmodel.php index 7c84d7c4a..8f24522fe 100644 --- a/models/class.reactionmodel.php +++ b/models/class.reactionmodel.php @@ -186,7 +186,7 @@ public function Set($ID, $Type, $AuthorID, $UserID, $ActionID) { // Update the parent item score $this->SetUserScore($ID, $Type, $UserID, $Score); // Give the user points commesurate with reaction activity - UserModel::GivePoints($AuthorID, $Points, 'Reaction'); + Yaga::GivePoints($AuthorID, $Points, 'Reaction'); $EventArgs['Points'] = $Points; $this->FireEvent('AfterReactionSave', $EventArgs); return $Reaction; From 0d39d12dc85f2a7761f84d7fcd812852f87e3184 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 24 Dec 2014 09:03:49 -0600 Subject: [PATCH 007/111] Check for rule class existing and default to manual reward if not found. --- settings/class.hooks.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/settings/class.hooks.php b/settings/class.hooks.php index 53b8ced4b..ea8f811bb 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -715,10 +715,14 @@ private function _AwardBadges($Sender, $Handler) { || array_key_exists($Badge->RuleClass, $InteractionRules)) { // Create a rule object if needed $Class = $Badge->RuleClass; - if(!in_array($Class, $Rules)) { + if(!in_array($Class, $Rules) && class_exists($Class)) { $Rule = new $Class(); $Rules[$Class] = $Rule; } + else { + $Rule = new ManualAward(); + $Rules[$Class] = $Rule; + } $Rule = $Rules[$Class]; // Only check awards for rules that use this hook From 401527c27484aaa83595e7ad1d95f75c618d1981 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 29 Dec 2014 09:43:10 -0600 Subject: [PATCH 008/111] Add even more graceful handling of missing rules for plugin added rules. --- library/rules/class.unknownrule.php | 41 +++++++++++++++++++++++++++++ locale/en-CA/definitions.php | 2 ++ settings/class.hooks.php | 6 +++-- views/badge/edit.php | 7 ++++- views/badge/settings.php | 6 ++++- 5 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 library/rules/class.unknownrule.php diff --git a/library/rules/class.unknownrule.php b/library/rules/class.unknownrule.php new file mode 100644 index 000000000..47edd5f7f --- /dev/null +++ b/library/rules/class.unknownrule.php @@ -0,0 +1,41 @@ + 'AlertMessage')); + } + + public function Name() { + return T('Yaga.Rules.UnknownRule'); + } + + public function Interacts() { + return FALSE; + } +} diff --git a/locale/en-CA/definitions.php b/locale/en-CA/definitions.php index b3569c001..99734b311 100755 --- a/locale/en-CA/definitions.php +++ b/locale/en-CA/definitions.php @@ -211,6 +211,8 @@ $Definition['Yaga.Rules.SocialConnection'] = 'Social Connections'; $Definition['Yaga.Rules.SocialConnection.Criteria.Head'] = 'Which Social Network?'; $Definition['Yaga.Rules.SocialConnection.Desc'] = 'Award this badge if the user has connected to the target social network.'; +$Definition['Yaga.Rules.UnknownRule'] = 'Unknown Rule'; +$Definition['Yaga.Rules.UnknownRule.Desc'] = 'This badge will never be awarded automatically. This is selected if the rule class saved in the database is no longer available. This is most likely due to a plugin providing a rule and no longer being enabled.'; // Transport $Definition['Yaga.Export'] = 'Export Yaga Configuration'; diff --git a/settings/class.hooks.php b/settings/class.hooks.php index ea8f811bb..f548522ce 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -720,8 +720,10 @@ private function _AwardBadges($Sender, $Handler) { $Rules[$Class] = $Rule; } else { - $Rule = new ManualAward(); - $Rules[$Class] = $Rule; + if(!array_key_exists('UnknownRule', $Rules)) { + $Rules['UnkownRule'] = new UnknownRule(); + } + $Rules[$Class] = $Rules['UnkownRule']; } $Rule = $Rules[$Class]; diff --git a/views/badge/edit.php b/views/badge/edit.php index b29fa958b..e0b5842d5 100644 --- a/views/badge/edit.php +++ b/views/badge/edit.php @@ -10,7 +10,12 @@ $RuleClass = $this->Badge->RuleClass; } -$Rule = new $RuleClass(); +if(class_exists($RuleClass)) { + $Rule = new $RuleClass(); +} +else { + $Rule = new UnknownRule(); +} echo Wrap($this->Title(), 'h1'); diff --git a/views/badge/settings.php b/views/badge/settings.php index cb132b2aa..13ebdac72 100644 --- a/views/badge/settings.php +++ b/views/badge/settings.php @@ -33,7 +33,11 @@ $Row .= Wrap(Anchor($BadgePhoto, '/badges/detail/' . $Badge->BadgeID . '/' . Gdn_Format::Url($Badge->Name), array('title' => T('Yaga.Badge.DetailLink'))), 'td'); $Row .= Wrap($Badge->Name, 'td'); $Row .= Wrap($Badge->Description, 'td'); - $Row .= Wrap($Rules[$Badge->RuleClass], 'td'); + $RuleName = T('Yaga.Rules.UnknownRule'); + if(array_key_exists($Badge->RuleClass, $Rules)) { + $RuleName = $Rules[$Badge->RuleClass]; + } + $Row .= Wrap($RuleName, 'td'); $Row .= Wrap($Badge->AwardValue, 'td'); $ToggleText = ($Badge->Enabled) ? T('Enabled') : T('Disabled'); $ActiveClass = ($Badge->Enabled) ? 'Active' : 'InActive'; From 45f51ee6191972aa9e1498436bb850d6f7e1a024 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 29 Dec 2014 10:57:34 -0600 Subject: [PATCH 009/111] Move badge hooks to the Yaga class for ease of executing via a plugin. --- library/class.yaga.php | 68 +++++++++++++++++++++++++++++ settings/class.hooks.php | 92 ++++++---------------------------------- 2 files changed, 80 insertions(+), 80 deletions(-) diff --git a/library/class.yaga.php b/library/class.yaga.php index 5ca838712..78a40919d 100644 --- a/library/class.yaga.php +++ b/library/class.yaga.php @@ -112,4 +112,72 @@ public static function RankModel() { public static function GivePoints($UserID, $Value, $Source = 'Other', $Timestamp = FALSE) { UserModel::GivePoints($UserID, $Value, $Source, $Timestamp); } + + /** + * This is the dispatcher to check badge awards + * + * @param mixed $Sender The sending object + * @param string $Handler The event handler to check associated rules for awards + * (e.g. BadgeAwardModel_AfterBadgeAward_Handler or Base_AfterConnection) + */ + public static function ExecuteBadgeHooks($Sender, $Handler) { + $Session = Gdn::Session(); + if(!C('Yaga.Badges.Enabled') || !$Session->IsValid()) { + return; + } + + // Let's us use __FUNCTION__ in the original hook + $Hook = str_ireplace('_Handler', '', $Handler); + + $UserID = $Session->UserID; + $User = $Session->User; + + $BadgeAwardModel = Yaga::BadgeAwardModel(); + $Badges = $BadgeAwardModel->GetUnobtained($UserID); + + $InteractionRules = RulesController::GetInteractionRules(); + + $Rules = array(); + foreach($Badges as $Badge) { + // The badge award needs to be processed + if(($Badge->Enabled && $Badge->UserID != $UserID) + || array_key_exists($Badge->RuleClass, $InteractionRules)) { + // Create a rule object if needed + $Class = $Badge->RuleClass; + if(!in_array($Class, $Rules) && class_exists($Class)) { + $Rule = new $Class(); + $Rules[$Class] = $Rule; + } + else { + if(!array_key_exists('UnknownRule', $Rules)) { + $Rules['UnkownRule'] = new UnknownRule(); + } + $Rules[$Class] = $Rules['UnkownRule']; + } + + $Rule = $Rules[$Class]; + // Only check awards for rules that use this hook + if(in_array($Hook, $Rule->Hooks())) { + $Criteria = (object) unserialize($Badge->RuleCriteria); + $Result = $Rule->Award($Sender, $User, $Criteria); + if($Result) { + $AwardedUserIDs = array(); + if(is_array($Result)) { + $AwardedUserIDs = $Result; + } + else if(is_numeric($Result)) { + $AwardedUserIDs[] = $Result; + } + else { + $AwardedUserIDs[] = $UserID; + } + + foreach($AwardedUserIDs as $AwardedUserID) { + $BadgeAwardModel->Award($Badge->BadgeID, $AwardedUserID, $UserID); + } + } + } + } + } + } } diff --git a/settings/class.hooks.php b/settings/class.hooks.php index f548522ce..a36be4bee 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -582,7 +582,7 @@ public function ActivityController_Render_Before($Sender) { * @param Gdn_Dispatcher $Sender */ public function Gdn_Dispatcher_AppStartup_Handler($Sender) { - $this->_AwardBadges($Sender, __FUNCTION__); + Yaga::ExecuteBadgeHooks($Sender, __FUNCTION__); } /** @@ -591,7 +591,7 @@ public function Gdn_Dispatcher_AppStartup_Handler($Sender) { * @param mixed $Sender */ public function Base_AfterGetSession_Handler($Sender) { - $this->_AwardBadges($Sender, __FUNCTION__); + Yaga::ExecuteBadgeHooks($Sender, __FUNCTION__); } /** @@ -600,7 +600,7 @@ public function Base_AfterGetSession_Handler($Sender) { * @param CommentModel $Sender */ public function CommentModel_AfterSaveComment_Handler($Sender) { - $this->_AwardBadges($Sender, __FUNCTION__); + Yaga::ExecuteBadgeHooks($Sender, __FUNCTION__); } /** @@ -609,7 +609,7 @@ public function CommentModel_AfterSaveComment_Handler($Sender) { * @param DiscussionModel $Sender */ public function DiscussionModel_AfterSaveDiscussion_Handler($Sender) { - $this->_AwardBadges($Sender, __FUNCTION__); + Yaga::ExecuteBadgeHooks($Sender, __FUNCTION__); } /** @@ -618,7 +618,7 @@ public function DiscussionModel_AfterSaveDiscussion_Handler($Sender) { * @param ActivityModel $Sender */ public function ActivityModel_BeforeSaveComment_Handler($Sender) { - $this->_AwardBadges($Sender, __FUNCTION__); + Yaga::ExecuteBadgeHooks($Sender, __FUNCTION__); } /** @@ -627,7 +627,7 @@ public function ActivityModel_BeforeSaveComment_Handler($Sender) { * @param CommentModel $Sender */ public function CommentModel_BeforeNotification_Handler($Sender) { - $this->_AwardBadges($Sender, __FUNCTION__); + Yaga::ExecuteBadgeHooks($Sender, __FUNCTION__); } /** @@ -636,7 +636,7 @@ public function CommentModel_BeforeNotification_Handler($Sender) { * @param DiscussionModel $Sender */ public function DiscussionModel_BeforeNotification_Handler($Sender) { - $this->_AwardBadges($Sender, __FUNCTION__); + Yaga::ExecuteBadgeHooks($Sender, __FUNCTION__); } /** @@ -645,7 +645,7 @@ public function DiscussionModel_BeforeNotification_Handler($Sender) { * @param mixed $Sender */ public function Base_AfterSignIn_Handler($Sender) { - $this->_AwardBadges($Sender, __FUNCTION__); + Yaga::ExecuteBadgeHooks($Sender, __FUNCTION__); } /** @@ -654,7 +654,7 @@ public function Base_AfterSignIn_Handler($Sender) { * @param UserModel $Sender */ public function UserModel_AfterSave_Handler($Sender) { - $this->_AwardBadges($Sender, __FUNCTION__); + Yaga::ExecuteBadgeHooks($Sender, __FUNCTION__); } /** @@ -663,7 +663,7 @@ public function UserModel_AfterSave_Handler($Sender) { * @param ReactionModel $Sender */ public function ReactionModel_AfterReactionSave_Handler($Sender) { - $this->_AwardBadges($Sender, __FUNCTION__); + Yaga::ExecuteBadgeHooks($Sender, __FUNCTION__); } /** @@ -672,7 +672,7 @@ public function ReactionModel_AfterReactionSave_Handler($Sender) { * @param BadgeAwardModel $Sender */ public function BadgeAwardModel_AfterBadgeAward_Handler($Sender) { - $this->_AwardBadges($Sender, __FUNCTION__); + Yaga::ExecuteBadgeHooks($Sender, __FUNCTION__); } /** @@ -681,75 +681,7 @@ public function BadgeAwardModel_AfterBadgeAward_Handler($Sender) { * @param mixed $Sender */ public function Base_AfterConnection_Handler($Sender) { - $this->_AwardBadges($Sender, __FUNCTION__); - } - - /** - * This is the dispatcher to check badge awards - * - * @param mixed $Sender The sending object - * @param string $Handler The event handler to check associated rules for awards - * (e.g. BadgeAwardModel_AfterBadgeAward_Handler or Base_AfterConnection) - */ - private function _AwardBadges($Sender, $Handler) { - $Session = Gdn::Session(); - if(!C('Yaga.Badges.Enabled') || !$Session->IsValid()) { - return; - } - - // Let's us use __FUNCTION__ in the original hook - $Hook = str_ireplace('_Handler', '', $Handler); - - $UserID = $Session->UserID; - $User = $Session->User; - - $BadgeAwardModel = Yaga::BadgeAwardModel(); - $Badges = $BadgeAwardModel->GetUnobtained($UserID); - - $InteractionRules = RulesController::GetInteractionRules(); - - $Rules = array(); - foreach($Badges as $Badge) { - // The badge award needs to be processed - if(($Badge->Enabled && $Badge->UserID != $UserID) - || array_key_exists($Badge->RuleClass, $InteractionRules)) { - // Create a rule object if needed - $Class = $Badge->RuleClass; - if(!in_array($Class, $Rules) && class_exists($Class)) { - $Rule = new $Class(); - $Rules[$Class] = $Rule; - } - else { - if(!array_key_exists('UnknownRule', $Rules)) { - $Rules['UnkownRule'] = new UnknownRule(); - } - $Rules[$Class] = $Rules['UnkownRule']; - } - - $Rule = $Rules[$Class]; - // Only check awards for rules that use this hook - if(in_array($Hook, $Rule->Hooks())) { - $Criteria = (object) unserialize($Badge->RuleCriteria); - $Result = $Rule->Award($Sender, $User, $Criteria); - if($Result) { - $AwardedUserIDs = array(); - if(is_array($Result)) { - $AwardedUserIDs = $Result; - } - else if(is_numeric($Result)) { - $AwardedUserIDs[] = $Result; - } - else { - $AwardedUserIDs[] = $UserID; - } - - foreach($AwardedUserIDs as $AwardedUserID) { - $BadgeAwardModel->Award($Badge->BadgeID, $AwardedUserID, $UserID); - } - } - } - } - } + Yaga::ExecuteBadgeHooks($Sender, __FUNCTION__); } /** From bc619cf7e58b8e3c1650a6843d7f1db6bc439857 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 29 Dec 2014 10:59:35 -0600 Subject: [PATCH 010/111] Remove '_' prefixes to denote private/protected. --- settings/class.hooks.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/settings/class.hooks.php b/settings/class.hooks.php index a36be4bee..c9dcfc9ab 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -275,7 +275,7 @@ public function UserModel_AfterSetField_Handler($Sender) { foreach($FieldHooks as $FieldHook) { if(array_key_exists($FieldHook, $Fields)) { $UserID = $Sender->EventArguments['UserID']; - $this->_RankProgression($UserID); + $this->RankProgression($UserID); break; // Only need to fire once per event } } @@ -286,7 +286,7 @@ public function UserModel_AfterSetField_Handler($Sender) { * * @param int $UserID */ - protected function _RankProgression($UserID) { + protected function RankProgression($UserID) { $UserModel = Gdn::UserModel(); $User = $UserModel->GetID($UserID); @@ -465,13 +465,13 @@ public function UserModel_AfterGetSession_Handler($Sender) { $PerkKey = substr($Perk, 4); if($PerkType === 'Conf') { - $this->_ApplyCustomConfigs($PerkKey, $PerkValue); + $this->ApplyCustomConfigs($PerkKey, $PerkValue); } else if($PerkType === 'Perm' && $PerkValue === 'grant') { - $this->_GrantPermission($User, $PerkKey); + $this->GrantPermission($User, $PerkKey); } else if($PerkType === 'Perm' && $PerkValue === 'revoke') { - $this->_RevokePermission($User, $PerkKey); + $this->RevokePermission($User, $PerkKey); } else { // Do nothing @@ -485,7 +485,7 @@ public function UserModel_AfterGetSession_Handler($Sender) { * @param type $User * @param string $Permission */ - private function _GrantPermission($User, $Permission = '') { + private function GrantPermission($User, $Permission = '') { if($Permission === '') { return; } @@ -505,7 +505,7 @@ private function _GrantPermission($User, $Permission = '') { * @param type $User * @param string $Permission */ - private function _RevokePermission($User, $Permission = '') { + private function RevokePermission($User, $Permission = '') { if($Permission === '') { return; } @@ -523,7 +523,7 @@ private function _RevokePermission($User, $Permission = '') { * @param string $Name * @param mixed $Value */ - private function _ApplyCustomConfigs($Name = NULL, $Value = NULL) { + private function ApplyCustomConfigs($Name = NULL, $Value = NULL) { SaveToConfig($Name, $Value, array('Save' => FALSE)); } @@ -533,7 +533,7 @@ private function _ApplyCustomConfigs($Name = NULL, $Value = NULL) { * @param ProfileController $Sender */ public function ProfileController_Render_Before($Sender) { - $this->_AddResources($Sender); + $this->AddResources($Sender); if(C('Yaga.Badges.Enabled')) { $Sender->AddModule('BadgesModule'); @@ -546,7 +546,7 @@ public function ProfileController_Render_Before($Sender) { * @param DiscussionController $Sender */ public function DiscussionController_Render_Before($Sender) { - $this->_AddResources($Sender); + $this->AddResources($Sender); } /** @@ -555,7 +555,7 @@ public function DiscussionController_Render_Before($Sender) { * @param CommentController $Sender */ public function CommentController_Render_Before($Sender) { - $this->_AddResources($Sender); + $this->AddResources($Sender); } /** @@ -564,7 +564,7 @@ public function CommentController_Render_Before($Sender) { * @param ActivityController $Sender */ public function ActivityController_Render_Before($Sender) { - $this->_AddResources($Sender); + $this->AddResources($Sender); if(C('Yaga.LeaderBoard.Enabled', FALSE)) { // add leaderboard modules to the activity page @@ -689,7 +689,7 @@ public function Base_AfterConnection_Handler($Sender) { * * @param Gdn_Controller $Sender */ - private function _AddResources($Sender) { + private function AddResources($Sender) { $Sender->AddCssFile('reactions.css', 'yaga'); } From 8b22df1b6c1d93fa2e5d24d96fa271ba533feb25 Mon Sep 17 00:00:00 2001 From: bleistivt Date: Mon, 29 Dec 2014 22:05:26 +0100 Subject: [PATCH 011/111] Update definitions.php Translation for UnknownRule --- locale/de-DE/definitions.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/locale/de-DE/definitions.php b/locale/de-DE/definitions.php index 8b031d44b..c458916a4 100644 --- a/locale/de-DE/definitions.php +++ b/locale/de-DE/definitions.php @@ -200,3 +200,5 @@ $Definition['Yaga.Rules.SocialConnection'] = 'Soziale Netzwerk Verknüpfungen'; $Definition['Yaga.Rules.SocialConnection.Desc'] = 'Diese Auszeichnung verleihen, wenn der Benutzer seinen Account mit einem bestimmten sozialen Netzwerk verbunden hat.'; $Definition['Yaga.Rules.SocialConnection.Criteria.Head'] = 'Welches Soziale Netzwerk?'; +$Definition['Yaga.Rules.UnknownRule'] = 'Unbekannte Regel'; +$Definition['Yaga.Rules.UnknownRule.Desc'] = 'Diese Auszeichnung wird nie automatisch verliehen. Diese Regel wird angewandt, wenn die in der Datenbank gespeicherte Regel nicht mehr verfügbar ist. Dies ist der Fall, wenn Regeln von einem deaktivierten Plugin stammen.'; From 257f33a3d3beb3426c0365a0e8d24cf00afd8028 Mon Sep 17 00:00:00 2001 From: bleistivt Date: Sun, 11 Jan 2015 10:27:29 +0100 Subject: [PATCH 012/111] Render reaction record instantly #56 --- controllers/class.reactcontroller.php | 5 +++-- library/functions.render.php | 17 ++++++++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/controllers/class.reactcontroller.php b/controllers/class.reactcontroller.php index 7cbf784bb..bc7e5a6dd 100644 --- a/controllers/class.reactcontroller.php +++ b/controllers/class.reactcontroller.php @@ -70,7 +70,7 @@ public function Index($Type, $ID, $ActionID) { $Item = $Model->GetID($ID); if($Item) { - $Anchor = $AnchorID . $ID . ' .ReactMenu'; + $Anchor = $AnchorID . $ID; } else { throw new Gdn_UserException(T('Yaga.Action.InvalidTargetID')); @@ -98,7 +98,8 @@ public function Index($Type, $ID, $ActionID) { // It has passed through the gauntlet $this->ReactionModel->Set($ID, $Type, $ItemOwnerID, $UserID, $ActionID); - $this->JsonTarget($Anchor, RenderReactionList($ID, $Type, FALSE), 'ReplaceWith'); + $this->JsonTarget($Anchor . ' .ReactMenu', RenderReactionList($ID, $Type, FALSE), 'ReplaceWith'); + $this->JsonTarget($Anchor . ' .ReactionRecord', RenderReactionRecord($ID, $Type, FALSE), 'ReplaceWith'); // Don't render anything $this->Render('Blank', 'Utility', 'Dashboard'); diff --git a/library/functions.render.php b/library/functions.render.php index 7b3d939e8..d9bc365ba 100644 --- a/library/functions.render.php +++ b/library/functions.render.php @@ -56,10 +56,11 @@ function RenderReactionList($ID, $Type, $Echo = TRUE) { * @param int $ID * @param string $Type 'discussion', 'activity', or 'comment' */ - function RenderReactionRecord($ID, $Type) { + function RenderReactionRecord($ID, $Type, $Echo = TRUE) { $Reactions = Yaga::ReactionModel()->GetRecord($ID, $Type); $Limit = C('Yaga.Reactions.RecordLimit'); $ReactionCount = count($Reactions); + $RecordsString = ''; $i = 0; foreach($Reactions as $Reaction) { $i++; @@ -80,13 +81,23 @@ function RenderReactionRecord($ID, $Type) { 'data-userid' => $User->UserID, 'title' => $DateTitle ); - echo Wrap($String, 'span', $Wrapttributes); + $RecordsString .= Wrap($String, 'span', $Wrapttributes); } if($Limit > 0 && $i >= $ReactionCount && $ReactionCount > $Limit) { - echo Plural($ReactionCount - $Limit, 'Yaga.Reactions.RecordLimit.Single', 'Yaga.Reactions.RecordLimit.Plural'); + $RecordsString .= Plural($ReactionCount - $Limit, 'Yaga.Reactions.RecordLimit.Single', 'Yaga.Reactions.RecordLimit.Plural'); } } + + $AllRecordsString = Wrap($RecordsString, 'div', array('class' => 'ReactionRecord')); + + if($Echo) { + echo $AllRecordsString; + return true; + } + else { + return $AllRecordsString; + } } } From d52f1482e4d48125c10f62d96c8cbe9dc963bccf Mon Sep 17 00:00:00 2001 From: bleistivt Date: Sun, 11 Jan 2015 17:55:42 +0100 Subject: [PATCH 013/111] Tab to spaces, PHPDoc --- library/functions.render.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/library/functions.render.php b/library/functions.render.php index d9bc365ba..12fa7e7ea 100644 --- a/library/functions.render.php +++ b/library/functions.render.php @@ -55,12 +55,14 @@ function RenderReactionList($ID, $Type, $Echo = TRUE) { * * @param int $ID * @param string $Type 'discussion', 'activity', or 'comment' + * @param bool $Echo Should it be echoed? + * @return mixed String if $Echo is false, TRUE otherwise */ function RenderReactionRecord($ID, $Type, $Echo = TRUE) { $Reactions = Yaga::ReactionModel()->GetRecord($ID, $Type); $Limit = C('Yaga.Reactions.RecordLimit'); $ReactionCount = count($Reactions); - $RecordsString = ''; + $RecordsString = ''; $i = 0; foreach($Reactions as $Reaction) { $i++; From a3f07442dbb2d79dd6fb185c107e2d8d9d7c18b6 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 12 Jan 2015 08:57:59 -0600 Subject: [PATCH 014/111] Get rid of echo option of `RenderReactionList()`. Prefixing the call with `echo ` takes the same amount of characters and reduces the logic complexity of this function --- controllers/class.reactcontroller.php | 2 +- library/functions.render.php | 17 ++++------------- settings/class.hooks.php | 4 ++-- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/controllers/class.reactcontroller.php b/controllers/class.reactcontroller.php index 7cbf784bb..83488b726 100644 --- a/controllers/class.reactcontroller.php +++ b/controllers/class.reactcontroller.php @@ -98,7 +98,7 @@ public function Index($Type, $ID, $ActionID) { // It has passed through the gauntlet $this->ReactionModel->Set($ID, $Type, $ItemOwnerID, $UserID, $ActionID); - $this->JsonTarget($Anchor, RenderReactionList($ID, $Type, FALSE), 'ReplaceWith'); + $this->JsonTarget($Anchor, RenderReactionList($ID, $Type), 'ReplaceWith'); // Don't render anything $this->Render('Blank', 'Utility', 'Dashboard'); diff --git a/library/functions.render.php b/library/functions.render.php index 7b3d939e8..502eb6efe 100644 --- a/library/functions.render.php +++ b/library/functions.render.php @@ -6,7 +6,7 @@ * @since 1.0 * @copyright (c) 2013-2014, Zachary Doll */ -if(!function_exists('RenderReactions')) { +if(!function_exists('RenderReactionList')) { /** * Renders a list of available actions that also contains the current count of @@ -14,10 +14,9 @@ * * @param int $ID * @param string $Type 'discussion', 'activity', or 'comment' - * @param bool $Echo Should it be echoed? - * @return mixed String if $Echo is false, TRUE otherwise + * @return string Rendered list of reactions */ - function RenderReactionList($ID, $Type, $Echo = TRUE) { + function RenderReactionList($ID, $Type) { $Reactions = Yaga::ReactionModel()->GetList($ID, $Type); $ShowCount = Gdn::Session()->CheckPermission('Yaga.Reactions.View'); $ActionsString = ''; @@ -35,15 +34,7 @@ function RenderReactionList($ID, $Type, $Echo = TRUE) { } } - $AllActionsString = Wrap($ActionsString, 'span', array('class' => 'ReactMenu')); - - if($Echo) { - echo $AllActionsString; - return true; - } - else { - return $AllActionsString; - } + return Wrap($ActionsString, 'span', array('class' => 'ReactMenu')); } } diff --git a/settings/class.hooks.php b/settings/class.hooks.php index c9dcfc9ab..d001f1207 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -405,7 +405,7 @@ public function DiscussionController_AfterReactions_Handler($Sender) { // Users shouldn't be able to react to their own content if(Gdn::Session()->UserID != $AuthorID) { - RenderReactionList($ID, $Type); + echo RenderReactionList($ID, $Type); } } @@ -437,7 +437,7 @@ public function ActivityController_AfterActivityBody_Handler($Sender) { // The current user made this activity item happen } else { - echo Wrap(RenderReactionList($ID, $Type, FALSE), 'div', array('class' => 'Reactions')); + echo Wrap(RenderReactionList($ID, $Type), 'div', array('class' => 'Reactions')); } } From 1d2349ef4ba7ec58a54c7a021704a7a0f56eb79c Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 12 Jan 2015 09:15:38 -0600 Subject: [PATCH 015/111] Remove echo option from `RenderReactionRecord()` --- controllers/class.reactcontroller.php | 2 +- library/functions.render.php | 38 +++++++-------------------- settings/class.hooks.php | 4 +-- views/best/index.php | 2 +- views/profile/best.php | 2 +- views/profile/reactions.php | 2 +- 6 files changed, 15 insertions(+), 35 deletions(-) diff --git a/controllers/class.reactcontroller.php b/controllers/class.reactcontroller.php index 6e62b1405..ec2785b57 100644 --- a/controllers/class.reactcontroller.php +++ b/controllers/class.reactcontroller.php @@ -99,7 +99,7 @@ public function Index($Type, $ID, $ActionID) { $this->ReactionModel->Set($ID, $Type, $ItemOwnerID, $UserID, $ActionID); $this->JsonTarget($Anchor . ' .ReactMenu', RenderReactionList($ID, $Type), 'ReplaceWith'); - $this->JsonTarget($Anchor . ' .ReactionRecord', RenderReactionRecord($ID, $Type, FALSE), 'ReplaceWith'); + $this->JsonTarget($Anchor . ' .ReactionRecord', RenderReactionRecord($ID, $Type), 'ReplaceWith'); // Don't render anything $this->Render('Blank', 'Utility', 'Dashboard'); diff --git a/library/functions.render.php b/library/functions.render.php index ff866e153..43c8c0a1d 100644 --- a/library/functions.render.php +++ b/library/functions.render.php @@ -14,7 +14,7 @@ * * @param int $ID * @param string $Type 'discussion', 'activity', or 'comment' - * @return string Rendered list of reactions + * @return string Rendered list of actions available */ function RenderReactionList($ID, $Type) { $Reactions = Yaga::ReactionModel()->GetList($ID, $Type); @@ -46,51 +46,31 @@ function RenderReactionList($ID, $Type) { * * @param int $ID * @param string $Type 'discussion', 'activity', or 'comment' - * @param bool $Echo Should it be echoed? - * @return mixed String if $Echo is false, TRUE otherwise + * @return string Rendered list of existing reactions */ - function RenderReactionRecord($ID, $Type, $Echo = TRUE) { + function RenderReactionRecord($ID, $Type) { $Reactions = Yaga::ReactionModel()->GetRecord($ID, $Type); $Limit = C('Yaga.Reactions.RecordLimit'); $ReactionCount = count($Reactions); $RecordsString = ''; - $i = 0; - foreach($Reactions as $Reaction) { - $i++; - + + foreach($Reactions as $i => $Reaction) { // Limit the record if there are a lot of reactions if($i <= $Limit || $Limit <= 0) { $User = Gdn::UserModel()->GetID($Reaction->UserID); - $DateTitle = sprintf( - T('Yaga.Reactions.RecordFormat'), - $User->Name, - $Reaction->Name, - Gdn_Format::Date($Reaction->DateInserted, '%B %e, %Y') - ); + $DateTitle = sprintf(T('Yaga.Reactions.RecordFormat'), $User->Name, $Reaction->Name, Gdn_Format::Date($Reaction->DateInserted, '%B %e, %Y')); $String = UserPhoto($User, array('Size' => 'Small', 'title' => $DateTitle)); $String .= ''; - $Wrapttributes = array( - 'class' => 'UserReactionWrap', - 'data-userid' => $User->UserID, - 'title' => $DateTitle - ); + $Wrapttributes = array('class' => 'UserReactionWrap', 'data-userid' => $User->UserID, 'title' => $DateTitle); $RecordsString .= Wrap($String, 'span', $Wrapttributes); } - + // Display the 'and x more' message if there is a limit if($Limit > 0 && $i >= $ReactionCount && $ReactionCount > $Limit) { $RecordsString .= Plural($ReactionCount - $Limit, 'Yaga.Reactions.RecordLimit.Single', 'Yaga.Reactions.RecordLimit.Plural'); } } - $AllRecordsString = Wrap($RecordsString, 'div', array('class' => 'ReactionRecord')); - - if($Echo) { - echo $AllRecordsString; - return true; - } - else { - return $AllRecordsString; - } + return Wrap($RecordsString, 'div', array('class' => 'ReactionRecord')); } } diff --git a/settings/class.hooks.php b/settings/class.hooks.php index d001f1207..c005586ad 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -360,7 +360,7 @@ public function DiscussionController_AfterDiscussionBody_Handler($Sender) { } $Type = 'discussion'; $ID = $Sender->DiscussionID; - RenderReactionRecord($ID, $Type); + echo RenderReactionRecord($ID, $Type); } /** @@ -373,7 +373,7 @@ public function DiscussionController_AfterCommentBody_Handler($Sender) { } $Type = 'comment'; $ID = $Sender->EventArguments['Comment']->CommentID; - RenderReactionRecord($ID, $Type); + echo RenderReactionRecord($ID, $Type); } /** diff --git a/views/best/index.php b/views/best/index.php index aef7210a3..e5ff417e1 100644 --- a/views/best/index.php +++ b/views/best/index.php @@ -58,7 +58,7 @@ CheckPermission('Yaga.Reactions.View')) { - RenderReactionRecord($ContentID, strtolower($ContentType)); + echo RenderReactionRecord($ContentID, strtolower($ContentType)); } ?> diff --git a/views/profile/best.php b/views/profile/best.php index 209b5943c..ff2570da3 100644 --- a/views/profile/best.php +++ b/views/profile/best.php @@ -58,7 +58,7 @@ CheckPermission('Yaga.Reactions.View')) { - RenderReactionRecord($ContentID, strtolower($ContentType)); + echo RenderReactionRecord($ContentID, strtolower($ContentType)); } ?> diff --git a/views/profile/reactions.php b/views/profile/reactions.php index 209b5943c..ff2570da3 100644 --- a/views/profile/reactions.php +++ b/views/profile/reactions.php @@ -58,7 +58,7 @@ CheckPermission('Yaga.Reactions.View')) { - RenderReactionRecord($ContentID, strtolower($ContentType)); + echo RenderReactionRecord($ContentID, strtolower($ContentType)); } ?> From e2cab917674d7df93fb443d78833bef306b63037 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 12 Jan 2015 09:20:39 -0600 Subject: [PATCH 016/111] Removed `GetNewestAction` method on the ActionModel. Closes #57 --- controllers/class.actioncontroller.php | 17 ++++++----------- models/class.actionmodel.php | 15 --------------- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/controllers/class.actioncontroller.php b/controllers/class.actioncontroller.php index cd21a8da3..c1adbc230 100644 --- a/controllers/class.actioncontroller.php +++ b/controllers/class.actioncontroller.php @@ -89,22 +89,17 @@ public function Edit($ActionID = NULL) { } } else { - if($this->Form->Save()) { - if($Edit) { - $Action = $this->ActionModel->GetByID($this->Form->GetFormValue('ActionID')); - } - else { - $Action = $this->ActionModel->GetNewestAction(); - } - - $NewActionRow = ActionRow($Action); + $NewID = $this->Form->Save(); + if($NewID) { + $Action = $this->ActionModel->GetByID($NewID); + $ActionRow = ActionRow($Action); if($Edit) { - $this->JsonTarget('#ActionID_' . $this->Action->ActionID, $NewActionRow, 'ReplaceWith'); + $this->JsonTarget('#ActionID_' . $this->Action->ActionID, $ActionRow, 'ReplaceWith'); $this->InformMessage(T('Yaga.ActionUpdated')); } else { - $this->JsonTarget('#Actions', $NewActionRow, 'Append'); + $this->JsonTarget('#Actions', $ActionRow, 'Append'); $this->InformMessage(T('Yaga.Action.Added')); } } diff --git a/models/class.actionmodel.php b/models/class.actionmodel.php index 8e674a6f9..2c58309d4 100644 --- a/models/class.actionmodel.php +++ b/models/class.actionmodel.php @@ -58,21 +58,6 @@ public function GetByID($ActionID) { return $Action; } - /** - * Gets the last inserted Action - * - * @return DataSet - */ - public function GetNewestAction() { - $Action = $this->SQL - ->Select() - ->From('Action') - ->OrderBy('ActionID', 'desc') - ->Get() - ->FirstRow(); - return $Action; - } - /** * Determine if a specified action exists * From 754b30774b07c662695b619529cc5773ff14acb6 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 12 Jan 2015 10:49:47 -0600 Subject: [PATCH 017/111] Refactor LeaderBoardModule to work with `{module}` Smarty tag. Closes #52 --- controllers/class.badgescontroller.php | 2 +- modules/class.leaderboardmodule.php | 77 +++++++++++++------------- settings/class.hooks.php | 2 +- 3 files changed, 42 insertions(+), 39 deletions(-) diff --git a/controllers/class.badgescontroller.php b/controllers/class.badgescontroller.php index 7a108e6ea..dcaa8cdaf 100644 --- a/controllers/class.badgescontroller.php +++ b/controllers/class.badgescontroller.php @@ -32,7 +32,7 @@ public function Initialize() { $this->AddCssFile('badges.css'); $this->AddModule('BadgesModule'); $Module = new LeaderBoardModule(); - $Module->GetData('w'); + $Module->SlotType = 'w'; $this->AddModule($Module); $Module = new LeaderBoardModule(); $this->AddModule($Module); diff --git a/modules/class.leaderboardmodule.php b/modules/class.leaderboardmodule.php index 237bf3955..7f665805d 100755 --- a/modules/class.leaderboardmodule.php +++ b/modules/class.leaderboardmodule.php @@ -14,16 +14,22 @@ class LeaderBoardModule extends Gdn_Module { * * @var string */ - protected $Title = FALSE; - + public $Title = FALSE; /** - * Don't do anything special on construct. + * Holds the slot type of the module. * - * @param string $Sender + * @var string Valid options are 'a': All Time, 'w': Weekly, 'm': + * Monthly, 'y': Yearly + */ + public $SlotType = 'a'; + + + /** + * Set the application folder on construct. */ public function __construct($Sender = '') { - parent::__construct($Sender); + parent::__construct($Sender, 'yaga'); } /** @@ -34,21 +40,41 @@ public function __construct($Sender = '') { public function AssetTarget() { return 'Panel'; } - + /** - * Load up the leaderboard module data based on a specific time slot + * Set the slot type of the leaderboard. Defaults to 'a' for all time. * * @param string $SlotType Valid options are 'a': All Time, 'w': Weekly, 'm': * Monthly, 'y': Yearly */ - public function GetData($SlotType = 'a') { + public function GetData() { + switch(strtolower($this->SlotType)) { + case 'w': + $this->Title = T('Yaga.LeaderBoard.Week'); + $slot = 'w'; + break; + case 'm': + $this->Title = T('Yaga.LeaderBoard.Month'); + $slot = 'm'; + break; + case 'y': + $this->Title = T('Yaga.LeaderBoard.Year'); + $slot = 'y'; + break; + default: + case 'a': + $this->Title = T('Yaga.LeaderBoard.AllTime'); + $slot = 'a'; + break; + } + // Get the leaderboard data $Leaders = Gdn::SQL() ->Select('up.Points as YagaPoints, u.*') ->From('User u') ->Join('UserPoints up', 'u.UserID = up.UserID') - ->Where('up.SlotType', $SlotType) - ->Where('up.TimeSlot', gmdate('Y-m-d', Gdn_Statistics::TimeSlotStamp($SlotType))) + ->Where('up.SlotType', $slot) + ->Where('up.TimeSlot', gmdate('Y-m-d', Gdn_Statistics::TimeSlotStamp($slot))) ->Where('up.Source', 'Total') ->OrderBy('up.Points', 'desc') ->Limit(C('Yaga.LeaderBoard.Limit', 10), 0) @@ -56,21 +82,6 @@ public function GetData($SlotType = 'a') { ->Result(); $this->Data = $Leaders; - switch($SlotType) { - case 'a': - $this->Title = T('Yaga.LeaderBoard.AllTime'); - break; - case 'w': - $this->Title = T('Yaga.LeaderBoard.Week'); - break; - case 'm': - $this->Title = T('Yaga.LeaderBoard.Month'); - break; - case 'y': - $this->Title = T('Yaga.LeaderBoard.Year'); - break; - } - } /** @@ -79,18 +90,10 @@ public function GetData($SlotType = 'a') { * @return string */ public function ToString() { - if(!$this->Data && !$this->Title) { - $this->GetData(); - } - - if($this->Visible && count($this->Data)) { - $ViewPath = $this->FetchViewLocation('leaderboard', 'yaga'); - $String = ''; - ob_start(); - include ($ViewPath); - $String = ob_get_contents(); - @ob_end_clean(); - return $String; + $this->GetData(); + + if(count($this->Data)) { + return parent::ToString(); } return ''; } diff --git a/settings/class.hooks.php b/settings/class.hooks.php index c005586ad..1093b3053 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -569,7 +569,7 @@ public function ActivityController_Render_Before($Sender) { if(C('Yaga.LeaderBoard.Enabled', FALSE)) { // add leaderboard modules to the activity page $Module = new LeaderBoardModule(); - $Module->GetData('w'); + $Module->SlotType = 'w'; $Sender->AddModule($Module); $Module = new LeaderBoardModule(); $Sender->AddModule($Module); From 148d6717396bc0af5d779a460e77ecde7435db46 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 12 Jan 2015 11:37:50 -0600 Subject: [PATCH 018/111] Badges are sortable in the backend. --- controllers/class.badgecontroller.php | 23 +++++++++++++++++++++++ js/admin.badges.js | 26 ++++++++++++++++++++++++++ models/class.badgemodel.php | 22 +++++++++++++++++++--- settings/structure.php | 1 + views/badge/settings.php | 2 +- 5 files changed, 70 insertions(+), 4 deletions(-) diff --git a/controllers/class.badgecontroller.php b/controllers/class.badgecontroller.php index d6aabb68e..38360e74b 100644 --- a/controllers/class.badgecontroller.php +++ b/controllers/class.badgecontroller.php @@ -28,6 +28,7 @@ public function Initialize() { if($this->Menu) { $this->Menu->HighlightRoute('/badge'); } + $this->AddJsFile('jquery-ui-1.10.0.custom.min.js'); $this->AddJsFile('admin.badges.js'); $this->AddCssFile('badges.css'); } @@ -307,4 +308,26 @@ public function Award($UserID) { $this->Render(); } + /** + * This takes in a sort array and updates the badge sort order. + * + * Renders the Save tree and/or the Result of the sort update. + */ + public function Sort() { + // Check permission + $this->Permission('Yaga.Badges.Manage'); + + $Request = Gdn::Request(); + if($Request->IsPostBack()) { + $SortArray = $Request->GetValue('SortArray', NULL); + $Saves = $this->BadgeModel->SaveSort($SortArray); + $this->SetData('Result', TRUE); + $this->SetData('Saves', $Saves); + } + else { + $this->SetData('Result', FALSE); + } + + $this->RenderData(); + } } diff --git a/js/admin.badges.js b/js/admin.badges.js index b1486ba24..719ba6e3a 100644 --- a/js/admin.badges.js +++ b/js/admin.badges.js @@ -19,6 +19,32 @@ var Cache = { }; jQuery(document).ready(function($) { + + $('#Badges').sortable({ + axis: 'y', + containment: 'parent', + cursor: 'move', + cursorAt: {left: '10px'}, + forcePlaceholderSize: true, + items: 'tr', + placeholder: 'Placeholder', + opacity: .6, + tolerance: 'pointer', + update: function() { + $.post( + gdn.url('badge/sort.json'), + { + 'SortArray': $('table.Sortable').sortable('toArray'), + 'TransientKey': gdn.definition('TransientKey') + }, + function(response) { + if (!response || !response.Result) { + alert("Oops - Didn't save order properly"); + } + } + ); + } + }); // Store the current inputs in the form $(document).on('blur', '#Rule-Criteria input', function() { diff --git a/models/class.badgemodel.php b/models/class.badgemodel.php index 4f1bec53c..a6f22b0f6 100644 --- a/models/class.badgemodel.php +++ b/models/class.badgemodel.php @@ -35,7 +35,7 @@ public function Get() { self::$_Badges = $this->SQL ->Select() ->From('Badge') - ->OrderBy('BadgeID') + ->OrderBy('Sort') ->Get() ->Result(); } @@ -53,7 +53,7 @@ public function GetLimit($Limit = FALSE, $Offset = FALSE) { return $this->SQL ->Select() ->From('Badge') - ->OrderBy('BadgeID') + ->OrderBy('Sort') ->Limit($Limit, $Offset) ->Get() ->Result(); @@ -159,9 +159,25 @@ public function GetWithEarned($UserID) { . 'ui.Name AS InsertUserName ' . "from {$Px}Badge as b " . "left join {$Px}BadgeAward as ba ON b.BadgeID = ba.BadgeID and ba.UserID = :UserID " - . "left join {$Px}User as ui on ba.InsertUserID = ui.UserID"; + . "left join {$Px}User as ui on ba.InsertUserID = ui.UserID " + . 'order by b.Sort'; return $this->Database->Query($Sql, array(':UserID' => $UserID))->Result(); } + + /** + * Updates the sort field for each badge in the sort array + * + * @param array $SortArray + * @return boolean + */ + public function SaveSort($SortArray) { + foreach($SortArray as $Index => $Badge) { + // remove the 'BadgeID_' prefix + $BadgeID = substr($Badge, 8); + $this->SetField($BadgeID, 'Sort', $Index); + } + return TRUE; + } } diff --git a/settings/structure.php b/settings/structure.php index 2ff4136b8..3b0472f48 100755 --- a/settings/structure.php +++ b/settings/structure.php @@ -46,6 +46,7 @@ ->Column('RuleCriteria', 'text', TRUE) ->Column('AwardValue', 'int', 0) ->Column('Enabled', 'tinyint(1)', '1') + ->Column('Sort', 'int', TRUE) ->Set($Explicit, $Drop); // Tracks the actual awarding of badges diff --git a/views/badge/settings.php b/views/badge/settings.php index 13ebdac72..d025c83cf 100644 --- a/views/badge/settings.php +++ b/views/badge/settings.php @@ -9,7 +9,7 @@ echo Wrap(Anchor(T('Yaga.Badge.Add'), 'badge/add', array('class' => 'SmallButton')), 'div', array('class' => 'Wrap')); ?> - +
From e1c7d2d9962eddba37aea9521a450f0b640329ef Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 12 Jan 2015 11:49:33 -0600 Subject: [PATCH 019/111] Make the backend sorting look a little better. --- js/admin.badges.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/js/admin.badges.js b/js/admin.badges.js index 719ba6e3a..7afabddea 100644 --- a/js/admin.badges.js +++ b/js/admin.badges.js @@ -31,6 +31,10 @@ jQuery(document).ready(function($) { opacity: .6, tolerance: 'pointer', update: function() { + // Update the alt classes + $('#Badges tbody tr:nth-child(odd)').removeClass('Alt'); + $('#Badges tbody tr:nth-child(even)').addClass('Alt'); + $.post( gdn.url('badge/sort.json'), { @@ -43,6 +47,13 @@ jQuery(document).ready(function($) { } } ); + }, + helper: function(e, ui) { + // Preserve width of row + ui.children().each(function() { + $(this).width($(this).width()); + }); + return ui; } }); From 2879af0db1c566d7db76ceabb8a5b9faa451d63b Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 12 Jan 2015 14:10:51 -0600 Subject: [PATCH 020/111] Add badge and rank menu links Closes #47 --- controllers/class.yagacontroller.php | 4 ++++ locale/en-CA/definitions.php | 1 + settings/class.hooks.php | 14 ++++++++++++++ 3 files changed, 19 insertions(+) diff --git a/controllers/class.yagacontroller.php b/controllers/class.yagacontroller.php index 620f7a09e..8ead4ea23 100644 --- a/controllers/class.yagacontroller.php +++ b/controllers/class.yagacontroller.php @@ -63,6 +63,10 @@ public function Settings() { 'LabelCode' => 'Yaga.Ranks.Use', 'Control' => 'Checkbox' ), + 'Yaga.MenuLinks.Show' => array( + 'LabelCode' => 'Yaga.MenuLinks.Show', + 'Control' => 'Checkbox' + ), 'Yaga.LeaderBoard.Enabled' => array( 'LabelCode' => 'Yaga.LeaderBoard.Use', 'Control' => 'Checkbox' diff --git a/locale/en-CA/definitions.php b/locale/en-CA/definitions.php index 99734b311..836a391ef 100755 --- a/locale/en-CA/definitions.php +++ b/locale/en-CA/definitions.php @@ -26,6 +26,7 @@ $Definition['Weeks'] = 'Weeks'; $Definition['Yaga.Settings'] = 'Yaga Settings'; $Definition['Years'] = 'Years'; +$Definition['Yaga.MenuLinks.Show'] = 'Show links in the main menu that describe your Yaga configuration'; // Actions $Definition['Yaga.Action'] = 'Action'; diff --git a/settings/class.hooks.php b/settings/class.hooks.php index 1093b3053..3973538da 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -702,6 +702,20 @@ public function Base_Render_Before($Sender) { if($Sender->MasterView == 'admin') { $Sender->AddCssFile('yaga.css', 'yaga'); } + else { + if(Gdn::Session()->IsValid() && is_object($Sender->Menu) && C('Yaga.MenuLinks.Show')) { + $this->AddMenuLinks($Sender->Menu); + } + } + } + + protected function AddMenuLinks($Menu) { + if(C('Yaga.Badges.Enabled')) { + $Menu->AddLink('Yaga', T('Badges'), 'yaga/badges'); + } + if(C('Yaga.Ranks.Enabled')) { + $Menu->AddLink('Yaga', T('Ranks'), 'yaga/ranks'); + } } /** From 5d04be67c19b2309070f99bd4787ef879add465f Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 12 Jan 2015 14:19:19 -0600 Subject: [PATCH 021/111] Explicitly render settings view. --- controllers/class.yagacontroller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/class.yagacontroller.php b/controllers/class.yagacontroller.php index 8ead4ea23..6c7512630 100644 --- a/controllers/class.yagacontroller.php +++ b/controllers/class.yagacontroller.php @@ -82,7 +82,7 @@ public function Settings() { )); $this->ConfigurationModule = $ConfigModule; - $this->Render(); + $this->Render('settings'); } /** From 538da0c881b71fb0b60d02452ae2ffd9b91d0069 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 12 Jan 2015 15:09:41 -0600 Subject: [PATCH 022/111] Move frontend badge pages to `/yaga/badges` --- controllers/class.badgescontroller.php | 93 ------------------- controllers/class.yagacontroller.php | 55 +++++++++++ .../detail.php => yaga/badgedetail.php} | 0 views/{badges/all.php => yaga/badges.php} | 2 +- 4 files changed, 56 insertions(+), 94 deletions(-) delete mode 100644 controllers/class.badgescontroller.php rename views/{badges/detail.php => yaga/badgedetail.php} (100%) rename views/{badges/all.php => yaga/badges.php} (88%) diff --git a/controllers/class.badgescontroller.php b/controllers/class.badgescontroller.php deleted file mode 100644 index dcaa8cdaf..000000000 --- a/controllers/class.badgescontroller.php +++ /dev/null @@ -1,93 +0,0 @@ -ObjectName - */ - public $Uses = array('BadgeModel', 'BadgeAwardModel'); - - /** - * This sets the badges controller up to look like a front end page. It also - * adds some leader board modules. - */ - public function Initialize() { - parent::Initialize(); - $this->Application = 'Yaga'; - $this->Head = new HeadModule($this); - $this->AddJsFile('jquery.js'); - $this->AddJsFile('jquery-ui.js'); - $this->AddJsFile('jquery.livequery.js'); - $this->AddJsFile('jquery.popup.js'); - $this->AddJsFile('global.js'); - $this->AddCssFile('style.css'); - $this->AddCssFile('badges.css'); - $this->AddModule('BadgesModule'); - $Module = new LeaderBoardModule(); - $Module->SlotType = 'w'; - $this->AddModule($Module); - $Module = new LeaderBoardModule(); - $this->AddModule($Module); - } - - /** - * Render a blank page if no methods were specified in dispatch - */ - public function Index() { - //$this->Render('Blank', 'Utility', 'Dashboard'); - $this->All(); - } - - /** - * This renders out the full list of badges - */ - public function All() { - $this->Title(T('Yaga.Badges.All')); - - $UserID = Gdn::Session()->UserID; - - // Get list of badges from the model and pass to the view - $AllBadges = $this->BadgeModel->GetWithEarned($UserID); - - $this->SetData('Badges', $AllBadges); - //$this->SetData('Earned') - - $this->Render('all'); - } - - /** - * Show some facets about a specific badge - * - * @param int $BadgeID - * @param string $Slug - * @throws NotFoundException - */ - public function Detail($BadgeID, $Slug = NULL) { - $UserID = Gdn::Session()->UserID; - $Badge = $this->BadgeModel->GetByID($BadgeID); - $AwardCount = $this->BadgeAwardModel->GetCount($BadgeID); - $UserBadgeAward = $this->BadgeAwardModel->Exists($UserID, $BadgeID); - $RecentAwards = $this->BadgeAwardModel->GetRecent($BadgeID); - - if(!$Badge) { - throw NotFoundException('Badge'); - } - - $this->SetData('AwardCount', $AwardCount); - $this->SetData('RecentAwards', $RecentAwards); - $this->SetData('UserBadgeAward', $UserBadgeAward); - $this->SetData('Badge', $Badge); - - $this->Title(T('Yaga.Badge.View') . $Badge->Name); - - $this->Render(); - } -} diff --git a/controllers/class.yagacontroller.php b/controllers/class.yagacontroller.php index 6c7512630..0f7de5c36 100644 --- a/controllers/class.yagacontroller.php +++ b/controllers/class.yagacontroller.php @@ -84,6 +84,61 @@ public function Settings() { $this->Render('settings'); } + + private function FrontendStyle() { + $this->RemoveCssFile('admin.css'); + unset($this->Assets['Panel']['SideMenuModule']); + $this->AddCssFile('style.css'); + $this->MasterView = 'default'; + + $Module = new LeaderBoardModule(); + $Module->SlotType = 'w'; + $this->AddModule($Module); + $Module = new LeaderBoardModule(); + $this->AddModule($Module); + } + + public function Badges($BadgeID = FALSE, $Slug = NULL) { + $this->FrontendStyle(); + $this->AddModule('BadgesModule'); + + if(is_numeric($BadgeID)) { + return $this->BadgeDetail($BadgeID, $Slug); + } + + $this->Title(T('Yaga.Badges.All')); + + // Get list of badges from the model and pass to the view + $UserID = Gdn::Session()->UserID; + $AllBadges = Yaga::BadgeModel()->GetWithEarned($UserID); + $this->SetData('Badges', $AllBadges); + + $this->Render('badges'); + } + + public function BadgeDetail($BadgeID, $Slug = NULL) { + $Badge = Yaga::BadgeModel()->GetByID($BadgeID); + + if(!$Badge) { + throw NotFoundException('Badge'); + } + + $UserID = Gdn::Session()->UserID; + $BadgeAwardModel = Yaga::BadgeAwardModel(); + $AwardCount = $BadgeAwardModel->GetCount($BadgeID); + $UserBadgeAward = $BadgeAwardModel->Exists($UserID, $BadgeID); + $RecentAwards = $BadgeAwardModel->GetRecent($BadgeID); + + + $this->SetData('AwardCount', $AwardCount); + $this->SetData('RecentAwards', $RecentAwards); + $this->SetData('UserBadgeAward', $UserBadgeAward); + $this->SetData('Badge', $Badge); + + $this->Title(T('Yaga.Badge.View') . $Badge->Name); + + $this->Render('badgedetail'); + } /** * Import a Yaga transport file diff --git a/views/badges/detail.php b/views/yaga/badgedetail.php similarity index 100% rename from views/badges/detail.php rename to views/yaga/badgedetail.php diff --git a/views/badges/all.php b/views/yaga/badges.php similarity index 88% rename from views/badges/all.php rename to views/yaga/badges.php index 1f0d54e76..185b014d0 100644 --- a/views/badges/all.php +++ b/views/yaga/badges.php @@ -29,7 +29,7 @@ $Row .= Wrap( Wrap( - Anchor($Badge->Name, 'badges/detail/' . $Badge->BadgeID . '/' . Gdn_Format::Url($Badge->Name), array('class' => 'Title')), 'div', array('class' => 'Title') + Anchor($Badge->Name, 'yaga/badges/' . $Badge->BadgeID . '/' . Gdn_Format::Url($Badge->Name), array('class' => 'Title')), 'div', array('class' => 'Title') ) . Wrap( Wrap($Badge->Description, 'span', array('class' => 'MItem BadgeDescription')) . From e33545431469a40320eda38855cc6adc1dcfbb3b Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 12 Jan 2015 15:51:56 -0600 Subject: [PATCH 023/111] Add missing css file to yagacontroller::badges --- controllers/class.yagacontroller.php | 1 + 1 file changed, 1 insertion(+) diff --git a/controllers/class.yagacontroller.php b/controllers/class.yagacontroller.php index 0f7de5c36..c3a58e47a 100644 --- a/controllers/class.yagacontroller.php +++ b/controllers/class.yagacontroller.php @@ -100,6 +100,7 @@ private function FrontendStyle() { public function Badges($BadgeID = FALSE, $Slug = NULL) { $this->FrontendStyle(); + $this->AddCssFile('badges.css'); $this->AddModule('BadgesModule'); if(is_numeric($BadgeID)) { From 94c05f35c3bc83d3b7df1baad6714e3718236a76 Mon Sep 17 00:00:00 2001 From: bleistivt Date: Tue, 13 Jan 2015 07:42:24 +0100 Subject: [PATCH 024/111] Add CSS class to profile tab --- settings/class.hooks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/class.hooks.php b/settings/class.hooks.php index c9dcfc9ab..53e2451e3 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -254,7 +254,7 @@ public function ProfileController_Best_Create($Sender, $UserReference = '', $Use */ public function ProfileController_AddProfileTabs_Handler($Sender) { if(is_object($Sender->User) && $Sender->User->UserID > 0) { - $Sender->AddProfileTab(Sprite('SpBestOf') . ' ' . T('Yaga.BestContent'), 'profile/best/' . $Sender->User->UserID . '/' . urlencode($Sender->User->Name)); + $Sender->AddProfileTab(Sprite('SpBestOf') . ' ' . T('Yaga.BestContent'), 'profile/best/' . $Sender->User->UserID . '/' . urlencode($Sender->User->Name), 'Best'); } } From feb685d953db3665f8198837fb11387491f80d4c Mon Sep 17 00:00:00 2001 From: bleistivt Date: Wed, 14 Jan 2015 01:22:26 +0100 Subject: [PATCH 025/111] change badges/detail/ link to yaga/badges to conform with 538da0c881b71fb0b60d02452ae2ffd9b91d0069 --- views/modules/badges.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/modules/badges.php b/views/modules/badges.php index b44ecdcfe..d3ca6bc72 100644 --- a/views/modules/badges.php +++ b/views/modules/badges.php @@ -10,7 +10,7 @@ $Badge['Photo'], array('class' => 'ProfilePhoto ProfilePhotoSmall') ), - 'badges/detail/' . $Badge['BadgeID'] . '/' . Gdn_Format::Url($Badge['Name']), + 'yaga/badges/' . $Badge['BadgeID'] . '/' . Gdn_Format::Url($Badge['Name']), array('title' => $Badge['Name']) ); } From 33425588045fc88c56513f988f9b8f3f12b43ef9 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 14 Jan 2015 14:41:22 -0600 Subject: [PATCH 026/111] Add frontend ranks page --- controllers/class.yagacontroller.php | 11 +++++ design/ranks.css | 13 +++++ locale/en-CA/definitions.php | 10 ++++ views/yaga/ranks.php | 73 ++++++++++++++++++++++++++++ 4 files changed, 107 insertions(+) create mode 100644 design/ranks.css create mode 100644 views/yaga/ranks.php diff --git a/controllers/class.yagacontroller.php b/controllers/class.yagacontroller.php index c3a58e47a..a98acf262 100644 --- a/controllers/class.yagacontroller.php +++ b/controllers/class.yagacontroller.php @@ -98,6 +98,17 @@ private function FrontendStyle() { $this->AddModule($Module); } + public function Ranks() { + $this->FrontendStyle(); + $this->AddCssFile('ranks.css'); + $this->Title(T('Yaga.Ranks.All')); + + // Get list of ranks from the model and pass to the view + $this->SetData('Ranks', Yaga::RankModel()->Get()); + + $this->Render('ranks'); + } + public function Badges($BadgeID = FALSE, $Slug = NULL) { $this->FrontendStyle(); $this->AddCssFile('badges.css'); diff --git a/design/ranks.css b/design/ranks.css new file mode 100644 index 000000000..c2543501e --- /dev/null +++ b/design/ranks.css @@ -0,0 +1,13 @@ +/* Copyright 2015 Zachary Doll */ +.ItemRank .RankPhoto { + float: left; + width: 40px; + height: 40px; +} +.ItemRank .ItemContent { + padding-left: 55px; + min-height: 40px; +} +.ItemRank .Meta { + line-height: 1.3; +} \ No newline at end of file diff --git a/locale/en-CA/definitions.php b/locale/en-CA/definitions.php index 836a391ef..e5bac4cc8 100755 --- a/locale/en-CA/definitions.php +++ b/locale/en-CA/definitions.php @@ -141,6 +141,7 @@ $Definition['Yaga.Rank.Updated'] = 'Rank updated successfully!'; $Definition['Yaga.Ranks'] = 'Ranks'; $Definition['Yaga.Ranks.AgeReq'] = 'Age Required'; +$Definition['Yaga.Ranks.All'] = 'All Ranks'; $Definition['Yaga.Ranks.Desc'] = "Ranks are awarded to users based on their account age, accumulated points, and total posts. Ranks have associated perks that can be used to alter the user's experience."; $Definition['Yaga.Ranks.Manage'] = 'Manage Ranks'; $Definition['Yaga.Ranks.Notify'] = 'Notify me when I am promoted in rank.'; @@ -150,6 +151,15 @@ $Definition['Yaga.Ranks.RequiredAgeFormat'] = 'Account must be at least %s old.'; $Definition['Yaga.Ranks.Settings.Desc'] = 'You can manage the available ranks here. Disabled ranks will not be awarded automatically. Drag items to sort the promotion order.'; $Definition['Yaga.Ranks.Use'] = 'Use Ranks'; +$Definition['Yaga.Ranks.Story.Manual'] = 'This rank is given out manually'; +$Definition['Yaga.Ranks.Story.Auto'] = 'This rank will be automatically awarded'; +$Definition['Yaga.Ranks.Story.PostReq'] = 'has %s posts'; +$Definition['Yaga.Ranks.Story.PostAndPointReq'] = '%s points'; +$Definition['Yaga.Ranks.Story.PointReq'] = 'has %s points'; +$Definition['Yaga.Ranks.Story.AgeReq'] = 'is at least %s old'; +$Definition['Yaga.Ranks.Story.3Reqs'] = 'This rank will be awarded once your account %s, %s, and %s'; +$Definition['Yaga.Ranks.Story.2Reqs'] = 'This rank will be awarded once your account %s and %s'; +$Definition['Yaga.Ranks.Story.1Reqs'] = 'This rank will be awarded once your account %s'; // Rules $Definition['Yaga.Rules.AwardCombo'] = 'Award Combo'; diff --git a/views/yaga/ranks.php b/views/yaga/ranks.php new file mode 100644 index 000000000..4644c34a2 --- /dev/null +++ b/views/yaga/ranks.php @@ -0,0 +1,73 @@ +Title(), 'h1'); +$User = (Gdn::Session()->User) ?: (object)array('RankID' => 0); +echo '
    '; +foreach($this->Data('Ranks') as $Rank) { + $Row = ''; + + // Construct the description of requirements only if it has auto enabled + // TODO: Move this to a helper_functions file + $MetaString = T('Yaga.Ranks.Story.Manual'); + if($Rank->Enabled) { + $Reqs = array(); + $Posts = FALSE; + if($Rank->PostReq > 0) { + $Reqs[] = sprintf(T('Yaga.Ranks.Story.PostReq'), $Rank->PostReq); + $Posts = TRUE; + } + if($Rank->PointReq > 0) { + if($Posts) { + $Reqs[] = sprintf(T('Yaga.Ranks.Story.PostAndPointReq'), $Rank->PointReq); + } + else { + $Reqs[] = sprintf(T('Yaga.Ranks.Story.PointReq'), $Rank->PointReq); + } + } + if($Rank->AgeReq > 0) { + $Reqs[] = sprintf(T('Yaga.Ranks.Story.AgeReq'), Gdn_Format::Seconds($Rank->AgeReq)); + } + + switch(count($Reqs)) { + case 3: + $MetaString = sprintf(T('Yaga.Ranks.Story.3Reqs'), $Reqs[0], $Reqs[1], $Reqs[2]); + break; + case 2: + $MetaString = sprintf(T('Yaga.Ranks.Story.2Reqs'), $Reqs[0], $Reqs[1]); + break; + case 1: + $MetaString = sprintf(T('Yaga.Ranks.Story.1Reqs'), $Reqs[0]); + break; + default: + case 0: + $MetaString = T('Yaga.Ranks.Story.Auto'); + break; + } + } + + $ReadClass = ($User->RankID == $Rank->RankID) ? ' ' : ' Read'; + + // TODO: Add rank photos + //if($Rank->Photo) { + // $Row .= Img($Rank->Photo, array('class' => 'RankPhoto')); + //} + //else { + $Row .= Img('applications/yaga/design/images/default_promotion.png', array('class' => 'RankPhoto')); + //} + + $Row .= Wrap( + Wrap( + $Rank->Name, 'div', array('class' => 'Title') + ) . + Wrap($Rank->Description, 'div', array('class' => 'Description')) . + Wrap( + WrapIf($MetaString, 'span', array('class' => 'MItem RankRequirements')), + 'div', + array('class' => 'Meta')), + 'div', + array('class' => 'ItemContent Rank') + ); + echo Wrap($Row, 'li', array('class' => 'Item ItemRank' . $ReadClass)); +} + +echo '
'; \ No newline at end of file From 85ba364f79f0b6b252904c7674e163ed20e16053 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 14 Jan 2015 15:39:59 -0600 Subject: [PATCH 027/111] Change ActedModel::GetRecent() to order by reaction date. --- controllers/class.bestcontroller.php | 2 +- models/class.actedmodel.php | 30 ++++++++++++++++++---------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/controllers/class.bestcontroller.php b/controllers/class.bestcontroller.php index cbf255669..37f20ede5 100644 --- a/controllers/class.bestcontroller.php +++ b/controllers/class.bestcontroller.php @@ -49,7 +49,7 @@ public function Initialize() { public function Index($Page = 0) { list($Offset, $Limit) = $this->_TranslatePage($Page); $this->Title(T('Yaga.BestContent.Recent')); - $this->_Content = $this->ActedModel->GetRecent('week', $Limit, $Offset); + $this->_Content = $this->ActedModel->GetRecent($Limit, $Offset); $this->_BuildPager($Offset, $Limit, '/best/%1$s/'); $this->SetData('ActiveFilter', 'Recent'); $this->Render('index'); diff --git a/models/class.actedmodel.php b/models/class.actedmodel.php index 8328c2032..401ec6df4 100644 --- a/models/class.actedmodel.php +++ b/models/class.actedmodel.php @@ -250,30 +250,38 @@ public function GetBest($UserID = NULL, $Limit = NULL, $Offset = 0) { } /** - * Returns a list of all recent scored posts ordered by highest score + * Returns a list of all recent scored posts ordered by date reacted * - * @param string $Timespan strtotime compatible time * @param int $Limit * @param int $Offset * @return array */ - public function GetRecent($Timespan = 'week', $Limit = NULL, $Offset = 0) { - $CacheKey = "yaga.best.last.{$Timespan}"; + public function GetRecent($Limit = NULL, $Offset = 0) { + $CacheKey = 'yaga.best.recent'; $Content = Gdn::Cache()->Get($CacheKey); if($Content == Gdn_Cache::CACHEOP_FAILURE) { - $TargetDate = date('Y-m-d H:i:s', strtotime("1 {$Timespan} ago")); - $SQL = $this->_BaseSQL('Discussion'); - $Discussions = $SQL->Where('d.DateUpdated >', $TargetDate)->Get()->Result(DATASET_TYPE_ARRAY); - - $SQL = $this->_BaseSQL('Comment'); - $Comments = $SQL->Where('c.DateUpdated >', $TargetDate)->Get()->Result(DATASET_TYPE_ARRAY); + $Discussions = Gdn::SQL()->Select('d.*, r.DateInserted as ReactionDate') + ->From('Reaction r') + ->Where('ParentType', 'discussion') + ->Join('Discussion d', 'r.ParentID = d.DiscussionID') + ->OrderBy('r.DateInserted', 'DESC') + ->Get() + ->Result(DATASET_TYPE_ARRAY); + + $Comments = Gdn::SQL()->Select('c.*, r.DateInserted as ReactionDate') + ->From('Reaction r') + ->Where('ParentType', 'comment') + ->Join('Comment c', 'r.ParentID = c.CommentID') + ->OrderBy('r.DateInserted', 'DESC') + ->Get() + ->Result(DATASET_TYPE_ARRAY); $this->JoinCategory($Comments); // Interleave - $Content = $this->Union('Score', array( + $Content = $this->Union('ReactionDate', array( 'Discussion' => $Discussions, 'Comment' => $Comments )); From 91ba64f7a2df860e7c6fe339e7588dabd66c9ab8 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 14 Jan 2015 15:43:07 -0600 Subject: [PATCH 028/111] Remove `-` prefix from acted model --- models/class.actedmodel.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/models/class.actedmodel.php b/models/class.actedmodel.php index 401ec6df4..4a98f2645 100644 --- a/models/class.actedmodel.php +++ b/models/class.actedmodel.php @@ -23,7 +23,7 @@ class ActedModel extends Gdn_Model { * @param string $Table Discussion or Comment * @return Gdn_SQLDriver */ - private function _BaseSQL($Table = 'Discussion') { + private function BaseSQL($Table = 'Discussion') { switch($Table) { case 'Comment': $SQL = Gdn::SQL()->Select('c.*') @@ -59,7 +59,7 @@ public function Get($UserID, $ActionID, $Limit = NULL, $Offset = 0) { if($Content == Gdn_Cache::CACHEOP_FAILURE) { // Get matching Discussions - $Discussions = $this->_BaseSQL('Discussion') + $Discussions = $this->BaseSQL('Discussion') ->Join('Reaction r', 'd.DiscussionID = r.ParentID') ->Where('d.InsertUserID', $UserID) ->Where('r.ActionID', $ActionID) @@ -68,7 +68,7 @@ public function Get($UserID, $ActionID, $Limit = NULL, $Offset = 0) { ->Get()->Result(DATASET_TYPE_ARRAY); // Get matching Comments - $Comments = $this->_BaseSQL('Comment') + $Comments = $this->BaseSQL('Comment') ->Join('Reaction r', 'c.CommentID = r.ParentID') ->Where('c.InsertUserID', $UserID) ->Where('r.ActionID', $ActionID) @@ -114,7 +114,7 @@ public function GetTaken($UserID, $ActionID, $Limit = NULL, $Offset = 0) { if($Content == Gdn_Cache::CACHEOP_FAILURE) { // Get matching Discussions - $Discussions = $this->_BaseSQL('Discussion') + $Discussions = $this->BaseSQL('Discussion') ->Join('Reaction r', 'd.DiscussionID = r.ParentID') ->Where('r.InsertUserID', $UserID) ->Where('r.ActionID', $ActionID) @@ -123,7 +123,7 @@ public function GetTaken($UserID, $ActionID, $Limit = NULL, $Offset = 0) { ->Get()->Result(DATASET_TYPE_ARRAY); // Get matching Comments - $Comments = $this->_BaseSQL('Comment') + $Comments = $this->BaseSQL('Comment') ->Join('Reaction r', 'c.CommentID = r.ParentID') ->Where('r.InsertUserID', $UserID) ->Where('r.ActionID', $ActionID) @@ -168,7 +168,7 @@ public function GetAction($ActionID, $Limit = NULL, $Offset = 0) { if($Content == Gdn_Cache::CACHEOP_FAILURE) { // Get matching Discussions - $Discussions = $this->_BaseSQL('Discussion') + $Discussions = $this->BaseSQL('Discussion') ->Join('Reaction r', 'd.DiscussionID = r.ParentID') ->Where('r.ActionID', $ActionID) ->Where('r.ParentType', 'discussion') @@ -176,7 +176,7 @@ public function GetAction($ActionID, $Limit = NULL, $Offset = 0) { ->Get()->Result(DATASET_TYPE_ARRAY); // Get matching Comments - $Comments = $this->_BaseSQL('Comment') + $Comments = $this->BaseSQL('Comment') ->Join('Reaction r', 'c.CommentID = r.ParentID') ->Where('r.ActionID', $ActionID) ->Where('r.ParentType', 'comment') @@ -217,13 +217,13 @@ public function GetBest($UserID = NULL, $Limit = NULL, $Offset = 0) { $Content = Gdn::Cache()->Get($CacheKey); if($Content == Gdn_Cache::CACHEOP_FAILURE) { - $SQL = $this->_BaseSQL('Discussion'); + $SQL = $this->BaseSQL('Discussion'); if(!is_null($UserID)) { $SQL = $SQL->Where('d.InsertUserID', $UserID); } $Discussions = $SQL->Get()->Result(DATASET_TYPE_ARRAY); - $SQL = $this->_BaseSQL('Comment'); + $SQL = $this->BaseSQL('Comment'); if(!is_null($UserID)) { $SQL = $SQL->Where('c.InsertUserID', $UserID); } From 59df030e0a17a27798e377704bd262e4b1b281e7 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 14 Jan 2015 16:03:42 -0600 Subject: [PATCH 029/111] Make library render functions act consistently and be named consistently. Closes #60 --- controllers/class.actioncontroller.php | 2 +- library/functions.render.php | 22 ++++++++------ views/action/settings.php | 2 +- views/rank/edit.php | 42 ++++++++++++++++++-------- 4 files changed, 44 insertions(+), 24 deletions(-) diff --git a/controllers/class.actioncontroller.php b/controllers/class.actioncontroller.php index c1adbc230..970a5c92a 100644 --- a/controllers/class.actioncontroller.php +++ b/controllers/class.actioncontroller.php @@ -92,7 +92,7 @@ public function Edit($ActionID = NULL) { $NewID = $this->Form->Save(); if($NewID) { $Action = $this->ActionModel->GetByID($NewID); - $ActionRow = ActionRow($Action); + $ActionRow = RenderActionRow($Action); if($Edit) { $this->JsonTarget('#ActionID_' . $this->Action->ActionID, $ActionRow, 'ReplaceWith'); diff --git a/library/functions.render.php b/library/functions.render.php index 43c8c0a1d..d5b56dc76 100644 --- a/library/functions.render.php +++ b/library/functions.render.php @@ -75,7 +75,7 @@ function RenderReactionRecord($ID, $Type) { } -if(!function_exists('ActionRow')) { +if(!function_exists('RenderActionRow')) { /** * Renders an action row used to construct the action admin screen @@ -83,7 +83,7 @@ function RenderReactionRecord($ID, $Type) { * @param stdClass $Action * @return string */ - function ActionRow($Action) { + function RenderActionRow($Action) { return Wrap( Wrap( Anchor(T('Edit'), 'action/edit/' . $Action->ActionID, array('class' => 'Popup SmallButton')) . Anchor(T('Delete'), 'action/delete/' . $Action->ActionID, array('class' => 'Popup SmallButton')), 'div', array('class' => 'Tools')) . @@ -110,14 +110,15 @@ function ActionRow($Action) { function RenderPerkPermissionForm($Perm, $Label) { $Form = Gdn::Controller()->Form; $Fieldname = 'Perm' . $Perm; - echo '
  • '; - echo $Form->Label($Label, $Fieldname); - echo $Form->Dropdown($Fieldname, array( + + $String = $Form->Label($Label, $Fieldname); + $String .= $Form->Dropdown($Fieldname, array( '' => T('Default'), 'grant' => T('Grant'), 'revoke' => T('Revoke') )); - echo '
  • '; + + return $String; } } @@ -143,10 +144,11 @@ function RenderPerkConfigurationForm($Config, $Label, $Options = NULL) { $Options = $Options + array('' => T('Default')); $Form = Gdn::Controller()->Form; $Fieldname = 'Conf' . $Config; - echo '
  • '; - echo $Form->Label($Label, $Fieldname); - echo $Form->Dropdown($Fieldname, $Options); - echo '
  • '; + + $String = $Form->Label($Label, $Fieldname); + $String .= $Form->Dropdown($Fieldname, $Options); + + return $String; } } diff --git a/views/action/settings.php b/views/action/settings.php index a4d97d505..351caf0cd 100644 --- a/views/action/settings.php +++ b/views/action/settings.php @@ -10,7 +10,7 @@
      Data('Actions') as $Action) { - echo ActionRow($Action); + echo RenderActionRow($Action); } ?>
    diff --git a/views/rank/edit.php b/views/rank/edit.php index df811142e..36c20314c 100644 --- a/views/rank/edit.php +++ b/views/rank/edit.php @@ -59,8 +59,9 @@ echo $this->Form->Dropdown('Role', $this->Data('Roles'), array('IncludeNULL' => TRUE)); ?> +
  • T('Authors may never edit'), + echo RenderPerkConfigurationForm('Garden.EditContentTimeout', 'Yaga.Perks.EditTimeout', array('0' => T('Authors may never edit'), '350' => sprintf(T('Authors may edit for %s'), T('5 minutes')), '900' => sprintf(T('Authors may edit for %s'), T('15 minutes')), '3600' => sprintf(T('Authors may edit for %s'), T('1 hour')), @@ -69,17 +70,34 @@ '604800' => sprintf(T('Authors may edit for %s'), T('1 week')), '2592000' => sprintf(T('Authors may edit for %s'), T('1 month')), '-1' => T('Authors may always edit'))); - - RenderPerkPermissionForm('Garden.Curation.Manage', 'Yaga.Perks.Curation'); - - RenderPerkPermissionForm('Plugins.Signatures.Edit', 'Yaga.Perks.Signatures'); - - RenderPerkPermissionForm('Plugins.Tagging.Add', 'Yaga.Perks.Tags'); - - RenderPerkConfigurationForm('Plugins.Emotify.FormatEmoticons', 'Yaga.Perks.Emoticons'); - - RenderPerkConfigurationForm('Garden.Format.MeActions', 'Yaga.Perks.MeActions'); - + ?> +
  • +
  • + +
  • +
  • + +
  • +
  • + +
  • +
  • + +
  • +
  • + +
  • + FireEvent('PerkOptions'); // Restore the prefix From 0c7a3beff628bd12ff052416b41c5fad5ce71d03 Mon Sep 17 00:00:00 2001 From: bleistivt Date: Thu, 15 Jan 2015 12:52:21 +0100 Subject: [PATCH 030/111] Change Column PanelColumn to Box Badges --- views/modules/badges.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/modules/badges.php b/views/modules/badges.php index d3ca6bc72..fc6364ebc 100644 --- a/views/modules/badges.php +++ b/views/modules/badges.php @@ -1,7 +1,7 @@ '; +echo '
    '; echo '

    ' . $this->Title . '

    '; echo '
    '; foreach($this->Data as $Badge) { From e2fb4fe5c50d01d7f5284fd02564e1fc8099d278 Mon Sep 17 00:00:00 2001 From: bleistivt Date: Thu, 15 Jan 2015 18:20:50 +0100 Subject: [PATCH 031/111] Correct BadgeDetail links in some more places --- models/class.badgeawardmodel.php | 2 +- views/badge/settings.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/models/class.badgeawardmodel.php b/models/class.badgeawardmodel.php index 3d64d8e5a..7e24a7f0e 100644 --- a/models/class.badgeawardmodel.php +++ b/models/class.badgeawardmodel.php @@ -96,7 +96,7 @@ public function Award($BadgeID, $UserID, $InsertUserID = NULL, $Reason = '') { 'Photo' => $Badge->Photo, 'RecordType' => 'Badge', 'RecordID' => $BadgeID, - 'Route' => '/badges/detail/' . $Badge->BadgeID . '/' . Gdn_Format::Url($Badge->Name), + 'Route' => '/yaga/badges/' . $Badge->BadgeID . '/' . Gdn_Format::Url($Badge->Name), 'HeadlineFormat' => T('Yaga.Badge.EarnedHeadlineFormat'), 'Data' => array( 'Name' => $Badge->Name diff --git a/views/badge/settings.php b/views/badge/settings.php index d025c83cf..781d39b12 100644 --- a/views/badge/settings.php +++ b/views/badge/settings.php @@ -30,7 +30,7 @@ $BadgePhoto = Img($Badge->Photo, array('class' => 'BadgePhoto')); - $Row .= Wrap(Anchor($BadgePhoto, '/badges/detail/' . $Badge->BadgeID . '/' . Gdn_Format::Url($Badge->Name), array('title' => T('Yaga.Badge.DetailLink'))), 'td'); + $Row .= Wrap(Anchor($BadgePhoto, '/yaga/badges/' . $Badge->BadgeID . '/' . Gdn_Format::Url($Badge->Name), array('title' => T('Yaga.Badge.DetailLink'))), 'td'); $Row .= Wrap($Badge->Name, 'td'); $Row .= Wrap($Badge->Description, 'td'); $RuleName = T('Yaga.Rules.UnknownRule'); From 676b5692a77a0af9071fbb78f4024d7710d883ee Mon Sep 17 00:00:00 2001 From: bleistivt Date: Thu, 15 Jan 2015 19:16:43 +0100 Subject: [PATCH 032/111] Show MeMenu profile pic in full size Changing .ProfilePhotoMedium also changes the picture size in the MeMenu/MeBox. This restricts the rule to panel boxes and the main content column. --- design/badges.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/design/badges.css b/design/badges.css index e063ed043..669a9fc80 100644 --- a/design/badges.css +++ b/design/badges.css @@ -24,7 +24,8 @@ } /* Badge detail page */ -.ProfilePhotoMedium { +.Box .ProfilePhotoMedium, +.ContentColumn .ProfilePhotoMedium { height: 24px; margin-bottom: 3px; margin-right: 3px; From f4c67afe733117569cc97f2ca73ce95ed2e6eb59 Mon Sep 17 00:00:00 2001 From: bleistivt Date: Sun, 18 Jan 2015 21:03:22 +0100 Subject: [PATCH 033/111] Implement Reaction memory cache --- models/class.reactionmodel.php | 52 +++++++++++++++++++++++++++++++++- settings/class.hooks.php | 8 +++++- 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/models/class.reactionmodel.php b/models/class.reactionmodel.php index 8f24522fe..9143ddd49 100644 --- a/models/class.reactionmodel.php +++ b/models/class.reactionmodel.php @@ -35,6 +35,23 @@ public function __construct() { */ public function GetList($ID, $Type) { $Px = $this->Database->DatabasePrefix; + + // try getting the record count from the cache + if (array_key_exists($Type . $ID, self::$_Reactions)) { + $Reactions = self::$_Reactions[$Type . $ID]; + $Actions = Yaga::ActionModel()->Get(); + // add the count + foreach ($Actions as &$Action) { + $Action->Count = 0; + foreach ($Reactions as $Reaction) { + if ($Reaction->ActionID == $Action->ActionID) { + $Action->Count++; + } + } + } + return $Actions; + } + $Sql = "select a.*, " . "(select count(r.ReactionID) " . "from {$Px}Reaction as r " @@ -45,6 +62,7 @@ public function GetList($ID, $Type) { return $this->Database->Query($Sql, array(':ParentID' => $ID, ':ParentType' => $Type))->Result(); } + /** * Returns the reaction records associated with the specified user content. * @@ -53,7 +71,11 @@ public function GetList($ID, $Type) { * @return mixed DataSet if it exists, NULL otherwise */ public function GetRecord($ID, $Type) { - if(in_array($Type, array('discussion', 'comment', 'activity')) && $ID > 0) { + // try getting the record from the cache + if (array_key_exists($Type . $ID, self::$_Reactions)) { + return self::$_Reactions[$Type . $ID]; + } + else if (in_array($Type, array('discussion', 'comment', 'activity')) && $ID > 0) { return $this->SQL ->Select('a.*, r.InsertUserID as UserID, r.DateInserted') ->From('Action a') @@ -192,6 +214,34 @@ public function Set($ID, $Type, $AuthorID, $UserID, $ActionID) { return $Reaction; } + /** + * Fills the memory cache with the specified reaction records + * + * @param string $Type + * @param array $IDs + */ + public function Prefetch($Type, $IDs) { + if (in_array($Type, array('discussion', 'comment', 'activity')) && !empty($IDs)) { + $Result = $this->SQL + ->Select('a.*, r.InsertUserID as UserID, r.DateInserted, r.ParentID') + ->From('Action a') + ->Join('Reaction r', 'a.ActionID = r.ActionID') + ->WhereIn('r.ParentID', $IDs) + ->Where('r.ParentType', $Type) + ->OrderBy('r.DateInserted') + ->Get() + ->Result(); + + foreach ($IDs as $ID) { + self::$_Reactions[$Type . $ID] = array(); + } + // fill the cache + foreach ($Result as $Reaction) { + self::$_Reactions[$Type . $Reaction->ParentID][] = $Reaction; + } + } + } + /** * This updates the items score for future use in ranking and a best of controller * diff --git a/settings/class.hooks.php b/settings/class.hooks.php index f387524c5..03127c3a8 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -541,12 +541,18 @@ public function ProfileController_Render_Before($Sender) { } /** - * Insert JS and CSS files into the appropiate controllers + * Insert JS and CSS files into the appropiate controllers and fill the reaction cache * * @param DiscussionController $Sender */ public function DiscussionController_Render_Before($Sender) { $this->AddResources($Sender); + if (C('Yaga.Reactions.Enabled')) { + $CommentIDs = ConsolidateArrayValuesByKey($Sender->Data['Comments']->ResultArray(), 'CommentID'); + // set the DataSet type back to "object" + $Sender->Data['Comments']->DataSetType(DATASET_TYPE_OBJECT); + Yaga::ReactionModel()->Prefetch('comment', $CommentIDs); + } } /** From f7639841e5b0fd7c891115dd8f6f1bb2a8e3649a Mon Sep 17 00:00:00 2001 From: bleistivt Date: Sun, 18 Jan 2015 22:10:51 +0100 Subject: [PATCH 034/111] Add GetRecord() result to cache --- models/class.reactionmodel.php | 4 +++- settings/class.hooks.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/models/class.reactionmodel.php b/models/class.reactionmodel.php index 9143ddd49..1d0171098 100644 --- a/models/class.reactionmodel.php +++ b/models/class.reactionmodel.php @@ -76,7 +76,7 @@ public function GetRecord($ID, $Type) { return self::$_Reactions[$Type . $ID]; } else if (in_array($Type, array('discussion', 'comment', 'activity')) && $ID > 0) { - return $this->SQL + $Result = $this->SQL ->Select('a.*, r.InsertUserID as UserID, r.DateInserted') ->From('Action a') ->Join('Reaction r', 'a.ActionID = r.ActionID') @@ -85,6 +85,8 @@ public function GetRecord($ID, $Type) { ->OrderBy('r.DateInserted') ->Get() ->Result(); + self::$_Reactions[$Type . $ID] = $Result; + return $Result; } else { return NULL; diff --git a/settings/class.hooks.php b/settings/class.hooks.php index 03127c3a8..977dea0c5 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -549,7 +549,7 @@ public function DiscussionController_Render_Before($Sender) { $this->AddResources($Sender); if (C('Yaga.Reactions.Enabled')) { $CommentIDs = ConsolidateArrayValuesByKey($Sender->Data['Comments']->ResultArray(), 'CommentID'); - // set the DataSet type back to "object" + // set the DataSet type back to "object" $Sender->Data['Comments']->DataSetType(DATASET_TYPE_OBJECT); Yaga::ReactionModel()->Prefetch('comment', $CommentIDs); } From eccc8c9c95744ef7714e49e4df96c6870f0fc961 Mon Sep 17 00:00:00 2001 From: bleistivt Date: Mon, 19 Jan 2015 02:42:45 +0100 Subject: [PATCH 035/111] Check for comment data --- settings/class.hooks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/class.hooks.php b/settings/class.hooks.php index 977dea0c5..578ec6651 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -547,7 +547,7 @@ public function ProfileController_Render_Before($Sender) { */ public function DiscussionController_Render_Before($Sender) { $this->AddResources($Sender); - if (C('Yaga.Reactions.Enabled')) { + if (C('Yaga.Reactions.Enabled') && isset($Sender->Data['Comments'])) { $CommentIDs = ConsolidateArrayValuesByKey($Sender->Data['Comments']->ResultArray(), 'CommentID'); // set the DataSet type back to "object" $Sender->Data['Comments']->DataSetType(DATASET_TYPE_OBJECT); From b44a6954376e92b966e63e731c7d7f691450d767 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 19 Jan 2015 09:20:47 -0600 Subject: [PATCH 036/111] Add ActedModel to Yaga and update hooks file --- library/class.yaga.php | 20 ++++++++++++++++++++ settings/class.hooks.php | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/library/class.yaga.php b/library/class.yaga.php index 78a40919d..adfcbf15e 100644 --- a/library/class.yaga.php +++ b/library/class.yaga.php @@ -9,6 +9,14 @@ */ class Yaga { + /** + * A single copy of ActedModel available to plugins and hooks files. + * + * @since 1.1 + * @var ActedModel + */ + protected static $_ActedModel = NULL; + /** * A single copy of ActionModel available to plugins and hooks files. * @@ -44,6 +52,18 @@ class Yaga { */ protected static $_BadgeAwardModel = NULL; + /** + * Get a reference to the acted model + * @since 1.1 + * @return ActedModel + */ + public static function ActedModel() { + if (is_null(self::$_ActedModel)) { + self::$_ActedModel = new ActedModel(); + } + return self::$_ActedModel; + } + /** * Get a reference to the action model * @return ActionModel diff --git a/settings/class.hooks.php b/settings/class.hooks.php index f387524c5..39667501c 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -162,7 +162,7 @@ public function ProfileController_Reactions_Create($Sender, $UserReference = '', $Sender->AddDefinition('ExpandText', T('(more)')); $Sender->AddDefinition('CollapseText', T('(less)')); - $Model = new ActedModel(); + $Model = Yaga::ActedModel(); $Data = $Model->Get($Sender->User->UserID, $ActionID, $Limit, $Offset); $Sender->SetData('Content', $Data); @@ -221,7 +221,7 @@ public function ProfileController_Best_Create($Sender, $UserReference = '', $Use $Sender->AddDefinition('ExpandText', T('(more)')); $Sender->AddDefinition('CollapseText', T('(less)')); - $Model = new ActedModel(); + $Model = Yaga::ActedModel(); $Data = $Model->GetBest($Sender->User->UserID, $Limit, $Offset); $Sender->SetData('Content', $Data); From 39f55f680390981def802a53f1148ba15fc330b7 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 19 Jan 2015 09:44:19 -0600 Subject: [PATCH 037/111] Return an object from ActedModel instead of an array. This object contains the total record count after a security check. This ensures the pager gets the right data while preventing a duplicate query. --- models/class.actedmodel.php | 14 +++++++------- settings/class.hooks.php | 6 +++--- views/best/index.php | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/models/class.actedmodel.php b/models/class.actedmodel.php index 4a98f2645..0b89cd92d 100644 --- a/models/class.actedmodel.php +++ b/models/class.actedmodel.php @@ -92,7 +92,7 @@ public function Get($UserID, $ActionID, $Limit = NULL, $Offset = 0) { } $this->Security($Content); - $this->Condense($Content, $Limit, $Offset); + $this->CondenseAndPrep($Content, $Limit, $Offset); return $Content; } @@ -147,7 +147,7 @@ public function GetTaken($UserID, $ActionID, $Limit = NULL, $Offset = 0) { } $this->Security($Content); - $this->Condense($Content, $Limit, $Offset); + $this->CondenseAndPrep($Content, $Limit, $Offset); return $Content; } @@ -199,7 +199,7 @@ public function GetAction($ActionID, $Limit = NULL, $Offset = 0) { } $this->Security($Content); - $this->Condense($Content, $Limit, $Offset); + $this->CondenseAndPrep($Content, $Limit, $Offset); return $Content; } @@ -244,7 +244,7 @@ public function GetBest($UserID = NULL, $Limit = NULL, $Offset = 0) { } $this->Security($Content); - $this->Condense($Content, $Limit, $Offset); + $this->CondenseAndPrep($Content, $Limit, $Offset); return $Content; } @@ -293,7 +293,7 @@ public function GetRecent($Limit = NULL, $Offset = 0) { } $this->Security($Content); - $this->Condense($Content, $Limit, $Offset); + $this->CondenseAndPrep($Content, $Limit, $Offset); return $Content; } @@ -433,8 +433,8 @@ protected function SecurityFilter($ContentItem) { * @param int $Limit * @param int $Offset */ - protected function Condense(&$Content, $Limit, $Offset) { - $Content = array_slice($Content, $Offset, $Limit); + protected function CondenseAndPrep(&$Content, $Limit, $Offset) { + $Content = (object) array('TotalRecords' => count($Content), 'Content' => array_slice($Content, $Offset, $Limit)); } } diff --git a/settings/class.hooks.php b/settings/class.hooks.php index 39667501c..6e8367a40 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -165,7 +165,7 @@ public function ProfileController_Reactions_Create($Sender, $UserReference = '', $Model = Yaga::ActedModel(); $Data = $Model->Get($Sender->User->UserID, $ActionID, $Limit, $Offset); - $Sender->SetData('Content', $Data); + $Sender->SetData('Content', $Data->Content); // Set the HandlerType back to normal on the profilecontroller so that it fetches it's own views $Sender->HandlerType = HANDLER_TYPE_NORMAL; @@ -184,7 +184,7 @@ public function ProfileController_Reactions_Create($Sender, $UserReference = '', $Sender->Pager = $PagerFactory->GetPager('Pager', $Sender); $Sender->Pager->ClientID = 'Pager'; $Sender->Pager->Configure( - $Offset, $Limit, $ReactionModel->GetUserCount($Sender->User->UserID, $ActionID), 'profile/reactions/' . $Sender->User->UserID . '/' . Gdn_Format::Url($Sender->User->Name) . '/' . $ActionID . '/%1$s/' + $Offset, $Limit, $Data->TotalRecords, 'profile/reactions/' . $Sender->User->UserID . '/' . Gdn_Format::Url($Sender->User->Name) . '/' . $ActionID . '/%1$s/' ); // Render the ProfileController @@ -224,7 +224,7 @@ public function ProfileController_Best_Create($Sender, $UserReference = '', $Use $Model = Yaga::ActedModel(); $Data = $Model->GetBest($Sender->User->UserID, $Limit, $Offset); - $Sender->SetData('Content', $Data); + $Sender->SetData('Content', $Data->Content); // Set the HandlerType back to normal on the profilecontroller so that it fetches it's own views $Sender->HandlerType = HANDLER_TYPE_NORMAL; diff --git a/views/best/index.php b/views/best/index.php index e5ff417e1..8d3a9d45a 100644 --- a/views/best/index.php +++ b/views/best/index.php @@ -1,7 +1,7 @@ _Content; +$Contents = $this->_Content->Content; echo '
      '; foreach ($Contents as $Content) { From a6a2ef02debf4f53c86d2ca272838240e8770bde Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 19 Jan 2015 16:00:05 -0600 Subject: [PATCH 038/111] Add missing sprite classes to reactions.css for Sprites plugin. --- design/reactions.css | 11 ++++++++++- settings/class.hooks.php | 17 +++++++++++++---- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/design/reactions.css b/design/reactions.css index 5680e890e..54976f520 100644 --- a/design/reactions.css +++ b/design/reactions.css @@ -223,4 +223,13 @@ input + .ReactSprite { #Content .BoxFilter.BoxBestFilter { display: block; -} \ No newline at end of file +} + +/* Missing sprite background offsets */ +.Sprite.SpBestOf { + background-position: -246px -5px; +} + +.Sprite.SpBadge { + background-position: -245px -52px; +} diff --git a/settings/class.hooks.php b/settings/class.hooks.php index 6e8367a40..1faa222b2 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -78,7 +78,7 @@ public function Base_AfterDiscussionFilters_Handler($Sender) { return FALSE; } - echo Wrap(Anchor(Sprite('SpBestOf') . ' ' . T('Yaga.BestContent'), '/best'), 'li', array('class' => $Sender->ControllerName == 'bestcontroller' ? 'Best Active' : 'Best')); + echo Wrap(Anchor(Sprite('SpBestOf', 'SpMod Sprite') . ' ' . T('Yaga.BestContent'), '/best'), 'li', array('class' => $Sender->ControllerName == 'bestcontroller' ? 'Best Active' : 'Best')); } /** @@ -254,7 +254,7 @@ public function ProfileController_Best_Create($Sender, $UserReference = '', $Use */ public function ProfileController_AddProfileTabs_Handler($Sender) { if(is_object($Sender->User) && $Sender->User->UserID > 0) { - $Sender->AddProfileTab(Sprite('SpBestOf') . ' ' . T('Yaga.BestContent'), 'profile/best/' . $Sender->User->UserID . '/' . urlencode($Sender->User->Name), 'Best'); + $Sender->AddProfileTab(Sprite('SpBestOf', 'SpMod Sprite') . ' ' . T('Yaga.BestContent'), 'profile/best/' . $Sender->User->UserID . '/' . urlencode($Sender->User->Name), 'Best'); } } @@ -333,7 +333,7 @@ public function ProfileController_BeforeProfileOptions_Handler($Sender) { if(Gdn::Session()->IsValid()) { if(C('Yaga.Badges.Enabled') && CheckPermission('Yaga.Badges.Add')) { $Sender->EventArguments['ProfileOptions'][] = array( - 'Text' => Sprite('SpRibbon') . ' ' . T('Yaga.Badge.Award'), + 'Text' => Sprite('SpBadge', 'SpMod Sprite') . ' ' . T('Yaga.Badge.Award'), 'Url' => '/badge/award/' . $Sender->User->UserID, 'CssClass' => 'Popup' ); @@ -341,7 +341,7 @@ public function ProfileController_BeforeProfileOptions_Handler($Sender) { if(C('Yaga.Ranks.Enabled') && CheckPermission('Yaga.Ranks.Add')) { $Sender->EventArguments['ProfileOptions'][] = array( - 'Text' => Sprite('SpModeratorActivities') . ' ' . T('Yaga.Rank.Promote'), + 'Text' => Sprite('SpMod') . ' ' . T('Yaga.Rank.Promote'), 'Url' => '/rank/promote/' . $Sender->User->UserID, 'CssClass' => 'Popup' ); @@ -548,6 +548,15 @@ public function ProfileController_Render_Before($Sender) { public function DiscussionController_Render_Before($Sender) { $this->AddResources($Sender); } + + /** + * Insert JS and CSS files into the appropiate controllers + * + * @param DiscussionsController $Sender + */ + public function DiscussionsController_Render_Before($Sender) { + $this->AddResources($Sender); + } /** * Insert JS and CSS files into the appropiate controllers From 82cafd9e602d74124b2505eab16222f5720523be Mon Sep 17 00:00:00 2001 From: bleistivt Date: Tue, 20 Jan 2015 02:08:51 +0100 Subject: [PATCH 039/111] Add BeforeReactionSave event This could be useful to prevent reaction from being saved. Also closes #64 --- models/class.reactionmodel.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/models/class.reactionmodel.php b/models/class.reactionmodel.php index 1d0171098..d2cdb5fbf 100644 --- a/models/class.reactionmodel.php +++ b/models/class.reactionmodel.php @@ -167,6 +167,9 @@ public function Set($ID, $Type, $AuthorID, $UserID, $ActionID) { $NewAction = $ActionModel->GetByID($ActionID); $Points = $Score = $NewAction->AwardValue; $CurrentReaction = $this->GetByUser($ID, $Type, $UserID); + $EventArgs['CurrentReaction'] = $CurrentReaction; + $this->FireEvent('BeforeReactionSave', $EventArgs); + if($CurrentReaction) { $OldAction = $ActionModel->GetByID($CurrentReaction->ActionID); From fd191808256c9d8a59e51a8820083e0730e86495 Mon Sep 17 00:00:00 2001 From: bleistivt Date: Sun, 25 Jan 2015 02:10:55 +0100 Subject: [PATCH 040/111] Reduce memory consumption of ActedModel This patch makes the ActedModel only fetch columns that are needed for sorting and security. All content is separately fetched by Prepare() which I put at a later place. --- models/class.actedmodel.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/models/class.actedmodel.php b/models/class.actedmodel.php index 0b89cd92d..cba95cc03 100644 --- a/models/class.actedmodel.php +++ b/models/class.actedmodel.php @@ -26,14 +26,14 @@ class ActedModel extends Gdn_Model { private function BaseSQL($Table = 'Discussion') { switch($Table) { case 'Comment': - $SQL = Gdn::SQL()->Select('c.*') + $SQL = Gdn::SQL()->Select('c.Score, c.CommentID, c.InsertUserID, c.DiscussionID, c.DateInserted') ->From('Comment c') ->Where('c.Score is not null') ->OrderBy('c.Score', 'DESC'); break; default: case 'Discussion': - $SQL = Gdn::SQL()->Select('d.*') + $SQL = Gdn::SQL()->Select('d.Score, d.DiscussionID, d.InsertUserID, d.CategoryID, d.DateInserted') ->From('Discussion d') ->Where('d.Score is not null') ->OrderBy('d.Score', 'DESC'); @@ -83,7 +83,6 @@ public function Get($UserID, $ActionID, $Limit = NULL, $Offset = 0) { 'Discussion' => $Discussions, 'Comment' => $Comments )); - $this->Prepare($Content); // Add result to cache Gdn::Cache()->Store($CacheKey, $Content, array( @@ -93,6 +92,7 @@ public function Get($UserID, $ActionID, $Limit = NULL, $Offset = 0) { $this->Security($Content); $this->CondenseAndPrep($Content, $Limit, $Offset); + $this->Prepare($Content->Content); return $Content; } @@ -138,7 +138,6 @@ public function GetTaken($UserID, $ActionID, $Limit = NULL, $Offset = 0) { 'Discussion' => $Discussions, 'Comment' => $Comments )); - $this->Prepare($Content); // Add result to cache Gdn::Cache()->Store($CacheKey, $Content, array( @@ -148,6 +147,7 @@ public function GetTaken($UserID, $ActionID, $Limit = NULL, $Offset = 0) { $this->Security($Content); $this->CondenseAndPrep($Content, $Limit, $Offset); + $this->Prepare($Content->Content); return $Content; } @@ -190,7 +190,6 @@ public function GetAction($ActionID, $Limit = NULL, $Offset = 0) { 'Discussion' => $Discussions, 'Comment' => $Comments )); - $this->Prepare($Content); // Add result to cache Gdn::Cache()->Store($CacheKey, $Content, array( @@ -200,6 +199,7 @@ public function GetAction($ActionID, $Limit = NULL, $Offset = 0) { $this->Security($Content); $this->CondenseAndPrep($Content, $Limit, $Offset); + $this->Prepare($Content->Content); return $Content; } @@ -236,7 +236,6 @@ public function GetBest($UserID = NULL, $Limit = NULL, $Offset = 0) { 'Discussion' => $Discussions, 'Comment' => $Comments )); - $this->Prepare($Content); Gdn::Cache()->Store($CacheKey, $Content, array( Gdn_Cache::FEATURE_EXPIRY => $this->_Expiry @@ -245,6 +244,7 @@ public function GetBest($UserID = NULL, $Limit = NULL, $Offset = 0) { $this->Security($Content); $this->CondenseAndPrep($Content, $Limit, $Offset); + $this->Prepare($Content->Content); return $Content; } @@ -285,7 +285,6 @@ public function GetRecent($Limit = NULL, $Offset = 0) { 'Discussion' => $Discussions, 'Comment' => $Comments )); - $this->Prepare($Content); Gdn::Cache()->Store($CacheKey, $Content, array( Gdn_Cache::FEATURE_EXPIRY => $this->_Expiry @@ -294,6 +293,7 @@ public function GetRecent($Limit = NULL, $Offset = 0) { $this->Security($Content); $this->CondenseAndPrep($Content, $Limit, $Offset); + $this->Prepare($Content->Content); return $Content; } @@ -364,12 +364,13 @@ protected function Union($Field, $Sections) { protected function Prepare(&$Content) { foreach($Content as &$ContentItem) { - $ContentType = GetValue('ItemType', $ContentItem); + $ContentType = strtolower(GetValue('ItemType', $ContentItem)); + $ContentItem = array_merge($ContentItem, GetRecord($ContentType, $ContentItem[ucfirst($ContentType) . 'ID'])); $Replacement = array(); $Fields = array('DiscussionID', 'CategoryID', 'DateInserted', 'DateUpdated', 'InsertUserID', 'Body', 'Format', 'ItemType'); - switch(strtolower($ContentType)) { + switch($ContentType) { case 'comment': $Fields = array_merge($Fields, array('CommentID')); From 8c539664ae5706742e8ed70831353b8323a526bd Mon Sep 17 00:00:00 2001 From: bleistivt Date: Sun, 25 Jan 2015 04:56:42 +0100 Subject: [PATCH 041/111] Figure out the correct file extension --- controllers/class.badgecontroller.php | 2 +- controllers/class.rankcontroller.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/class.badgecontroller.php b/controllers/class.badgecontroller.php index 38360e74b..f54dbbafe 100644 --- a/controllers/class.badgecontroller.php +++ b/controllers/class.badgecontroller.php @@ -96,7 +96,7 @@ public function Edit($BadgeID = NULL) { if($TmpImage) { // Generate the target image name - $TargetImage = $Upload->GenerateTargetName(PATH_UPLOADS); + $TargetImage = $Upload->GenerateTargetName(PATH_UPLOADS, FALSE); $ImageBaseName = pathinfo($TargetImage, PATHINFO_BASENAME); // Save the uploaded image diff --git a/controllers/class.rankcontroller.php b/controllers/class.rankcontroller.php index fbeb18e87..82389b89c 100644 --- a/controllers/class.rankcontroller.php +++ b/controllers/class.rankcontroller.php @@ -51,7 +51,7 @@ public function Settings() { if($TmpImage) { // Generate the target image name - $TargetImage = $Upload->GenerateTargetName(PATH_UPLOADS); + $TargetImage = $Upload->GenerateTargetName(PATH_UPLOADS, FALSE); $ImageBaseName = pathinfo($TargetImage, PATHINFO_BASENAME); // Save the uploaded image From 8c2a0aa1c56976a6cab21530e6576e385cb6921d Mon Sep 17 00:00:00 2001 From: bleistivt Date: Sun, 25 Jan 2015 23:18:57 +0100 Subject: [PATCH 042/111] GetRecent() required fields only, wrapper function --- models/class.actedmodel.php | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/models/class.actedmodel.php b/models/class.actedmodel.php index cba95cc03..6a540c995 100644 --- a/models/class.actedmodel.php +++ b/models/class.actedmodel.php @@ -262,7 +262,7 @@ public function GetRecent($Limit = NULL, $Offset = 0) { if($Content == Gdn_Cache::CACHEOP_FAILURE) { - $Discussions = Gdn::SQL()->Select('d.*, r.DateInserted as ReactionDate') + $Discussions = Gdn::SQL()->Select('d.DiscussionID, d.InsertUserID, d.CategoryID, r.DateInserted as ReactionDate') ->From('Reaction r') ->Where('ParentType', 'discussion') ->Join('Discussion d', 'r.ParentID = d.DiscussionID') @@ -270,7 +270,7 @@ public function GetRecent($Limit = NULL, $Offset = 0) { ->Get() ->Result(DATASET_TYPE_ARRAY); - $Comments = Gdn::SQL()->Select('c.*, r.DateInserted as ReactionDate') + $Comments = Gdn::SQL()->Select('c.CommentID, c.InsertUserID, c.DiscussionID, r.DateInserted as ReactionDate') ->From('Reaction r') ->Where('ParentType', 'comment') ->Join('Comment c', 'r.ParentID = c.CommentID') @@ -365,7 +365,9 @@ protected function Prepare(&$Content) { foreach($Content as &$ContentItem) { $ContentType = strtolower(GetValue('ItemType', $ContentItem)); - $ContentItem = array_merge($ContentItem, GetRecord($ContentType, $ContentItem[ucfirst($ContentType) . 'ID'])); + $ItemID = $ContentItem[ucfirst($ContentType) . 'ID']; + + $ContentItem = array_merge($ContentItem, $this->GetRecord($ContentType, $ItemID)); $Replacement = array(); $Fields = array('DiscussionID', 'CategoryID', 'DateInserted', 'DateUpdated', 'InsertUserID', 'Body', 'Format', 'ItemType'); @@ -438,4 +440,15 @@ protected function CondenseAndPrep(&$Content, $Limit, $Offset) { $Content = (object) array('TotalRecords' => count($Content), 'Content' => array_slice($Content, $Offset, $Limit)); } + /** + * Wrapper for GetRecord() + * + * @param string $RecordType + * @param int $ID + * @return array + */ + protected function GetRecord($RecordType, $ID) { + return GetRecord($RecordType, $ID); + } + } From 455d04ced3fe4330b372d2558cb4465e3215c440 Mon Sep 17 00:00:00 2001 From: bleistivt Date: Sun, 25 Jan 2015 23:38:11 +0100 Subject: [PATCH 043/111] Limit discussion columns fetched for comments --- models/class.actedmodel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/class.actedmodel.php b/models/class.actedmodel.php index 6a540c995..2e9c16be3 100644 --- a/models/class.actedmodel.php +++ b/models/class.actedmodel.php @@ -311,7 +311,7 @@ protected function JoinCategory(&$Comments) { } $DiscussionIDs = array_keys($DiscussionIDs); - $Discussions = Gdn::SQL()->Select('d.*') + $Discussions = Gdn::SQL()->Select('d.DiscussionID, d.CategoryID, d.Name') ->From('Discussion d') ->WhereIn('DiscussionID', $DiscussionIDs) ->Get()->Result(DATASET_TYPE_ARRAY); From e5e8e262d12484ac8bdd7b28909ec5dc5ec4b9db Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Tue, 27 Jan 2015 10:25:29 -0600 Subject: [PATCH 044/111] Add badge enable event to allow for analysis when enabling/disabling. --- models/class.badgemodel.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/models/class.badgemodel.php b/models/class.badgemodel.php index a6f22b0f6..9518a5a71 100644 --- a/models/class.badgemodel.php +++ b/models/class.badgemodel.php @@ -96,6 +96,8 @@ public function Enable($BadgeID, $Enable) { ->Set('Enabled', $Enable) ->Where('BadgeID', $BadgeID) ->Put(); + $this->EventArguments['Enable'] = $Enable; + $this->FireEvent('BadgeEnable'); } /** From 57ffd7d9f19cd21f6fade98c42d7b4c4a10b9ed4 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Tue, 27 Jan 2015 10:28:38 -0600 Subject: [PATCH 045/111] Forgot the badge ID --- models/class.badgemodel.php | 1 + 1 file changed, 1 insertion(+) diff --git a/models/class.badgemodel.php b/models/class.badgemodel.php index 9518a5a71..fe517c9e5 100644 --- a/models/class.badgemodel.php +++ b/models/class.badgemodel.php @@ -96,6 +96,7 @@ public function Enable($BadgeID, $Enable) { ->Set('Enabled', $Enable) ->Where('BadgeID', $BadgeID) ->Put(); + $this->EventArguments['BadgeID'] = $BadgeID; $this->EventArguments['Enable'] = $Enable; $this->FireEvent('BadgeEnable'); } From a5d1f0a6620d472cdcc0c2fae18373a582c12dd1 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Tue, 27 Jan 2015 11:00:15 -0600 Subject: [PATCH 046/111] Sort the rules by name --- controllers/class.rulescontroller.php | 1 + 1 file changed, 1 insertion(+) diff --git a/controllers/class.rulescontroller.php b/controllers/class.rulescontroller.php index 4e5a2c101..b7f068052 100644 --- a/controllers/class.rulescontroller.php +++ b/controllers/class.rulescontroller.php @@ -50,6 +50,7 @@ public static function GetRules() { $Model->FireAs = 'Yaga'; $Model->FireEvent('AfterGetRules'); + asort($TempRules); if(empty($TempRules)) { $Rules = serialize(FALSE); } From 12a47408b805cb7844ae2fb0a79a8aa9535919dc Mon Sep 17 00:00:00 2001 From: bleistivt Date: Wed, 28 Jan 2015 02:50:55 +0100 Subject: [PATCH 047/111] Fix display of reaction record limit The reaction record limit wasn't working. The message wasn't shown and for a limit of 10 reactions it would show 11 reactions. --- library/functions.render.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/functions.render.php b/library/functions.render.php index d5b56dc76..bdffb05a5 100644 --- a/library/functions.render.php +++ b/library/functions.render.php @@ -56,7 +56,7 @@ function RenderReactionRecord($ID, $Type) { foreach($Reactions as $i => $Reaction) { // Limit the record if there are a lot of reactions - if($i <= $Limit || $Limit <= 0) { + if($i < $Limit || $Limit <= 0) { $User = Gdn::UserModel()->GetID($Reaction->UserID); $DateTitle = sprintf(T('Yaga.Reactions.RecordFormat'), $User->Name, $Reaction->Name, Gdn_Format::Date($Reaction->DateInserted, '%B %e, %Y')); $String = UserPhoto($User, array('Size' => 'Small', 'title' => $DateTitle)); @@ -65,7 +65,7 @@ function RenderReactionRecord($ID, $Type) { $RecordsString .= Wrap($String, 'span', $Wrapttributes); } // Display the 'and x more' message if there is a limit - if($Limit > 0 && $i >= $ReactionCount && $ReactionCount > $Limit) { + if($Limit > 0 && $i == $Limit && $ReactionCount > $Limit) { $RecordsString .= Plural($ReactionCount - $Limit, 'Yaga.Reactions.RecordLimit.Single', 'Yaga.Reactions.RecordLimit.Plural'); } } From 02fca4f4763b1c2a478a29bd2b8b5978b699a018 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Sat, 31 Jan 2015 09:53:46 -0600 Subject: [PATCH 048/111] Activities should use absolute paths This is for interoperability of the notifications popin. --- models/class.badgeawardmodel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/class.badgeawardmodel.php b/models/class.badgeawardmodel.php index 7e24a7f0e..b120dd70a 100644 --- a/models/class.badgeawardmodel.php +++ b/models/class.badgeawardmodel.php @@ -93,7 +93,7 @@ public function Award($BadgeID, $UserID, $InsertUserID = NULL, $Reason = '') { 'ActivityType' => 'BadgeAward', 'ActivityUserID' => $UserID, 'RegardingUserID' => $InsertUserID, - 'Photo' => $Badge->Photo, + 'Photo' => Url($Badge->Photo, TRUE), 'RecordType' => 'Badge', 'RecordID' => $BadgeID, 'Route' => '/yaga/badges/' . $Badge->BadgeID . '/' . Gdn_Format::Url($Badge->Name), From c665938d3dba27dbe87ae33bc0d3707e1418184d Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Tue, 10 Feb 2015 14:08:45 -0600 Subject: [PATCH 049/111] Typo in rank model prevented removal of existing ranks. --- models/class.rankmodel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/class.rankmodel.php b/models/class.rankmodel.php index 77e36e7bd..4e3bb2747 100644 --- a/models/class.rankmodel.php +++ b/models/class.rankmodel.php @@ -176,7 +176,7 @@ public function Enable($RankID, $Enable) { */ public function Delete($RankID) { $Rank = $this->GetByID($RankID); - if(!$Rank) { + if($Rank) { $this->SQL->Delete('Rank', array('RankID' => $RankID)); return TRUE; } From 6f7bbb00bc6868ef03c6479372359a5d9f93525d Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Thu, 19 Feb 2015 15:56:09 -0600 Subject: [PATCH 050/111] Always return an array for perks. --- models/class.rankmodel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/class.rankmodel.php b/models/class.rankmodel.php index 4e3bb2747..ebc8a6059 100644 --- a/models/class.rankmodel.php +++ b/models/class.rankmodel.php @@ -126,7 +126,7 @@ public function GetPerks($RankID) { } } - return self::$_Perks[$RankID]; + return (array_key_exists($RankID, self::$_Perks)) ? self::$_Perks[$RankID] : array(); } /** From 5575ca24ed051977e8d21782964f903af0817ae0 Mon Sep 17 00:00:00 2001 From: bleistivt Date: Fri, 13 Mar 2015 13:09:43 +0100 Subject: [PATCH 051/111] Update definitions.php Updated file to match en-CA structure and added missing translations --- locale/de-DE/definitions.php | 284 ++++++++++++++++++++--------------- 1 file changed, 159 insertions(+), 125 deletions(-) diff --git a/locale/de-DE/definitions.php b/locale/de-DE/definitions.php index c458916a4..a4c2f4031 100644 --- a/locale/de-DE/definitions.php +++ b/locale/de-DE/definitions.php @@ -1,204 +1,238 @@ %s exportiert'; -$Definition['Yaga.Import.Desc'] = 'Hier kannst du eine Yaga-Einstellungen importieren. Deine jetzigen Einstellungen werden durch diese ersetzt. Wähle, welche Teile der Einstellungen überschrieben werden sollen.'; -$Definition['Yaga.Import.Success'] = 'Deine Yaga-Einstellungen wurden erfolgreich importiert aus: %s'; -$Definition['Yaga.Transport.Return'] = 'Zurück zu den Grundeinstellungen'; +// Misc +$Definition['1 year'] = '1 Jahr'; +$Definition['3 months'] = '3 Monate'; +$Definition['5 years'] = '5 Jahre'; +$Definition['6 months'] = '6 Monate'; +$Definition['Auto Award'] = 'Automatische Auszeichnung'; +$Definition['Automatically Award'] = 'Automatisch verleihen'; +$Definition['Award Value'] = 'Auszeichnungswert'; +$Definition['Css Class'] = 'Css Klasse'; +$Definition['Days'] = 'Tage'; +$Definition['Description'] = 'Beschreibung'; +$Definition['Export'] = 'Exportieren'; +$Definition['Grant'] = 'Verleihen'; +$Definition['Icon'] = 'Icon'; +$Definition['Image Files'] = 'Bilddateien'; +$Definition['Image'] = 'Bild'; +$Definition['Less than:'] = 'Weniger als:'; +$Definition['More than or:'] = 'Mehr als oder:'; +$Definition['More than:'] = 'Mehr als:'; +$Definition['Photo'] = 'Foto'; +$Definition['Rule'] = 'Regel'; +$Definition['Time Frame'] = 'Zeitrahmen'; +$Definition['Tooltip'] = 'Tooltip'; +$Definition['Weeks'] = 'Wochen'; +$Definition['Yaga.Settings'] = 'Yaga Einstellungen'; +$Definition['Years'] = 'Jahre'; +$Definition['Yaga.MenuLinks.Show'] = 'Links zu Yaga-Übersichtsseiten im Hauptmenü zeigen.'; // Actions -$Definition['Yaga.Reactions'] = 'Reaktionen'; $Definition['Yaga.Action'] = 'Aktion'; -$Definition['Yaga.Action.Delete'] = 'Lösche Aktion'; -$Definition['Yaga.Action.Move'] = 'Die %s Aktionen verschieben?'; -$Definition['Yaga.Actions.Current'] = 'Aktivierte Reaktionen'; -$Definition['Yaga.Actions.Manage'] = 'Reaktionen bearbeiten'; $Definition['Yaga.Action.Add'] = 'Aktion hinzufügen'; -$Definition['Yaga.Action.Edit'] = 'Aktion bearbeiten'; -$Definition['Yaga.ActionUpdated'] = 'Die Aktion wurde erfolgreich geändert!'; $Definition['Yaga.Action.Added'] = 'Die Aktion wurde erfolgreich hinzugefügt!'; +$Definition['Yaga.Action.Delete'] = 'Lösche Aktion'; +$Definition['Yaga.Action.Edit'] = 'Aktion bearbeiten'; $Definition['Yaga.Action.Invalid'] = 'Ungültige Aktion'; -$Definition['Yaga.Action.InvalidTargetType'] = 'Ungültiges Reaktions-Ziel'; $Definition['Yaga.Action.InvalidTargetID'] = 'Ungültige ID'; +$Definition['Yaga.Action.InvalidTargetType'] = 'Ungültiges Reaktions-Ziel'; +$Definition['Yaga.Action.Move'] = 'Die %s Aktionen verschieben?'; +$Definition['Yaga.Action.PermDesc'] = 'Ein Benutzer wird folgende Berechtigungen benötigen um diese Aktion zu verwenden. Die Standard-Berechtigung heißt "Yaga.Reactions.Add".'; +$Definition['Yaga.ActionUpdated'] = 'Die Aktion wurde erfolgreich geändert!'; +$Definition['Yaga.Actions.Current'] = 'Aktivierte Reaktionen'; +$Definition['Yaga.Actions.Desc'] = 'Aktionen werden unter benutzergenerierten Inhalten wie Diskussionen, Kommentare und Aktivitäten angezeigt. Andere Benutzer können diese als "Reaktion" auf den Inhalt auswählen. Der ursprüngliche Verfasser erhält hierfür Punkte. Dies erzeugt eine positive Rückkopplung für positive und negative Aktionen.'; +$Definition['Yaga.Actions.Manage'] = 'Reaktionen bearbeiten'; $Definition['Yaga.Actions.Settings.Desc'] = 'Aktionen, welche als Reaktionen verwendet werden können, hinzufügen oder entfernen'; +$Definition['Yaga.Reactions'] = 'Reaktionen'; +$Definition['Yaga.Reactions.RecordFormat'] = '%s - %s am %s.'; +$Definition['Yaga.Reactions.RecordLimit.Plural'] = 'und %s andere.'; +$Definition['Yaga.Reactions.RecordLimit.Single'] = 'und %s anderer.'; +$Definition['Yaga.Reactions.Use'] = 'Reaktionen verwenden'; // Badges -$Definition['Yaga.Badges'] = 'Auszeichnungen'; $Definition['Yaga.Badge'] = 'Auszeichnung'; -$Definition['Yaga.Badges.Manage'] = 'Auszeichnungen hinzufügen / bearbeiten'; $Definition['Yaga.Badge.Add'] = 'Auszeichnung hinzufügen'; -$Definition['Yaga.Badge.Edit'] = 'Auszeichnung bearbeiten'; -$Definition['Yaga.Badge.Updated'] = 'Auszeichnung erfolgreich geändert!'; $Definition['Yaga.Badge.Added'] = 'Auszeichnung erfolgreich hinzugefügt!'; -$Definition['Yaga.Badge.PhotoDeleted'] = 'Auszeichnungs-Foto entfernt'; $Definition['Yaga.Badge.AlreadyAwarded'] = '%s hat diese Auszeichnung bereits!'; -$Definition['Yaga.Badges.All'] = 'Alle Auszeichnungen'; -$Definition['Yaga.Badge.View'] = 'Auszeichnungen ansehen: '; -$Definition['Yaga.Badges.Mine'] = 'Meine Auszeichnungen'; $Definition['Yaga.Badge.Award'] = 'Auszeichnung verleihen'; -$Definition['Yaga.Badge.GiveTo'] = 'Verleihe eine Auszeichnung an %s'; -$Definition['Yaga.Badges.Settings.Desc'] = 'Bearbeite die Auszeichnungen, die Benutzer erhalten können, oder füge weitere hinzu.'; -$Definition['Yaga.Badge.Earned.Format'] = 'Du hast eine Auszeichnung für %s von %s erhalten!'; +$Definition['Yaga.Badge.Delete'] = 'Auszeichnung löschen'; +$Definition['Yaga.Badge.DetailLink'] = 'Statistik zu dieser Auszeichnung'; $Definition['Yaga.Badge.Earned'] = 'Du hast diese Auszeichnung erhalten'; -$Definition['Yaga.Badge.EarnedBySingle'] = '%s Benutzer hat diese Auszeichnung.'; -$Definition['Yaga.Badge.EarnedByPlural'] = '%s Benutzer haben diese Auszeichnung.'; +$Definition['Yaga.Badge.Earned.Format'] = 'Du hast eine Auszeichnung für %s von %s erhalten!'; $Definition['Yaga.Badge.EarnedByNone'] = 'Diese Auszeichnung hat bislang noch niemand erhalten.'; +$Definition['Yaga.Badge.EarnedByPlural'] = '%s Benutzer haben diese Auszeichnung.'; +$Definition['Yaga.Badge.EarnedBySingle'] = '%s Benutzer hat diese Auszeichnung.'; +$Definition['Yaga.Badge.EarnedHeadlineFormat'] = '{ActivityUserID,You} hast die {Data.Name,text} Auszeichnung erhalten.'; +$Definition['Yaga.Badge.Edit'] = 'Auszeichnung bearbeiten'; +$Definition['Yaga.Badge.GiveTo'] = 'Verleihe eine Auszeichnung an %s'; +$Definition['Yaga.Badge.PhotoDeleted'] = 'Auszeichnungs-Foto entfernt'; +$Definition['Yaga.Badge.Reason'] = 'Grund (optional)'; $Definition['Yaga.Badge.RecentRecipients'] = 'Kürzlich ausgezeichnete Benutzer'; -$Definition['Yaga.Badge.DetailLink'] = 'Statistik zu dieser Auszeichnung'; - -// Ranks -$Definition['Yaga.Ranks'] = 'Ränge'; -$Definition['Yaga.Rank'] = 'Rang'; -$Definition['Yaga.Ranks.Manage'] = 'Ränge hinzufügen / bearbeiten'; -$Definition['Yaga.Rank.Add'] = 'Rang hinzufügen'; -$Definition['Yaga.Rank.Edit'] = 'Rang bearbeiten'; -$Definition['Yaga.Rank.Updated'] = 'Rang erfolgreich geändert!'; -$Definition['Yaga.Rank.Added'] = 'Rang erfolgreich hinzugefügt!'; -$Definition['Yaga.Rank.PhotoDeleted'] = 'Rang-Foto entfernt'; -$Definition['Yaga.RankAlreadyAttained'] = '%s hat bereits diesen Rang!'; -$Definition['Yaga.Rank.Promote'] = 'Rang verleihen'; -$Definition['Yaga.Rank.Promote.Format'] = "%s einen Rang verleihen"; -$Definition['Yaga.Rank.RecordActivity'] = 'Bearbeitung dieses Ranges als Aktivität veröffentlichen.'; -$Definition['Yaga.Ranks.Settings.Desc'] = 'Bearbeite die Ränge, die Benutzer erreichen können, oder füge neue hinzu.'; -$Definition['Yaga.Rank.Progression'] = 'Rang-Sequenz'; -$Definition['Yaga.Rank.Progression.Desc'] = 'Benutzer können von diesem Rang zum nächsten aufschreiten.'; -$Definition['Yaga.Rank.Photo.Desc'] = 'Dieses Bild wird in den Aktivitäten und Benachrichtigungen beim Auftschritt zum nächsten Rang gezeigt.'; +$Definition['Yaga.Badge.Updated'] = 'Auszeichnung erfolgreich geändert!'; +$Definition['Yaga.Badge.View'] = 'Auszeichnungen ansehen: '; +$Definition['Yaga.Badges'] = 'Auszeichnungen'; +$Definition['Yaga.Badges.All'] = 'Alle Auszeichnungen'; +$Definition['Yaga.Badges.Desc'] = 'Auszeichnungen werden an Benutzerkonten verliehen, welche die benötigten Kriterien erfüllen, die von den Regeln dieser Auszeichnung festgelegt werden. Sie werden im Benutzerprofil angzeigt und besitzen einen Wert in Punkten. Hiermit lässte sich ein Belohnungssystem, das gutes Verhalten fördert, aufbauen.'; +$Definition['Yaga.Badges.Manage'] = 'Auszeichnungen hinzufügen / bearbeiten'; +$Definition['Yaga.Badges.Mine'] = 'Meine Auszeichnungen'; +$Definition['Yaga.Badges.Notify'] = 'Benachrichtige mich, wenn ich eine Auszeichnung erhalte.'; +$Definition['Yaga.Badges.Settings.Desc'] = 'Bearbeite die Auszeichnungen, die Benutzer erhalten können, oder füge weitere hinzu.'; +$Definition['Yaga.Badges.Use'] = 'Auszeichnungen verwenden'; // Best Content $Definition['Yaga.BestContent'] = 'Bestenliste'; -$Definition['Yaga.BestContent.Recent'] = 'Bester Inhalt kürzlich'; -$Definition['Yaga.BestContent.AllTime'] = 'Bester Inhalt insgesamt'; $Definition['Yaga.BestContent.Action'] = 'Bester %s Inhalt'; +$Definition['Yaga.BestContent.AllTime'] = 'Bester Inhalt insgesamt'; +$Definition['Yaga.BestContent.Recent'] = 'Bester Inhalt kürzlich'; -// Error Strings -$Definition['Yaga.Error.ReactToOwn'] = 'Du kannst auf deine eigenen Beiträge nicht reagieren.'; -$Definition['Yaga.Error.NoRules'] = 'Du musst für Auszeichnungen eine Regel festlegen!'; -$Definition['Yaga.Error.Rule404'] = 'Regel nicht gefunden.'; +// Errors +$Definition['Yaga.Error.AddFile'] = 'Datei konnte nicht hinzugefügt werden: %s'; +$Definition['Yaga.Error.ArchiveChecksum'] = 'Archivdatei ist beschädigt: Ungültige Prüfsumme'; +$Definition['Yaga.Error.ArchiveCreate'] = 'Archivdatei konnte nicht erstellt werden: %s'; +$Definition['Yaga.Error.ArchiveExtract'] = 'Archivdatei konnte nicht entpackt werden.'; +$Definition['Yaga.Error.ArchiveOpen'] = 'Archivdatei konnte nicht geöffnet werden.'; +$Definition['Yaga.Error.ArchiveSave'] = 'Archivdatei konnte nicht gespeichert werden: %s'; +$Definition['Yaga.Error.DeleteFailed'] = 'Konnte %s nicht löschen'; +$Definition['Yaga.Error.FileDNE'] = 'Datei existiert nicht.'; +$Definition['Yaga.Error.Includes'] = 'Du musst für einen Transport mindestens ein Objekt auswählen.'; +$Definition['Yaga.Error.NeedJS'] = 'Hierfür muss Javascript in deinem Browser aktiviert sein.'; $Definition['Yaga.Error.NoActions'] = 'Es sind keine Aktionen konfiguriert.'; $Definition['Yaga.Error.NoBadges'] = 'Es gibt keine Auszeichnungen, die du verleihen könntest.'; $Definition['Yaga.Error.NoRanks'] = 'Es gibt keine Ränge, die du verleihen könntest.'; -$Definition['Yaga.Error.NeedJS'] = 'Hierfür muss Javascript in deinem Browser aktiviert sein.'; -$Definition['Yaga.Error.DeleteFailed'] = 'Konnte %s nicht löschen'; -$Definition['Yaga.Error.TransportRequirements'] = 'Die Minimalanforderungen an den Transport einer Yaga-Einstellungsdatei sind nicht erfüllt. Bitte lies manual_transport.md für weitere Informationen.'; -$Definition['Yaga.Error.Includes'] = 'Du musst für einen Transport mindestens ein Objekt auswählen.'; -$Definition['Yaga.Error.ArchiveCreate'] = 'Archivdatei konnte nicht erstellt werden: %s'; -$Definition['Yaga.Error.AddFile'] ='Datei konnte nicht hinzugefügt werden: %s'; -$Definition['Yaga.Error.ArchiveSave'] = 'Archivdatei konnte nicht gespeichert werden: %s'; -$Defitition['Yaga.Error.FileDNE'] = 'Datei existiert nicht.'; -$Definition['Yaga.Error.ArchiveOpen'] = 'Archivdatei konnte nicht geöffnet werden.'; -$Definition['Yaga.Error.ArchiveExtract'] = 'Archivdatei konnte nicht entpackt werden.'; -$Definition['Yaga.Error.ArchiveChecksum'] = 'Archivdatei ist beschädigt: Ungültige Prüfsumme'; +$Definition['Yaga.Error.NoRules'] = 'Du musst für Auszeichnungen eine Regel festlegen!'; +$Definition['Yaga.Error.ReactToOwn'] = 'Du kannst auf deine eigenen Beiträge nicht reagieren.'; +$Definition['Yaga.Error.Rule404'] = 'Regel nicht gefunden.'; $Definition['Yaga.Error.TransportCopy'] = 'Bilddateien konnten nicht übertragen werden.'; +$Definition['Yaga.Error.TransportRequirements'] = 'Die Minimalanforderungen an den Transport einer Yaga-Einstellungsdatei sind nicht erfüllt. Bitte lies manual_transport.md für weitere Informationen.'; -// Activities -$Definition['Yaga.Badge.EarnedHeadlineFormat'] = '{ActivityUserID,You} hast die {Data.Name,text} Auszeichnung erhalten.'; -$Definition['Yaga.Rank.PromotedHeadlineFormat'] = '{ActivityUserID,You} wurdest zum {Data.Name,text} befördert.'; - -// Leaderboard Module +// Leader Board $Definition['Yaga.LeaderBoard.AllTime'] = 'Rangliste (Gesamt)'; -$Definition['Yaga.LeaderBoard.Week'] = "Rangliste (Diese Woche)"; -$Definition['Yaga.LeaderBoard.Month'] = "Rangliste (Diesen Monat)"; -$Definition['Yaga.LeaderBoard.Year'] = "Rangliste (Dieses Jahr)"; +$Definition['Yaga.LeaderBoard.Max'] = 'Maximale Anzahl aufgeführter Benutzer'; +$Definition['Yaga.LeaderBoard.Month'] = 'Rangliste (Diesen Monat)'; +$Definition['Yaga.LeaderBoard.Use'] = 'Rangliste neben den Aktivitäten zeigen'; +$Definition['Yaga.LeaderBoard.Week'] = 'Rangliste (Diese Woche)'; +$Definition['Yaga.LeaderBoard.Year'] = 'Rangliste (Dieses Jahr)'; -// Notifications -$Definition['Yaga.Badges.Notify'] = 'Benachrichtige mich, wenn ich eine Auszeichnung erhalte.'; -$Definition['Yaga.Ranks.Notify'] = 'Benachrichtige mich, wenn ich auf einen neuen Rang befördert werde'; +// Perks +$Definition['Yaga.Perks'] = 'Freischaltbares'; +$Definition['Yaga.Perks.Curation'] = 'Inhalte kurieren'; +$Definition['Yaga.Perks.EditTimeout'] = 'Zeitraum für Bearbeitungen'; +$Definition['Yaga.Perks.Emoticons'] = 'Emoticons verwenden'; +$Definition['Yaga.Perks.MeActions'] = '/me-Aktionen verwenden'; +$Definition['Yaga.Perks.Signatures'] = 'Signatur bearbeiten'; +$Definition['Yaga.Perks.Tags'] = 'Tags hinzufügen'; -// Misc -$Definition['Edit'] = 'Bearbeiten'; -$Definition['Delete'] = 'Löschen'; -$Definition['Image'] = 'Bild'; -$Definition['Rule'] = 'Regel'; -$Definition['Active'] = 'Aktiv'; -$Definition['Options'] = 'Optionen'; -$Definition['Name'] = 'Name'; -$Definition['Description'] = 'Beschreibung'; -$Definition['None'] = 'Nichts'; -$Definition['Icon'] = 'Icon'; -$Definition['Tooltip'] = 'Tooltip'; -$Definition['Award Value'] = 'Auszeichnungswert'; -$Definition['Elevated Permission'] = 'Erhöhte Berechtigung'; +// Ranks +$Definition['Yaga.Rank'] = 'Rang'; +$Definition['Yaga.Rank.Add'] = 'Rang hinzufügen'; +$Definition['Yaga.Rank.Added'] = 'Rang erfolgreich hinzugefügt!'; +$Definition['Yaga.Rank.Delete'] = 'Delete Rank'; +$Definition['Yaga.Rank.Edit'] = 'Rang bearbeiten'; +$Definition['Yaga.Rank.Photo.Desc'] = 'Dieses Bild wird in den Aktivitäten und Benachrichtigungen beim Auftschritt zum nächsten Rang gezeigt.'; +$Definition['Yaga.Rank.PhotoDeleted'] = 'Rang-Foto entfernt'; +$Definition['Yaga.Rank.PhotoUploaded'] = 'Rang-Foto erfolgreich hochgeladen!'; +$Definition['Yaga.Rank.Progression'] = 'Rang-Sequenz'; +$Definition['Yaga.Rank.Progression.Desc'] = 'Benutzer können von diesem Rang zum nächsten aufschreiten.'; +$Definition['Yaga.Rank.Promote'] = 'Rang verleihen'; +$Definition['Yaga.Rank.Promote.Format'] = '%s einen Rang verleihen'; +$Definition['Yaga.Rank.PromotedHeadlineFormat'] = '{ActivityUserID,You} wurdest zum {Data.Name,text} befördert.'; +$Definition['Yaga.Rank.RecordActivity'] = 'Bearbeitung dieses Ranges als Aktivität veröffentlichen.'; +$Definition['Yaga.Rank.Updated'] = 'Rang erfolgreich geändert!'; +$Definition['Yaga.Ranks'] = 'Ränge'; +$Definition['Yaga.Ranks.AgeReq'] = 'Länge der Mitgliedschaft'; +$Definition['Yaga.Ranks.All'] = 'Alle Ränge'; +$Definition['Yaga.Ranks.Desc'] = 'Ranks are awarded to users based on their account age, accumulated points, and total posts. Ranks have associated perks that can be used to alter the user\'s experience.'; +$Definition['Yaga.Ranks.Manage'] = 'Ränge hinzufügen / bearbeiten'; +$Definition['Yaga.Ranks.Notify'] = 'Benachrichtige mich, wenn ich auf einen neuen Rang befördert werde'; $Definition['Yaga.Ranks.PointsReq'] = 'Benötigte Punkte'; -$Definition['Role Award'] = 'Rollen-Auszeichnung'; -$Definition['Auto Award'] = 'Automatische Auszeichnung'; -$Definition['Enabled'] = 'Aktiviert'; -$Definition['Disabled'] = 'Deaktiviert'; +$Definition['Yaga.Ranks.PostsReq'] = 'Benötigte Beiträge'; +$Definition['Yaga.Ranks.RequiredAgeDNC'] = 'Benutzerkonto kann beliebiges Alter haben'; +$Definition['Yaga.Ranks.RequiredAgeFormat'] = 'Benutzerkonto muss mindestens %s alt sein.'; +$Definition['Yaga.Ranks.Settings.Desc'] = 'Bearbeite die Ränge, die Benutzer erreichen können, oder füge neue hinzu.'; +$Definition['Yaga.Ranks.Use'] = 'Ränge verwenden'; +$Definition['Yaga.Ranks.Story.Manual'] = 'Dieser Rang wird manuell vergeben'; +$Definition['Yaga.Ranks.Story.Auto'] = 'Dieser Rang wird automatisch vergeben'; +$Definition['Yaga.Ranks.Story.PostReq'] = 'hat %s Beiträge'; +$Definition['Yaga.Ranks.Story.PostAndPointReq'] = '%s Punkte'; +$Definition['Yaga.Ranks.Story.PointReq'] = 'hat %s Punkte'; +$Definition['Yaga.Ranks.Story.AgeReq'] = 'ist mindestens %s alt'; +$Definition['Yaga.Ranks.Story.3Reqs'] = 'Dieser Rang wird vegeben, sobald dein Benutzerkonto folgende Bedingungen erfüllt: %s, %s, und %s'; +$Definition['Yaga.Ranks.Story.2Reqs'] = 'Dieser Rang wird vegeben, sobald dein Benutzerkonto folgende Bedingungen erfüllt: %s und %s'; +$Definition['Yaga.Ranks.Story.1Reqs'] = 'Dieser Rang wird vegeben, sobald dein Benutzerkonto folgende Bedingung erfüllt: %s'; // Rules -$Definition['Days'] = 'Tage'; -$Definition['Weeks'] = 'Wochen'; -$Definition['Years'] = 'Jahre'; -$Definition['More than:'] = 'Mehr als:'; -$Definition['Less than:'] = 'Weniger als:'; -$Definition['More than or:'] = 'Mehr als oder:'; -$Definition['Time Frame'] = 'Zeitrahmen'; - $Definition['Yaga.Rules.AwardCombo'] = 'Auszeichnungs-Kombo'; -$Definition['Yaga.Rules.AwardCombo.Desc'] = 'Diese Auszeichnung vergeben, wenn die Anzahl unterschiedlicher, auf Regelbasis erhaltener Auszeichnungen das Zielkriterium erreicht oder überschreitet.'; $Definition['Yaga.Rules.AwardCombo.Criteria.Head'] = 'Anzahl der Auszeichnungs Arten'; +$Definition['Yaga.Rules.AwardCombo.Desc'] = 'Diese Auszeichnung vergeben, wenn die Anzahl unterschiedlicher, auf Regelbasis erhaltener Auszeichnungen das Zielkriterium erreicht oder überschreitet.'; $Definition['Yaga.Rules.CakeDayPost'] = 'Geburtstagsbeitrag'; $Definition['Yaga.Rules.CakeDayPost.Desc'] = 'Diese Auszeichnung verleihen, wenn der Benutzer selbst an seinem Geburtstag Beiträge verfasst.'; $Definition['Yaga.Rules.CommentCount'] = 'Anzahl Kommentare'; -$Definition['Yaga.Rules.CommentCount.Desc'] = 'Diese Auszeichnung vergeben, wenn die Anzahl der vom Nutzer verfassten Kommentare das Zielkriterium erreicht oder überschreitet.'; $Definition['Yaga.Rules.CommentCount.Criteria.Head'] = 'Kommentare insgesamt'; +$Definition['Yaga.Rules.CommentCount.Desc'] = 'Diese Auszeichnung vergeben, wenn die Anzahl der vom Nutzer verfassten Kommentare das Zielkriterium erreicht oder überschreitet.'; $Definition['Yaga.Rules.CommentMarathon'] = 'Kommentar-Marathon'; -$Definition['Yaga.Rules.CommentMarathon.Desc'] = 'Diese Auszeichnung vergeben, wenn die Anzahl der vom Nutzer verfassten Kommentare in einer kurzen Zeitspanne das Zielkriterium erreicht oder überschreitet.'; $Definition['Yaga.Rules.CommentMarathon.Criteria.Head'] = 'Anzahl der Kommentare'; +$Definition['Yaga.Rules.CommentMarathon.Desc'] = 'Diese Auszeichnung vergeben, wenn die Anzahl der vom Nutzer verfassten Kommentare in einer kurzen Zeitspanne das Zielkriterium erreicht oder überschreitet.'; $Definition['Yaga.Rules.DiscussionBodyLength'] = 'Zeichenzahl'; -$Definition['Yaga.Rules.DiscussionBodyLength.Desc'] = 'Diese Auszeichnung verleihen, wenn die Anzahl geschriebener Zeichen in der Diskussion eines Nutzers das Zielkriterium überschreitet. Gehe sicher, dass es weniger als oder genau %s Zeichen sind.'; $Definition['Yaga.Rules.DiscussionBodyLength.Criteria.Head'] = 'Wie viele Zeichen?'; +$Definition['Yaga.Rules.DiscussionBodyLength.Desc'] = 'Diese Auszeichnung verleihen, wenn die Anzahl geschriebener Zeichen in der Diskussion eines Nutzers das Zielkriterium überschreitet. Gehe sicher, dass es weniger als oder genau %s Zeichen sind.'; $Definition['Yaga.Rules.DiscussionCategory'] = 'Diskussion in Kategorie'; -$Definition['Yaga.Rules.DiscussionCategory.Desc'] = 'Diese Auszeichnung verleihen, wenn der Benutzer eine Diskussion in der angegebenen Kategorie erstellt.'; $Definition['Yaga.Rules.DiscussionCategory.Criteria.Head'] = 'Wähle die Kategorie:'; +$Definition['Yaga.Rules.DiscussionCategory.Desc'] = 'Diese Auszeichnung verleihen, wenn der Benutzer eine Diskussion in der angegebenen Kategorie erstellt.'; $Definition['Yaga.Rules.DiscussionCount'] = 'Anzahl Diskussionen'; -$Definition['Yaga.Rules.DiscussionCount.Desc'] = 'Diese Auszeichnung vergeben, wenn die Anzahl der vom Nutzer gestarteten Diskussionen das Zielkriterium erreicht oder überschreitet.'; $Definition['Yaga.Rules.DiscussionCount.Criteria.Head'] = 'Diskussionen insgesamt'; +$Definition['Yaga.Rules.DiscussionCount.Desc'] = 'Diese Auszeichnung vergeben, wenn die Anzahl der vom Nutzer gestarteten Diskussionen das Zielkriterium erreicht oder überschreitet.'; $Definition['Yaga.Rules.DiscussionPageCount'] = 'Seitenlänge'; -$Definition['Yaga.Rules.DiscussionPageCount.Desc'] = 'Diese Auszeichnung verleihen, wenn die Seitenzahl einer von diesem Benutzer gestarteten Diskussion eine vorgegebene Nummer überschreitet.'; $Definition['Yaga.Rules.DiscussionPageCount.Criteria.Head'] = 'Wie viele Seiten?'; +$Definition['Yaga.Rules.DiscussionPageCount.Desc'] = 'Diese Auszeichnung verleihen, wenn die Seitenzahl einer von diesem Benutzer gestarteten Diskussion eine vorgegebene Nummer überschreitet.'; $Definition['Yaga.Rules.HasMentioned'] = 'Erwähnung'; $Definition['Yaga.Rules.HasMentioned.Desc'] = 'Diese Auszeichnung verleihen, wenn der Benutzer jemanden mit @ erwähnt.'; $Definition['Yaga.Rules.HolidayVisit'] = 'Feiertag'; -$Definition['Yaga.Rules.HolidayVisit.Desc'] = 'Diese Auszeichnung verleihen, wenn der Benutzer die Seite an einem bestimmten Feiertag besucht.'; $Definition['Yaga.Rules.HolidayVisit.Criteria.Head'] = 'Datum des Feiertags'; +$Definition['Yaga.Rules.HolidayVisit.Desc'] = 'Diese Auszeichnung verleihen, wenn der Benutzer die Seite an einem bestimmten Feiertag besucht.'; $Definition['Yaga.Rules.LengthOfService'] = 'Mitgliedschaft'; -$Definition['Yaga.Rules.LengthOfService.Desc'] = "Diese Auszeichnung verleihen, wenn der Nutzer schon länger als die angegebene Zeit (in Tagen, Wochen oder Jahren) angemeldet ist."; $Definition['Yaga.Rules.LengthOfService.Criteria.Head'] = 'Dauer der Zugehörigkeit'; +$Definition['Yaga.Rules.LengthOfService.Desc'] = 'Diese Auszeichnung verleihen, wenn der Nutzer schon länger als die angegebene Zeit (in Tagen, Wochen oder Jahren) angemeldet ist.'; $Definition['Yaga.Rules.ManualAward'] = 'Manuelle Auszeichnung'; $Definition['Yaga.Rules.ManualAward.Desc'] = 'Diese Auszeichnung wird nie automatisch vergeben. Verwende diese Einstellung für Auszeichnungen die du manuell verleihen möchtest.'; $Definition['Yaga.Rules.NecroPost'] = 'Altes Thema'; -$Definition['Yaga.Rules.NecroPost.Desc'] = 'Diese Auszeichnung verleihen, wenn der Benutzer eine sehr alte Diskussion kommentiert (Nekropost).'; $Definition['Yaga.Rules.NecroPost.Criteria.Head'] = 'Wie alt ist eine tote Diskussion?'; -$Definition['Yaga.Rules.NewbieComment'] = "Kommentar für einen neuen Nutzer"; -$Definition['Yaga.Rules.NewbieComment.Desc'] = 'Diese Auszeichnung verleihen, wenn der Benutzer den ersten Kommentar in der ersten Diskussion eines neuen Benutzers geschrieben hat.'; +$Definition['Yaga.Rules.NecroPost.Desc'] = 'Diese Auszeichnung verleihen, wenn der Benutzer eine sehr alte Diskussion kommentiert (Nekropost).'; +$Definition['Yaga.Rules.NewbieComment'] = 'Kommentar für einen neuen Nutzer'; $Definition['Yaga.Rules.NewbieComment.Criteria.Head'] = 'Neulingsgrad'; +$Definition['Yaga.Rules.NewbieComment.Desc'] = 'Diese Auszeichnung verleihen, wenn der Benutzer den ersten Kommentar in der ersten Diskussion eines neuen Benutzers geschrieben hat.'; $Definition['Yaga.Rules.PhotoExists'] = 'Avatar'; $Definition['Yaga.Rules.PhotoExists.Desc'] = 'Diese Auszeichnung verleihen, wenn der Benutzer einen Avatar hochgeladen hat.'; $Definition['Yaga.Rules.PostCount'] = 'Anzahl Beiträge'; -$Definition['Yaga.Rules.PostCount.Desc'] = 'Diese Auszeichnung vergeben, wenn die Anzahl der vom Nutzer verfassten Kommentare und/oder Diskussionen das Zielkriterium erreicht oder überschreitet.'; $Definition['Yaga.Rules.PostCount.Criteria.Head'] = 'Beiträge insgesamt'; +$Definition['Yaga.Rules.PostCount.Desc'] = 'Diese Auszeichnung vergeben, wenn die Anzahl der vom Nutzer verfassten Kommentare und/oder Diskussionen das Zielkriterium erreicht oder überschreitet.'; $Definition['Yaga.Rules.PostReactions'] = 'Anzahl Beitragsreaktionen'; -$Definition['Yaga.Rules.PostReactions.Desc'] = 'Diese Auszeichnung verleihen, wenn ein Beitrag eines Benutzers die angegebene Anzahl an Reaktionen erhält.'; $Definition['Yaga.Rules.PostReactions.Criteria.Head'] = 'Anzahl Reaktionen'; -$Definition['Yaga.Rules.PostReactions.LabelFormat'] = "# von %s's:"; +$Definition['Yaga.Rules.PostReactions.Desc'] = 'Diese Auszeichnung verleihen, wenn ein Beitrag eines Benutzers die angegebene Anzahl an Reaktionen erhält.'; +$Definition['Yaga.Rules.PostReactions.LabelFormat'] = '# von %s\'s:'; $Definition['Yaga.Rules.QnAAnserCount'] = 'Akzeptierte Antworten (QnA Plugin notwendig)'; -$Definition['Yaga.Rules.QnAAnserCount.Desc'] = 'Diese Auszeichnung verleihen, wenn eine bestimmte Anzahl Antworten des Benutzers akzeptiert wurden..'; $Definition['Yaga.Rules.QnAAnserCount.Criteria.Head'] = 'Anzahl akzeptierter Antworten?'; +$Definition['Yaga.Rules.QnAAnserCount.Desc'] = 'Diese Auszeichnung verleihen, wenn eine bestimmte Anzahl Antworten des Benutzers akzeptiert wurden..'; $Definition['Yaga.Rules.ReactionCount'] = 'Anzahl erhaltene Reaktionen'; -$Definition['Yaga.Rules.ReactionCount.Desc'] = 'Diese Auszeichnung vergeben, wenn der Benutzer eine vorgegebene Anzahl eines bestimmten Reaktionstyps erhalten hat.'; $Definition['Yaga.Rules.ReactionCount.Criteria.Head'] = 'Reaktionen insgesamt'; +$Definition['Yaga.Rules.ReactionCount.Desc'] = 'Diese Auszeichnung vergeben, wenn der Benutzer eine vorgegebene Anzahl eines bestimmten Reaktionstyps erhalten hat.'; $Definition['Yaga.Rules.ReflexComment'] = 'Eine neue Diskussion schnell kommentieren'; -$Definition['Yaga.Rules.ReflexComment.Desc'] = "Diese Auszeichnung verleihen, wenn der Benutzer innerhalb einer vorgegebenen Sekundenzahl auf eine neu erstellte Diskussion geantwortet hat."; $Definition['Yaga.Rules.ReflexComment.Criteria.Head'] = 'Sekunden bis zum Kommentar'; +$Definition['Yaga.Rules.ReflexComment.Desc'] = 'Diese Auszeichnung verleihen, wenn der Benutzer innerhalb einer vorgegebenen Sekundenzahl auf eine neu erstellte Diskussion geantwortet hat.'; $Definition['Yaga.Rules.SocialConnection'] = 'Soziale Netzwerk Verknüpfungen'; -$Definition['Yaga.Rules.SocialConnection.Desc'] = 'Diese Auszeichnung verleihen, wenn der Benutzer seinen Account mit einem bestimmten sozialen Netzwerk verbunden hat.'; $Definition['Yaga.Rules.SocialConnection.Criteria.Head'] = 'Welches Soziale Netzwerk?'; +$Definition['Yaga.Rules.SocialConnection.Desc'] = 'Diese Auszeichnung verleihen, wenn der Benutzer seinen Account mit einem bestimmten sozialen Netzwerk verbunden hat.'; $Definition['Yaga.Rules.UnknownRule'] = 'Unbekannte Regel'; $Definition['Yaga.Rules.UnknownRule.Desc'] = 'Diese Auszeichnung wird nie automatisch verliehen. Diese Regel wird angewandt, wenn die in der Datenbank gespeicherte Regel nicht mehr verfügbar ist. Dies ist der Fall, wenn Regeln von einem deaktivierten Plugin stammen.'; + +// Transport +$Definition['Yaga.Export'] = 'Yaga-Einstellungen exportieren'; +$Definition['Yaga.Export.Desc'] = 'Hier kannst du deine Yaga-Einstellungen zu Backup- oder Transportzwecken exportieren. Wähle aus, welche Teile exportiert werden sollen.'; +$Definition['Yaga.Export.Success'] = 'Deine Yaga-Einstellungen wurden erfolgreich nach %s exportiert'; +$Definition['Yaga.Import'] = 'Yaga-Einstellungen importieren'; +$Definition['Yaga.Import.Desc'] = 'Hier kannst du eine Yaga-Einstellungen importieren. Deine jetzigen Einstellungen werden durch diese ersetzt. Wähle, welche Teile der Einstellungen überschrieben werden sollen.'; +$Definition['Yaga.Import.Success'] = 'Deine Yaga-Einstellungen wurden erfolgreich importiert aus: %s'; +$Definition['Yaga.Transport'] = 'Konfigurationsdatei importieren / exportieren'; +$Definition['Yaga.Transport.Desc'] = 'Du kannst deine gesamten Yaga-Einstellungen in einer Datei abspeichern und übertragen.'; +$Definition['Yaga.Transport.File'] = 'Yaga Transportdatei'; +$Definition['Yaga.Transport.Return'] = 'Zurück zu den Grundeinstellungen'; From d02516628082577bf4ad2ca23d7afe5d0f9a6e52 Mon Sep 17 00:00:00 2001 From: bleistivt Date: Sat, 14 Mar 2015 15:22:50 +0100 Subject: [PATCH 052/111] ReactionModel: Remove check for allowed reaction types - The checks are not needed - Returning NULL throws a notice in foreach when passed into RenderReactionList/RenderReactionRecord - This makes the ReactionModel more generic so it can be used with custom reaction types --- models/class.reactionmodel.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/models/class.reactionmodel.php b/models/class.reactionmodel.php index d2cdb5fbf..4c66912fc 100644 --- a/models/class.reactionmodel.php +++ b/models/class.reactionmodel.php @@ -75,7 +75,7 @@ public function GetRecord($ID, $Type) { if (array_key_exists($Type . $ID, self::$_Reactions)) { return self::$_Reactions[$Type . $ID]; } - else if (in_array($Type, array('discussion', 'comment', 'activity')) && $ID > 0) { + else { $Result = $this->SQL ->Select('a.*, r.InsertUserID as UserID, r.DateInserted') ->From('Action a') @@ -88,9 +88,6 @@ public function GetRecord($ID, $Type) { self::$_Reactions[$Type . $ID] = $Result; return $Result; } - else { - return NULL; - } } /** From b1695d2a1e8fbb3cf783f7f7611d3eea9017b199 Mon Sep 17 00:00:00 2001 From: bleistivt Date: Thu, 9 Apr 2015 12:59:15 +0200 Subject: [PATCH 053/111] Restrict message styles to BadgeController Messages on Yaga frontend pages shouldn't be 240px wide. --- design/yaga.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/design/yaga.css b/design/yaga.css index 5512c4795..9b762d5c4 100644 --- a/design/yaga.css +++ b/design/yaga.css @@ -15,10 +15,10 @@ max-width: 300px; } -.Yaga .InfoMessage, -.Yaga .AlertMessage, -.Yaga .CasualMessage, -.Yaga .WarningMessage { +.Yaga.Badge .InfoMessage, +.Yaga.Badge .AlertMessage, +.Yaga.Badge .CasualMessage, +.Yaga.Badge .WarningMessage { width: 240px; padding: 10px; } From b9211d31723d5b1ba147952e5d3d0218a2f03d42 Mon Sep 17 00:00:00 2001 From: bleistivt Date: Thu, 23 Apr 2015 23:15:29 +0200 Subject: [PATCH 054/111] Make Reactions extensible --- controllers/class.reactcontroller.php | 37 ++++----- models/class.actedmodel.php | 108 +++++++++++++++++--------- settings/structure.php | 2 +- views/best/index.php | 12 +-- views/profile/best.php | 12 +-- views/profile/reactions.php | 12 +-- 6 files changed, 97 insertions(+), 86 deletions(-) diff --git a/controllers/class.reactcontroller.php b/controllers/class.reactcontroller.php index ec2785b57..cfb21a02d 100644 --- a/controllers/class.reactcontroller.php +++ b/controllers/class.reactcontroller.php @@ -49,25 +49,23 @@ public function Index($Type, $ID, $ActionID) { throw PermissionException(); } - switch($Type) { - case 'discussion': - $Model = new DiscussionModel(); - $AnchorID = '#Discussion_'; - break; - case 'comment': - $Model = new CommentModel(); - $AnchorID = '#Comment_'; - break; - case 'activity': - $Model = new ActivityModel(); - $AnchorID = '#Activity_'; - break; - default: - throw new Gdn_UserException(T('Yaga.Action.InvalidTargetType')); - break; - } + $Item = null; + $AnchorID = '#' . ucfirst($Type) . '_'; + $ItemOwnerID = 0; - $Item = $Model->GetID($ID); + if(in_array($Type, array('discussion', 'comment', 'activity'))) { + $Item = GetRecord($Type, $ID); + } + else { + $this->EventArguments = array( + 'TargetType' => $Type, + 'TargetID' => $ID, + 'Item' => &$Item, + 'AnchorID' => &$AnchorID, + 'ItemOwnerID' => &$ItemOwnerID + ); + $this->FireEvent('UnknownType'); + } if($Item) { $Anchor = $AnchorID . $ID; @@ -81,13 +79,12 @@ public function Index($Type, $ID, $ActionID) { switch($Type) { case 'comment': case 'discussion': - $ItemOwnerID = $Item->InsertUserID; + $ItemOwnerID = $Item['InsertUserID']; break; case 'activity': $ItemOwnerID = $Item['RegardingUserID']; break; default: - throw new Gdn_UserException(T('Yaga.Action.InvalidTargetType')); break; } diff --git a/models/class.actedmodel.php b/models/class.actedmodel.php index 2e9c16be3..7b9722291 100644 --- a/models/class.actedmodel.php +++ b/models/class.actedmodel.php @@ -45,7 +45,7 @@ private function BaseSQL($Table = 'Discussion') { /** * Returns a list of all posts by a specific user that has received at least * one of the specified actions. - * + * * @param int $UserID * @param int $ActionID * @param int $Limit @@ -78,11 +78,17 @@ public function Get($UserID, $ActionID, $Limit = NULL, $Offset = 0) { $this->JoinCategory($Comments); + $this->EventArguments['Method'] = 'get'; + $this->EventArguments['UserID'] = $UserID; + $this->EventArguments['ActionID'] = $ActionID; + $this->EventArguments['CustomSections'] = array(); + $this->FireEvent('Content'); + // Interleave - $Content = $this->Union('DateInserted', array( + $Content = $this->Union('DateInserted', array_merge(array( 'Discussion' => $Discussions, 'Comment' => $Comments - )); + ), $this->EventArguments['CustomSections'])); // Add result to cache Gdn::Cache()->Store($CacheKey, $Content, array( @@ -96,7 +102,7 @@ public function Get($UserID, $ActionID, $Limit = NULL, $Offset = 0) { return $Content; } - + /** * Returns a list of all posts of which a specific user has taken the * specified action. @@ -133,11 +139,17 @@ public function GetTaken($UserID, $ActionID, $Limit = NULL, $Offset = 0) { $this->JoinCategory($Comments); + $this->EventArguments['Method'] = 'gettaken'; + $this->EventArguments['UserID'] = $UserID; + $this->EventArguments['ActionID'] = $ActionID; + $this->EventArguments['CustomSections'] = array(); + $this->FireEvent('Content'); + // Interleave - $Content = $this->Union('DateInserted', array( + $Content = $this->Union('DateInserted', array_merge(array( 'Discussion' => $Discussions, 'Comment' => $Comments - )); + ), $this->EventArguments['CustomSections'])); // Add result to cache Gdn::Cache()->Store($CacheKey, $Content, array( @@ -155,7 +167,7 @@ public function GetTaken($UserID, $ActionID, $Limit = NULL, $Offset = 0) { /** * Returns a list of all posts that has received at least one of the * specified actions. - * + * * @param int $ActionID * @param int $Limit * @param int $Offset @@ -185,11 +197,16 @@ public function GetAction($ActionID, $Limit = NULL, $Offset = 0) { $this->JoinCategory($Comments); + $this->EventArguments['Method'] = 'getaction'; + $this->EventArguments['ActionID'] = $ActionID; + $this->EventArguments['CustomSections'] = array(); + $this->FireEvent('Content'); + // Interleave - $Content = $this->Union('DateInserted', array( + $Content = $this->Union('DateInserted', array_merge(array( 'Discussion' => $Discussions, 'Comment' => $Comments - )); + ), $this->EventArguments['CustomSections'])); // Add result to cache Gdn::Cache()->Store($CacheKey, $Content, array( @@ -206,7 +223,7 @@ public function GetAction($ActionID, $Limit = NULL, $Offset = 0) { /** * Returns a list of all posts by a specific user ordered by highest score - * + * * @param int $UserID * @param int $Limit * @param int $Offset @@ -231,11 +248,16 @@ public function GetBest($UserID = NULL, $Limit = NULL, $Offset = 0) { $this->JoinCategory($Comments); + $this->EventArguments['Method'] = 'getbest'; + $this->EventArguments['UserID'] = $UserID; + $this->EventArguments['CustomSections'] = array(); + $this->FireEvent('Content'); + // Interleave - $Content = $this->Union('Score', array( + $Content = $this->Union('Score', array_merge(array( 'Discussion' => $Discussions, 'Comment' => $Comments - )); + ), $this->EventArguments['CustomSections'])); Gdn::Cache()->Store($CacheKey, $Content, array( Gdn_Cache::FEATURE_EXPIRY => $this->_Expiry @@ -251,7 +273,7 @@ public function GetBest($UserID = NULL, $Limit = NULL, $Offset = 0) { /** * Returns a list of all recent scored posts ordered by date reacted - * + * * @param int $Limit * @param int $Offset * @return array @@ -280,11 +302,15 @@ public function GetRecent($Limit = NULL, $Offset = 0) { $this->JoinCategory($Comments); + $this->EventArguments['Method'] = 'getrecent'; + $this->EventArguments['CustomSections'] = array(); + $this->FireEvent('Content'); + // Interleave - $Content = $this->Union('ReactionDate', array( + $Content = $this->Union('ReactionDate', array_merge(array( 'Discussion' => $Discussions, 'Comment' => $Comments - )); + ), $this->EventArguments['CustomSections'])); Gdn::Cache()->Store($CacheKey, $Content, array( Gdn_Cache::FEATURE_EXPIRY => $this->_Expiry @@ -370,26 +396,30 @@ protected function Prepare(&$Content) { $ContentItem = array_merge($ContentItem, $this->GetRecord($ContentType, $ItemID)); $Replacement = array(); - $Fields = array('DiscussionID', 'CategoryID', 'DateInserted', 'DateUpdated', 'InsertUserID', 'Body', 'Format', 'ItemType'); - - switch($ContentType) { - case 'comment': - $Fields = array_merge($Fields, array('CommentID')); - - // Comment specific - $Replacement['Name'] = GetValueR('Discussion.Name', $ContentItem); - break; - - case 'discussion': - $Fields = array_merge($Fields, array('Name', 'Type')); - break; + $Fields = array('DiscussionID', 'CategoryID', 'DateInserted', 'DateUpdated', 'InsertUserID', 'Body', 'Format', 'ItemType', 'ContentURL'); + + if ($ContentType == 'comment' || $ContentType == 'discussion') { + switch($ContentType) { + case 'comment': + $Fields = array_merge($Fields, array('CommentID')); + + // Comment specific + $Replacement['Name'] = GetValueR('Discussion.Name', $ContentItem); + $ContentItem['ContentURL'] = CommentUrl($ContentItem); + break; + + case 'discussion': + $Fields = array_merge($Fields, array('Name', 'Type')); + $ContentItem['ContentURL'] = DiscussionUrl($ContentItem); + break; + } + + $Fields = array_fill_keys($Fields, TRUE); + $Common = array_intersect_key($ContentItem, $Fields); + $Replacement = array_merge($Replacement, $Common); + $ContentItem = $Replacement; } - $Fields = array_fill_keys($Fields, TRUE); - $Common = array_intersect_key($ContentItem, $Fields); - $Replacement = array_merge($Replacement, $Common); - $ContentItem = $Replacement; - // Attach User $UserID = GetValue('InsertUserID', $ContentItem); $User = Gdn::UserModel()->GetID($UserID); @@ -410,7 +440,7 @@ protected function Security(&$Content) { /** * Checks the view permission on an item - * + * * @param array $ContentItem * @return boolean Whether or not the user can see the content item */ @@ -448,7 +478,15 @@ protected function CondenseAndPrep(&$Content, $Limit, $Offset) { * @return array */ protected function GetRecord($RecordType, $ID) { - return GetRecord($RecordType, $ID); + if(in_array($RecordType, array('discussion', 'comment', 'activity'))) { + return GetRecord($RecordType, $ID); + } else { + $this->EventArguments['Type'] = $RecordType; + $this->EventArguments['ID'] = $ID; + $this->EventArguments['Record'] = false; + $this->FireEvent('UnknownRecordType'); + return $this->EventArguments['Record']; + } } } diff --git a/settings/structure.php b/settings/structure.php index 3b0472f48..2d286503c 100755 --- a/settings/structure.php +++ b/settings/structure.php @@ -19,7 +19,7 @@ ->Column('InsertUserID', 'int', FALSE, 'index.1') ->Column('ActionID', 'int', FALSE, 'index') ->Column('ParentID', 'int', TRUE) - ->Column('ParentType', array('discussion', 'comment', 'activity'), TRUE) + ->Column('ParentType', 'varchar(100)') ->Column('ParentAuthorID', 'int', FALSE) ->Column('DateInserted', 'datetime') ->Set($Explicit, $Drop); diff --git a/views/best/index.php b/views/best/index.php index 8d3a9d45a..09398e2fc 100644 --- a/views/best/index.php +++ b/views/best/index.php @@ -14,17 +14,9 @@ $ContentID = GetValue("{$ContentType}ID", $Content); $Author = GetValue('Author', $Content); - switch (strtolower($ContentType)) { - case 'comment': - $ContentURL = CommentUrl($Content); - break; - case 'discussion': - $ContentURL = DiscussionUrl($Content); - break; - } ?>
    • " class="Item"> -

      +

      @@ -41,7 +33,7 @@
      - 'nofollow')); ?> + 'nofollow')); ?>
    • " class="Item"> -

      +

      @@ -41,7 +33,7 @@
      - 'nofollow')); ?> + 'nofollow')); ?>
    • " class="Item"> -

      +

      @@ -41,7 +33,7 @@
      - 'nofollow')); ?> + 'nofollow')); ?> Date: Thu, 28 May 2015 07:18:01 +0200 Subject: [PATCH 055/111] corrections --- controllers/class.reactcontroller.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/controllers/class.reactcontroller.php b/controllers/class.reactcontroller.php index cfb21a02d..720baa66f 100644 --- a/controllers/class.reactcontroller.php +++ b/controllers/class.reactcontroller.php @@ -53,18 +53,27 @@ public function Index($Type, $ID, $ActionID) { $AnchorID = '#' . ucfirst($Type) . '_'; $ItemOwnerID = 0; - if(in_array($Type, array('discussion', 'comment', 'activity'))) { + if(in_array($Type, array('discussion', 'comment'))) { $Item = GetRecord($Type, $ID); } + else if($Type == 'activity') { + $Model = new ActivityModel(); + $Item = $Model->GetID($ID, DATASET_TYPE_ARRAY); + } else { $this->EventArguments = array( + 'TypeFound' => FALSE, 'TargetType' => $Type, 'TargetID' => $ID, 'Item' => &$Item, 'AnchorID' => &$AnchorID, 'ItemOwnerID' => &$ItemOwnerID ); - $this->FireEvent('UnknownType'); + $this->FireEvent('CustomType'); + + if(!$this->EventArguments['TypeFound']) { + throw new Gdn_UserException(T('Yaga.Action.InvalidTargetType')); + } } if($Item) { From d373e5b11cda849314dbd3b298034cf8562f6816 Mon Sep 17 00:00:00 2001 From: bleistivt Date: Sat, 30 May 2015 10:11:21 +0200 Subject: [PATCH 056/111] Improve reaction caching The ReactionModel::Prefetch() method now also calls UserModel::GetIDs() to fill the user cache with the associated UserIDs because the render methods need these anyway. --- models/class.reactionmodel.php | 10 ++++++++++ settings/class.hooks.php | 15 ++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/models/class.reactionmodel.php b/models/class.reactionmodel.php index 4c66912fc..c58d4f4b9 100644 --- a/models/class.reactionmodel.php +++ b/models/class.reactionmodel.php @@ -223,6 +223,10 @@ public function Set($ID, $Type, $AuthorID, $UserID, $ActionID) { * @param array $IDs */ public function Prefetch($Type, $IDs) { + if (!is_array($IDs)) { + $IDs = (array)$IDs; + } + if (in_array($Type, array('discussion', 'comment', 'activity')) && !empty($IDs)) { $Result = $this->SQL ->Select('a.*, r.InsertUserID as UserID, r.DateInserted, r.ParentID') @@ -237,10 +241,16 @@ public function Prefetch($Type, $IDs) { foreach ($IDs as $ID) { self::$_Reactions[$Type . $ID] = array(); } + + $UserIDs = array(); // fill the cache foreach ($Result as $Reaction) { + $UserIDs[] = $Reaction->UserID; self::$_Reactions[$Type . $Reaction->ParentID][] = $Reaction; } + + // Prime the user cache + Gdn::UserModel()->GetIDs($UserIDs); } } diff --git a/settings/class.hooks.php b/settings/class.hooks.php index cb3077100..6f921513f 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -547,11 +547,16 @@ public function ProfileController_Render_Before($Sender) { */ public function DiscussionController_Render_Before($Sender) { $this->AddResources($Sender); - if (C('Yaga.Reactions.Enabled') && isset($Sender->Data['Comments'])) { - $CommentIDs = ConsolidateArrayValuesByKey($Sender->Data['Comments']->ResultArray(), 'CommentID'); - // set the DataSet type back to "object" - $Sender->Data['Comments']->DataSetType(DATASET_TYPE_OBJECT); - Yaga::ReactionModel()->Prefetch('comment', $CommentIDs); + if (C('Yaga.Reactions.Enabled')) { + if ($Sender->Data('Discussion')) { + Yaga::ReactionModel()->Prefetch('discussion', $Sender->Data['Discussion']->DiscussionID); + } + if (isset($Sender->Data['Comments'])) { + $CommentIDs = ConsolidateArrayValuesByKey($Sender->Data['Comments']->ResultArray(), 'CommentID'); + // set the DataSet type back to "object" + $Sender->Data['Comments']->DataSetType(DATASET_TYPE_OBJECT); + Yaga::ReactionModel()->Prefetch('comment', $CommentIDs); + } } } From 4a97db22ed403aaf4f5437ffb5599c10e35fdb3a Mon Sep 17 00:00:00 2001 From: bleistivt Date: Fri, 5 Jun 2015 18:46:38 +0200 Subject: [PATCH 057/111] Image Uploads: Use Asset root Requires Vanilla 2.2 When the asset root differs from the web root (ie when using the StripPath config option), Yaga creates false upload urls. --- controllers/class.badgecontroller.php | 3 ++- controllers/class.rankcontroller.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/controllers/class.badgecontroller.php b/controllers/class.badgecontroller.php index f54dbbafe..d15ba135b 100644 --- a/controllers/class.badgecontroller.php +++ b/controllers/class.badgecontroller.php @@ -101,7 +101,8 @@ public function Edit($BadgeID = NULL) { // Save the uploaded image $Parts = $Upload->SaveAs($TmpImage, 'yaga' . DS . $ImageBaseName); - $RelativeUrl = StringBeginsWith($Parts['Url'], Gdn_Url::WebRoot(TRUE), TRUE, TRUE); + $AssetRoot = Gdn::Request()->UrlDomain(TRUE).Gdn::Request()->AssetRoot(); + $RelativeUrl = StringBeginsWith($Parts['Url'], $AssetRoot, TRUE, TRUE); $this->Form->SetFormValue('Photo', $RelativeUrl); } diff --git a/controllers/class.rankcontroller.php b/controllers/class.rankcontroller.php index 82389b89c..82779f97f 100644 --- a/controllers/class.rankcontroller.php +++ b/controllers/class.rankcontroller.php @@ -56,7 +56,8 @@ public function Settings() { // Save the uploaded image $Parts = $Upload->SaveAs($TmpImage, 'yaga' . DS . $ImageBaseName); - $RelativeUrl = StringBeginsWith($Parts['Url'], Gdn_Url::WebRoot(TRUE), TRUE, TRUE); + $AssetRoot = Gdn::Request()->UrlDomain(TRUE).Gdn::Request()->AssetRoot(); + $RelativeUrl = StringBeginsWith($Parts['Url'], $AssetRoot, TRUE, TRUE); SaveToConfig('Yaga.Ranks.Photo', $RelativeUrl); if(C('Yaga.Ranks.Photo') == $Parts['SaveName']) { From d5e8ffee74fea2ffcccf95a241e7b827b9cd8df4 Mon Sep 17 00:00:00 2001 From: bleistivt Date: Wed, 10 Jun 2015 18:08:58 +0200 Subject: [PATCH 058/111] Fix js bug in edit badges screen Fix for #65 This still happens with Vanilla 2.2 and current Firefox, so here is the fix I have been using in the meantime. --- js/admin.badges.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/admin.badges.js b/js/admin.badges.js index 7afabddea..704f79274 100644 --- a/js/admin.badges.js +++ b/js/admin.badges.js @@ -64,7 +64,9 @@ jQuery(document).ready(function($) { $(document).on('blur', '#Rule-Criteria select', function() { var currentValue = $(this).val(); $(this).children('option').each(function() {$(this).removeAttr('selected'); }); - $(this).find("option[value='" + currentValue + "']").attr('selected', 'selected'); + $(this).find("option[value='" + currentValue + "']") + .attr('selected', 'selected') + .prop('selected', true); }); // This handles retrieving and displaying the different rule criteria forms From f0e1bbcbcd9a8cf8fe39174cfd0ccaa462cbce68 Mon Sep 17 00:00:00 2001 From: bleistivt Date: Wed, 10 Jun 2015 18:29:55 +0200 Subject: [PATCH 059/111] Replace all ApplyRules calls with ApplyRule fixes #88 --- library/rules/class.awardcombo.php | 14 +++----------- library/rules/class.commentcount.php | 10 ++-------- library/rules/class.commentmarathon.php | 14 +++----------- library/rules/class.discussionbodylength.php | 6 +----- library/rules/class.discussioncategory.php | 6 +----- library/rules/class.discussioncount.php | 10 ++-------- library/rules/class.discussionpagecount.php | 6 +----- library/rules/class.holidayvisit.php | 10 ++-------- library/rules/class.lengthofservice.php | 10 ++-------- library/rules/class.necropost.php | 10 ++-------- library/rules/class.newbiecomment.php | 10 ++-------- library/rules/class.postcount.php | 10 ++-------- library/rules/class.qnaanswercount.php | 10 ++-------- library/rules/class.reactioncount.php | 10 ++-------- library/rules/class.reflexcomment.php | 6 +----- library/rules/class.socialconnection.php | 6 +----- 16 files changed, 29 insertions(+), 119 deletions(-) diff --git a/library/rules/class.awardcombo.php b/library/rules/class.awardcombo.php index 566822d32..a3d177b39 100644 --- a/library/rules/class.awardcombo.php +++ b/library/rules/class.awardcombo.php @@ -52,17 +52,9 @@ public function Form($Form) { public function Validate($Criteria, $Form) { $Validation = new Gdn_Validation(); - $Validation->ApplyRules(array( - array( - 'Name' => 'Target', 'Validation' => array('Required', 'Integer') - ), - array( - 'Name' => 'Duration', 'Validation' => array('Required', 'Integer') - ), - array( - 'Name' => 'Period', 'Validation' => 'Required' - ) - )); + $Validation->ApplyRule('Target', array('Required', 'Integer')); + $Validation->ApplyRule('Duration', array('Required', 'Integer')); + $Validation->ApplyRule('Period', 'Required'); $Validation->Validate($Criteria); $Form->SetValidationResults($Validation->Results()); diff --git a/library/rules/class.commentcount.php b/library/rules/class.commentcount.php index 7a4e9cede..207917216 100644 --- a/library/rules/class.commentcount.php +++ b/library/rules/class.commentcount.php @@ -49,14 +49,8 @@ public function Form($Form) { public function Validate($Criteria, $Form) { $Validation = new Gdn_Validation(); - $Validation->ApplyRules(array( - array( - 'Name' => 'Target', 'Validation' => array('Required', 'Integer') - ), - array( - 'Name' => 'Comparison', 'Validation' => 'Required' - ) - )); + $Validation->ApplyRule('Target', array('Required', 'Integer')); + $Validation->ApplyRule('Comparison', 'Required'); $Validation->Validate($Criteria); $Form->SetValidationResults($Validation->Results()); } diff --git a/library/rules/class.commentmarathon.php b/library/rules/class.commentmarathon.php index 78357afd0..b0d321fd5 100644 --- a/library/rules/class.commentmarathon.php +++ b/library/rules/class.commentmarathon.php @@ -47,17 +47,9 @@ public function Form($Form) { public function Validate($Criteria, $Form) { $Validation = new Gdn_Validation(); - $Validation->ApplyRules(array( - array( - 'Name' => 'Target', 'Validation' => array('Required', 'Integer') - ), - array( - 'Name' => 'Duration', 'Validation' => array('Required', 'Integer') - ), - array( - 'Name' => 'Period', 'Validation' => 'Required' - ) - )); + $Validation->ApplyRule('Target', array('Required', 'Integer')); + $Validation->ApplyRule('Duration', array('Required', 'Integer')); + $Validation->ApplyRule('Period', 'Required'); $Validation->Validate($Criteria); $Form->SetValidationResults($Validation->Results()); } diff --git a/library/rules/class.discussionbodylength.php b/library/rules/class.discussionbodylength.php index 09812ec14..1039df8dc 100644 --- a/library/rules/class.discussionbodylength.php +++ b/library/rules/class.discussionbodylength.php @@ -29,11 +29,7 @@ public function Form($Form) { public function Validate($Criteria, $Form) { $Validation = new Gdn_Validation(); - $Validation->ApplyRules(array( - array( - 'Name' => 'Length', 'Validation' => array('Required', 'Integer') - ) - )); + $Validation->ApplyRule('Length', array('Required', 'Integer')); $Validation->Validate($Criteria); $Form->SetValidationResults($Validation->Results()); } diff --git a/library/rules/class.discussioncategory.php b/library/rules/class.discussioncategory.php index c62455da5..dcdbd8df5 100644 --- a/library/rules/class.discussioncategory.php +++ b/library/rules/class.discussioncategory.php @@ -27,11 +27,7 @@ public function Form($Form) { public function Validate($Criteria, $Form) { $Validation = new Gdn_Validation(); - $Validation->ApplyRules(array( - array( - 'Name' => 'CategoryID', 'Validation' => array('Required', 'Integer') - ), - )); + $Validation->ApplyRule('CategoryID', array('Required', 'Integer')); $Validation->Validate($Criteria); $Form->SetValidationResults($Validation->Results()); } diff --git a/library/rules/class.discussioncount.php b/library/rules/class.discussioncount.php index 596941f28..af725efc4 100644 --- a/library/rules/class.discussioncount.php +++ b/library/rules/class.discussioncount.php @@ -49,14 +49,8 @@ public function Form($Form) { public function Validate($Criteria, $Form) { $Validation = new Gdn_Validation(); - $Validation->ApplyRules(array( - array( - 'Name' => 'Target', 'Validation' => array('Required', 'Integer') - ), - array( - 'Name' => 'Comparison', 'Validation' => 'Required' - ) - )); + $Validation->ApplyRule('Target', array('Required', 'Integer')); + $Validation->ApplyRule('Comparison', 'Required'); $Validation->Validate($Criteria); $Form->SetValidationResults($Validation->Results()); } diff --git a/library/rules/class.discussionpagecount.php b/library/rules/class.discussionpagecount.php index 2769c3e23..c9ff084a2 100644 --- a/library/rules/class.discussionpagecount.php +++ b/library/rules/class.discussionpagecount.php @@ -32,11 +32,7 @@ public function Form($Form) { public function Validate($Criteria, $Form) { $Validation = new Gdn_Validation(); - $Validation->ApplyRules(array( - array( - 'Name' => 'Pages', 'Validation' => array('Required', 'Integer') - ) - )); + $Validation->ApplyRule('Pages', array('Required', 'Integer')); $Validation->Validate($Criteria); $Form->SetValidationResults($Validation->Results()); } diff --git a/library/rules/class.holidayvisit.php b/library/rules/class.holidayvisit.php index d9647315d..0e712b4d6 100644 --- a/library/rules/class.holidayvisit.php +++ b/library/rules/class.holidayvisit.php @@ -41,14 +41,8 @@ public function Form($Form) { public function Validate($Criteria, $Form) { $Validation = new Gdn_Validation(); - $Validation->ApplyRules(array( - array( - 'Name' => 'Month', 'Validation' => array('Required', 'Integer') - ), - array( - 'Name' => 'Day', 'Validation' => array('Required', 'Integer') - ) - )); + $Validation->ApplyRule('Month', array('Required', 'Integer')); + $Validation->ApplyRule('Day', array('Required', 'Integer')); $Validation->Validate($Criteria); $Form->SetValidationResults($Validation->Results()); } diff --git a/library/rules/class.lengthofservice.php b/library/rules/class.lengthofservice.php index 02be290e5..85ad30469 100644 --- a/library/rules/class.lengthofservice.php +++ b/library/rules/class.lengthofservice.php @@ -36,14 +36,8 @@ public function Form($Form) { public function Validate($Criteria, $Form) { $Validation = new Gdn_Validation(); - $Validation->ApplyRules(array( - array( - 'Name' => 'Duration', 'Validation' => array('Required', 'Integer') - ), - array( - 'Name' => 'Period', 'Validation' => 'Required' - ) - )); + $Validation->ApplyRule('Duration', array('Required', 'Integer')); + $Validation->ApplyRule('Period', 'Required'); $Validation->Validate($Criteria); $Form->SetValidationResults($Validation->Results()); } diff --git a/library/rules/class.necropost.php b/library/rules/class.necropost.php index ab16ed080..5a82c7a80 100644 --- a/library/rules/class.necropost.php +++ b/library/rules/class.necropost.php @@ -43,14 +43,8 @@ public function Form($Form) { public function Validate($Criteria, $Form) { $Validation = new Gdn_Validation(); - $Validation->ApplyRules(array( - array( - 'Name' => 'Duration', 'Validation' => array('Required', 'Integer') - ), - array( - 'Name' => 'Period', 'Validation' => 'Required' - ) - )); + $Validation->ApplyRule('Duration', array('Required', 'Integer')); + $Validation->ApplyRule('Period', 'Required'); $Validation->Validate($Criteria); $Form->SetValidationResults($Validation->Results()); } diff --git a/library/rules/class.newbiecomment.php b/library/rules/class.newbiecomment.php index 7620bc13f..86606fa80 100644 --- a/library/rules/class.newbiecomment.php +++ b/library/rules/class.newbiecomment.php @@ -56,14 +56,8 @@ public function Form($Form) { public function Validate($Criteria, $Form) { $Validation = new Gdn_Validation(); - $Validation->ApplyRules(array( - array( - 'Name' => 'Duration', 'Validation' => array('Required', 'Integer') - ), - array( - 'Name' => 'Period', 'Validation' => 'Required' - ) - )); + $Validation->ApplyRule('Duration', array('Required', 'Integer')); + $Validation->ApplyRule('Period', 'Required'); $Validation->Validate($Criteria); $Form->SetValidationResults($Validation->Results()); } diff --git a/library/rules/class.postcount.php b/library/rules/class.postcount.php index c2b111f17..6a3a55e07 100644 --- a/library/rules/class.postcount.php +++ b/library/rules/class.postcount.php @@ -50,14 +50,8 @@ public function Form($Form) { public function Validate($Criteria, $Form) { $Validation = new Gdn_Validation(); - $Validation->ApplyRules(array( - array( - 'Name' => 'Target', 'Validation' => array('Required', 'Integer') - ), - array( - 'Name' => 'Comparison', 'Validation' => 'Required' - ) - )); + $Validation->ApplyRule('Target', array('Required', 'Integer')); + $Validation->ApplyRule('Comparison', 'Required'); $Validation->Validate($Criteria); $Form->SetValidationResults($Validation->Results()); } diff --git a/library/rules/class.qnaanswercount.php b/library/rules/class.qnaanswercount.php index f4335dbdb..278fa4a38 100644 --- a/library/rules/class.qnaanswercount.php +++ b/library/rules/class.qnaanswercount.php @@ -49,14 +49,8 @@ public function Form($Form) { public function Validate($Criteria, $Form) { $Validation = new Gdn_Validation(); - $Validation->ApplyRules(array( - array( - 'Name' => 'Target', 'Validation' => array('Required', 'Integer') - ), - array( - 'Name' => 'Comparison', 'Validation' => 'Required' - ) - )); + $Validation->ApplyRule('Target', array('Required', 'Integer')); + $Validation->ApplyRule('Comparison', 'Required'); $Validation->Validate($Criteria); $Form->SetValidationResults($Validation->Results()); } diff --git a/library/rules/class.reactioncount.php b/library/rules/class.reactioncount.php index 1ee4494cd..e6081fbb1 100644 --- a/library/rules/class.reactioncount.php +++ b/library/rules/class.reactioncount.php @@ -45,14 +45,8 @@ public function Form($Form) { public function Validate($Criteria, $Form) { $Validation = new Gdn_Validation(); - $Validation->ApplyRules(array( - array( - 'Name' => 'Target', 'Validation' => array('Required', 'Integer') - ), - array( - 'Name' => 'ActionID', 'Validation' => array('Required', 'Integer') - ) - )); + $Validation->ApplyRule('Target', array('Required', 'Integer')); + $Validation->ApplyRule('ActionID', array('Required', 'Integer')); $Validation->Validate($Criteria); $Form->SetValidationResults($Validation->Results()); } diff --git a/library/rules/class.reflexcomment.php b/library/rules/class.reflexcomment.php index 45e268689..3d6f0d929 100644 --- a/library/rules/class.reflexcomment.php +++ b/library/rules/class.reflexcomment.php @@ -39,11 +39,7 @@ public function Form($Form) { public function Validate($Criteria, $Form) { $Validation = new Gdn_Validation(); - $Validation->ApplyRules(array( - array( - 'Name' => 'Seconds', 'Validation' => array('Required', 'Integer') - ) - )); + $Validation->ApplyRule('Seconds', array('Required', 'Integer')); $Validation->Validate($Criteria); $Form->SetValidationResults($Validation->Results()); } diff --git a/library/rules/class.socialconnection.php b/library/rules/class.socialconnection.php index 2a23d5aad..b72145761 100644 --- a/library/rules/class.socialconnection.php +++ b/library/rules/class.socialconnection.php @@ -34,11 +34,7 @@ public function Form($Form) { public function Validate($Criteria, $Form) { $Validation = new Gdn_Validation(); - $Validation->ApplyRules(array( - array( - 'Name' => 'SocialNetwork', 'Validation' => array('Required') - ) - )); + $Validation->ApplyRule('SocialNetwork', 'Required'); $Validation->Validate($Criteria); $Form->SetValidationResults($Validation->Results()); } From b512096196b6a8e9c49dda7f6e5c8b4eca62fa52 Mon Sep 17 00:00:00 2001 From: bleistivt Date: Tue, 23 Jun 2015 18:41:40 +0200 Subject: [PATCH 060/111] New event names --- models/class.actedmodel.php | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/models/class.actedmodel.php b/models/class.actedmodel.php index 7b9722291..0d21eaa8c 100644 --- a/models/class.actedmodel.php +++ b/models/class.actedmodel.php @@ -78,11 +78,10 @@ public function Get($UserID, $ActionID, $Limit = NULL, $Offset = 0) { $this->JoinCategory($Comments); - $this->EventArguments['Method'] = 'get'; $this->EventArguments['UserID'] = $UserID; $this->EventArguments['ActionID'] = $ActionID; $this->EventArguments['CustomSections'] = array(); - $this->FireEvent('Content'); + $this->FireEvent('GetCustom'); // Interleave $Content = $this->Union('DateInserted', array_merge(array( @@ -139,11 +138,10 @@ public function GetTaken($UserID, $ActionID, $Limit = NULL, $Offset = 0) { $this->JoinCategory($Comments); - $this->EventArguments['Method'] = 'gettaken'; $this->EventArguments['UserID'] = $UserID; $this->EventArguments['ActionID'] = $ActionID; $this->EventArguments['CustomSections'] = array(); - $this->FireEvent('Content'); + $this->FireEvent('GetCustomTaken'); // Interleave $Content = $this->Union('DateInserted', array_merge(array( @@ -197,10 +195,9 @@ public function GetAction($ActionID, $Limit = NULL, $Offset = 0) { $this->JoinCategory($Comments); - $this->EventArguments['Method'] = 'getaction'; $this->EventArguments['ActionID'] = $ActionID; $this->EventArguments['CustomSections'] = array(); - $this->FireEvent('Content'); + $this->FireEvent('GetCustomAction'); // Interleave $Content = $this->Union('DateInserted', array_merge(array( @@ -248,10 +245,9 @@ public function GetBest($UserID = NULL, $Limit = NULL, $Offset = 0) { $this->JoinCategory($Comments); - $this->EventArguments['Method'] = 'getbest'; $this->EventArguments['UserID'] = $UserID; $this->EventArguments['CustomSections'] = array(); - $this->FireEvent('Content'); + $this->FireEvent('GetCustomBest'); // Interleave $Content = $this->Union('Score', array_merge(array( @@ -302,9 +298,8 @@ public function GetRecent($Limit = NULL, $Offset = 0) { $this->JoinCategory($Comments); - $this->EventArguments['Method'] = 'getrecent'; $this->EventArguments['CustomSections'] = array(); - $this->FireEvent('Content'); + $this->FireEvent('GetCustomRecent'); // Interleave $Content = $this->Union('ReactionDate', array_merge(array( @@ -484,7 +479,7 @@ protected function GetRecord($RecordType, $ID) { $this->EventArguments['Type'] = $RecordType; $this->EventArguments['ID'] = $ID; $this->EventArguments['Record'] = false; - $this->FireEvent('UnknownRecordType'); + $this->FireEvent('GetCustomRecord'); return $this->EventArguments['Record']; } } From 9ed70d7ba6f2f9ba563f0c71980c46a1efb803b8 Mon Sep 17 00:00:00 2001 From: bleistivt Date: Mon, 29 Jun 2015 07:25:45 +0200 Subject: [PATCH 061/111] Rename locale files --- locale/{de-DE/definitions.php => de.php} | 0 locale/{en-CA/definitions.php => en.php} | 0 locale/{pt-BR/definitions.php => pt_BR.php} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename locale/{de-DE/definitions.php => de.php} (100%) rename locale/{en-CA/definitions.php => en.php} (100%) mode change 100755 => 100644 rename locale/{pt-BR/definitions.php => pt_BR.php} (100%) diff --git a/locale/de-DE/definitions.php b/locale/de.php similarity index 100% rename from locale/de-DE/definitions.php rename to locale/de.php diff --git a/locale/en-CA/definitions.php b/locale/en.php old mode 100755 new mode 100644 similarity index 100% rename from locale/en-CA/definitions.php rename to locale/en.php diff --git a/locale/pt-BR/definitions.php b/locale/pt_BR.php similarity index 100% rename from locale/pt-BR/definitions.php rename to locale/pt_BR.php From 6fc27330a430619c6674fed77a41e6857bb7a10b Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 29 Jun 2015 09:24:37 -0500 Subject: [PATCH 062/111] Banned users can't lead. Fixes #95 --- modules/class.leaderboardmodule.php | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/class.leaderboardmodule.php b/modules/class.leaderboardmodule.php index 7f665805d..328f79981 100755 --- a/modules/class.leaderboardmodule.php +++ b/modules/class.leaderboardmodule.php @@ -73,6 +73,7 @@ public function GetData() { ->Select('up.Points as YagaPoints, u.*') ->From('User u') ->Join('UserPoints up', 'u.UserID = up.UserID') + ->Where('u.Banned', 0) ->Where('up.SlotType', $slot) ->Where('up.TimeSlot', gmdate('Y-m-d', Gdn_Statistics::TimeSlotStamp($slot))) ->Where('up.Source', 'Total') From ef297ea19bc71b91a7c2040863027afe64f1e790 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 29 Jun 2015 09:38:46 -0500 Subject: [PATCH 063/111] Update doc block and default to lower-case hook keys. --- library/class.yaga.php | 2 +- library/interface.yagarule.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/class.yaga.php b/library/class.yaga.php index adfcbf15e..f018cb72b 100644 --- a/library/class.yaga.php +++ b/library/class.yaga.php @@ -147,7 +147,7 @@ public static function ExecuteBadgeHooks($Sender, $Handler) { } // Let's us use __FUNCTION__ in the original hook - $Hook = str_ireplace('_Handler', '', $Handler); + $Hook = strtolower(str_ireplace('_Handler', '', $Handler)); $UserID = $Session->UserID; $User = $Session->User; diff --git a/library/interface.yagarule.php b/library/interface.yagarule.php index 62bce7aa2..c61886a83 100644 --- a/library/interface.yagarule.php +++ b/library/interface.yagarule.php @@ -23,8 +23,8 @@ interface YagaRule { public function Award($Sender, $User, $Criteria); /** - * This determines what hook the rule should be checked on. - * @return string The hook name to fire our calculations on + * This determines what hook(s) the rule should be checked on. + * @return array The hook name(s) in lower case to fire our calculations on */ public function Hooks(); From 6cfc1ba5746d68538d558434ca454300768f86a9 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 29 Jun 2015 09:55:20 -0500 Subject: [PATCH 064/111] desensitize those hook names. capital letters lead to oppression --- library/class.yaga.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/library/class.yaga.php b/library/class.yaga.php index f018cb72b..60e8a5a3e 100644 --- a/library/class.yaga.php +++ b/library/class.yaga.php @@ -176,8 +176,10 @@ public static function ExecuteBadgeHooks($Sender, $Handler) { } $Rule = $Rules[$Class]; + // Only check awards for rules that use this hook - if(in_array($Hook, $Rule->Hooks())) { + $Hooks = array_map('strtolower',$Rule->Hooks()); + if(in_array($Hook, $Hooks)) { $Criteria = (object) unserialize($Badge->RuleCriteria); $Result = $Rule->Award($Sender, $User, $Criteria); if($Result) { From d9354b716cca77ed481e71f32317551af4b04f6f Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 29 Jun 2015 09:56:39 -0500 Subject: [PATCH 065/111] Use the full locale code until the switch to 2.2 style convention becomes standard --- locale/{de.php => de-DE.php} | 0 locale/{en.php => en-CA.php} | 0 locale/{pt_BR.php => pt-BR.php} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename locale/{de.php => de-DE.php} (100%) rename locale/{en.php => en-CA.php} (100%) rename locale/{pt_BR.php => pt-BR.php} (100%) diff --git a/locale/de.php b/locale/de-DE.php similarity index 100% rename from locale/de.php rename to locale/de-DE.php diff --git a/locale/en.php b/locale/en-CA.php similarity index 100% rename from locale/en.php rename to locale/en-CA.php diff --git a/locale/pt_BR.php b/locale/pt-BR.php similarity index 100% rename from locale/pt_BR.php rename to locale/pt-BR.php From b1d65d0a5b15e35b15762cc80e4cab08e3b31c02 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 29 Jun 2015 10:09:24 -0500 Subject: [PATCH 066/111] Re-case the hooks for the standard rules --- library/rules/class.awardcombo.php | 2 +- library/rules/class.cakedaypost.php | 2 +- library/rules/class.commentcount.php | 2 +- library/rules/class.commentmarathon.php | 2 +- library/rules/class.discussionbodylength.php | 2 +- library/rules/class.discussioncategory.php | 2 +- library/rules/class.discussioncount.php | 2 +- library/rules/class.discussionpagecount.php | 2 +- library/rules/class.hasmentioned.php | 2 +- library/rules/class.holidayvisit.php | 2 +- library/rules/class.lengthofservice.php | 2 +- library/rules/class.necropost.php | 2 +- library/rules/class.newbiecomment.php | 2 +- library/rules/class.photoexists.php | 2 +- library/rules/class.postcount.php | 2 +- library/rules/class.postreactions.php | 2 +- library/rules/class.qnaanswercount.php | 2 +- library/rules/class.reactioncount.php | 2 +- library/rules/class.reflexcomment.php | 2 +- library/rules/class.socialconnection.php | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/library/rules/class.awardcombo.php b/library/rules/class.awardcombo.php index a3d177b39..07de8c7d8 100644 --- a/library/rules/class.awardcombo.php +++ b/library/rules/class.awardcombo.php @@ -61,7 +61,7 @@ public function Validate($Criteria, $Form) { } public function Hooks() { - return array('BadgeAwardModel_AfterBadgeAward'); + return array('badgeAwardModel_afterBadgeAward'); } public function Description() { diff --git a/library/rules/class.cakedaypost.php b/library/rules/class.cakedaypost.php index 41ff59c4d..c68c11657 100644 --- a/library/rules/class.cakedaypost.php +++ b/library/rules/class.cakedaypost.php @@ -37,7 +37,7 @@ public function Validate($Criteria, $Form) { } public function Hooks() { - return array('DiscussionModel_AfterSaveDiscussion', 'CommentModel_AfterSaveComment', 'ActivityModel_BeforeSaveComment'); + return array('discussionModel_afterSaveDiscussion', 'commentModel_afterSaveComment', 'activityModel_beforeSaveComment'); } public function Description() { diff --git a/library/rules/class.commentcount.php b/library/rules/class.commentcount.php index 207917216..8daa48deb 100644 --- a/library/rules/class.commentcount.php +++ b/library/rules/class.commentcount.php @@ -55,7 +55,7 @@ public function Validate($Criteria, $Form) { $Form->SetValidationResults($Validation->Results()); } public function Hooks() { - return array('Gdn_Dispatcher_AppStartup'); + return array('gdn_dispatcher_appStartup'); } public function Description() { diff --git a/library/rules/class.commentmarathon.php b/library/rules/class.commentmarathon.php index b0d321fd5..3ba349f2b 100644 --- a/library/rules/class.commentmarathon.php +++ b/library/rules/class.commentmarathon.php @@ -55,7 +55,7 @@ public function Validate($Criteria, $Form) { } public function Hooks() { - return array('CommentModel_AfterSaveComment'); + return array('commentModel_afterSaveComment'); } public function Description() { diff --git a/library/rules/class.discussionbodylength.php b/library/rules/class.discussionbodylength.php index 1039df8dc..cefb7cb8a 100644 --- a/library/rules/class.discussionbodylength.php +++ b/library/rules/class.discussionbodylength.php @@ -35,7 +35,7 @@ public function Validate($Criteria, $Form) { } public function Hooks() { - return array('DiscussionModel_AfterSaveDiscussion'); + return array('discussionModel_afterSaveDiscussion'); } public function Description() { diff --git a/library/rules/class.discussioncategory.php b/library/rules/class.discussioncategory.php index dcdbd8df5..2606876de 100644 --- a/library/rules/class.discussioncategory.php +++ b/library/rules/class.discussioncategory.php @@ -33,7 +33,7 @@ public function Validate($Criteria, $Form) { } public function Hooks() { - return array('DiscussionModel_AfterSaveDiscussion'); + return array('discussionModel_afterSaveDiscussion'); } public function Description() { diff --git a/library/rules/class.discussioncount.php b/library/rules/class.discussioncount.php index af725efc4..4dce60b00 100644 --- a/library/rules/class.discussioncount.php +++ b/library/rules/class.discussioncount.php @@ -56,7 +56,7 @@ public function Validate($Criteria, $Form) { } public function Hooks() { - return array('Gdn_Dispatcher_AppStartup'); + return array('gdn_dispatcher_appStartup'); } public function Description() { diff --git a/library/rules/class.discussionpagecount.php b/library/rules/class.discussionpagecount.php index c9ff084a2..dc3cd3dbd 100644 --- a/library/rules/class.discussionpagecount.php +++ b/library/rules/class.discussionpagecount.php @@ -38,7 +38,7 @@ public function Validate($Criteria, $Form) { } public function Hooks() { - return array('CommentModel_BeforeNotification'); + return array('commentModel_beforeNotification'); } public function Description() { diff --git a/library/rules/class.hasmentioned.php b/library/rules/class.hasmentioned.php index c6500127b..5392c6691 100644 --- a/library/rules/class.hasmentioned.php +++ b/library/rules/class.hasmentioned.php @@ -29,7 +29,7 @@ public function Validate($Criteria, $Form) { } public function Hooks() { - return array('CommentModel_BeforeNotification', 'DiscussionModel_BeforeNotification'); + return array('commentModel_beforeNotification', 'discussionModel_beforeNotification'); } public function Description() { diff --git a/library/rules/class.holidayvisit.php b/library/rules/class.holidayvisit.php index 0e712b4d6..accaedd9c 100644 --- a/library/rules/class.holidayvisit.php +++ b/library/rules/class.holidayvisit.php @@ -48,7 +48,7 @@ public function Validate($Criteria, $Form) { } public function Hooks() { - return array('Gdn_Dispatcher_AppStartup'); + return array('gdn_dispatcher_appStartup'); } public function Description() { diff --git a/library/rules/class.lengthofservice.php b/library/rules/class.lengthofservice.php index 85ad30469..5f6d4c950 100644 --- a/library/rules/class.lengthofservice.php +++ b/library/rules/class.lengthofservice.php @@ -43,7 +43,7 @@ public function Validate($Criteria, $Form) { } public function Hooks() { - return array('Gdn_Dispatcher_AppStartup'); + return array('gdn_dispatcher_appStartup'); } public function Description() { diff --git a/library/rules/class.necropost.php b/library/rules/class.necropost.php index 5a82c7a80..01344f6e3 100644 --- a/library/rules/class.necropost.php +++ b/library/rules/class.necropost.php @@ -50,7 +50,7 @@ public function Validate($Criteria, $Form) { } public function Hooks() { - return array('CommentModel_AfterSaveComment'); + return array('commentModel_afterSaveComment'); } public function Description() { diff --git a/library/rules/class.newbiecomment.php b/library/rules/class.newbiecomment.php index 86606fa80..f9d1cbdab 100644 --- a/library/rules/class.newbiecomment.php +++ b/library/rules/class.newbiecomment.php @@ -63,7 +63,7 @@ public function Validate($Criteria, $Form) { } public function Hooks() { - return array('CommentModel_BeforeNotification'); + return array('commentModel_beforeNotification'); } public function Description() { diff --git a/library/rules/class.photoexists.php b/library/rules/class.photoexists.php index 0f4bbbe2c..c5a22b15e 100644 --- a/library/rules/class.photoexists.php +++ b/library/rules/class.photoexists.php @@ -27,7 +27,7 @@ public function Validate($Criteria, $Form) { } public function Hooks() { - return array('Gdn_Dispatcher_AppStartup'); + return array('gdn_dispatcher_appStartup'); } public function Description() { diff --git a/library/rules/class.postcount.php b/library/rules/class.postcount.php index 6a3a55e07..22304b94a 100644 --- a/library/rules/class.postcount.php +++ b/library/rules/class.postcount.php @@ -57,7 +57,7 @@ public function Validate($Criteria, $Form) { } public function Hooks() { - return array('Gdn_Dispatcher_AppStartup'); + return array('gdn_dispatcher_appStartup'); } public function Description() { diff --git a/library/rules/class.postreactions.php b/library/rules/class.postreactions.php index 85170e123..e57c87eb3 100644 --- a/library/rules/class.postreactions.php +++ b/library/rules/class.postreactions.php @@ -78,7 +78,7 @@ public function Validate($Criteria, $Form) { } public function Hooks() { - return array('ReactionModel_AfterReactionSave'); + return array('reactionModel_afterReactionSave'); } public function Description() { diff --git a/library/rules/class.qnaanswercount.php b/library/rules/class.qnaanswercount.php index 278fa4a38..26039f3e0 100644 --- a/library/rules/class.qnaanswercount.php +++ b/library/rules/class.qnaanswercount.php @@ -55,7 +55,7 @@ public function Validate($Criteria, $Form) { $Form->SetValidationResults($Validation->Results()); } public function Hooks() { - return array('Gdn_Dispatcher_AppStartup'); + return array('gdn_dispatcher_appStartup'); } public function Description() { diff --git a/library/rules/class.reactioncount.php b/library/rules/class.reactioncount.php index e6081fbb1..3397d5b29 100644 --- a/library/rules/class.reactioncount.php +++ b/library/rules/class.reactioncount.php @@ -52,7 +52,7 @@ public function Validate($Criteria, $Form) { } public function Hooks() { - return array('ReactionModel_AfterReactionSave'); + return array('reactionModel_afterReactionSave'); } public function Description() { diff --git a/library/rules/class.reflexcomment.php b/library/rules/class.reflexcomment.php index 3d6f0d929..cf3b65669 100644 --- a/library/rules/class.reflexcomment.php +++ b/library/rules/class.reflexcomment.php @@ -45,7 +45,7 @@ public function Validate($Criteria, $Form) { } public function Hooks() { - return array('CommentModel_BeforeNotification'); + return array('commentModel_beforeNotification'); } public function Description() { diff --git a/library/rules/class.socialconnection.php b/library/rules/class.socialconnection.php index b72145761..36a0d050b 100644 --- a/library/rules/class.socialconnection.php +++ b/library/rules/class.socialconnection.php @@ -40,7 +40,7 @@ public function Validate($Criteria, $Form) { } public function Hooks() { - return array('Base_AfterConnection'); + return array('base_afterConnection'); } public function Description() { From b1dd59db4d35d3857eeb4e9098ddd0c648da16c8 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Mon, 29 Jun 2015 13:27:39 -0500 Subject: [PATCH 067/111] Order matters for the array + operator. This seems intuitively stupid. --- library/functions.render.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/functions.render.php b/library/functions.render.php index bdffb05a5..a7f4aeeec 100644 --- a/library/functions.render.php +++ b/library/functions.render.php @@ -141,7 +141,7 @@ function RenderPerkConfigurationForm($Config, $Label, $Options = NULL) { ); } // Add a default option - $Options = $Options + array('' => T('Default')); + $Options = array('' => T('Default')) + $Options; $Form = Gdn::Controller()->Form; $Fieldname = 'Conf' . $Config; From f683ae08f723da7b89cf5bb3a5c04a6f5af89419 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Fri, 14 Aug 2015 07:22:31 -0500 Subject: [PATCH 068/111] Add French translation. Thanks MrVlad! --- locale/fr.php | 225 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 225 insertions(+) create mode 100644 locale/fr.php diff --git a/locale/fr.php b/locale/fr.php new file mode 100644 index 000000000..15059e15f --- /dev/null +++ b/locale/fr.php @@ -0,0 +1,225 @@ +{Data.Name,text}.'; +$Definition['Yaga.Badge.Edit'] = 'Editer le badge'; +$Definition['Yaga.Badge.GiveTo'] = 'Attribuer le badge à %s'; +$Definition['Yaga.Badge.PhotoDeleted'] = 'L\'image du badge à été supprimée.'; +$Definition['Yaga.Badge.Reason'] = 'Raison (optionnel)'; +$Definition['Yaga.Badge.RecentRecipients'] = 'Derniers détenteurs'; +$Definition['Yaga.Badge.Updated'] = 'Badge mis à jour avec succès !'; +$Definition['Yaga.Badge.View'] = 'Voir le badge: '; +$Definition['Yaga.Badges'] = 'Badges'; +$Definition['Yaga.Badges.All'] = 'Tous les badges'; +$Definition['Yaga.Badges.Desc'] = 'Les badges sont remis aux utilisateurs qui remplissent les critères définis par les règles. Ils sont ajoutés à leur profil et leur accordent des points. Ils peuvent ainsi être utilisés pour créer un système de récompenses qui favorisent les comportements vertueux.'; +$Definition['Yaga.Badges.Manage'] = 'Gérer les badges'; +$Definition['Yaga.Badges.Mine'] = 'Mes badges'; +$Definition['Yaga.Badges.Notify'] = 'Me notifier quand je reçois un badge.'; +$Definition['Yaga.Badges.Settings.Desc'] = 'Içi, vous pouvez gérer la liste des badges. Les badges désactivés ne seront pas assignés automatiquement.'; +$Definition['Yaga.Badges.Use'] = 'Utiliser les badges'; + +// Meilleur contenu +$Definition['Yaga.BestContent'] = 'Meilleur contenu ...'; +$Definition['Yaga.BestContent.Action'] = 'Les contenus "%s" '; +$Definition['Yaga.BestContent.AllTime'] = 'Le meilleur contenu de tous les temps !'; +$Definition['Yaga.BestContent.Recent'] = 'Les meilleurs commentaires réçents'; + +// Erreurs +$Definition['Yaga.Error.AddFile'] ='Impossible d\'ajouter le fichier: %s'; +$Definition['Yaga.Error.ArchiveChecksum'] = 'L\Archive semble corrompu: l\'empreinte est invalide.'; +$Definition['Yaga.Error.ArchiveCreate'] = 'Impossible de créer l\'archive: %s'; +$Definition['Yaga.Error.ArchiveExtract'] = 'Impossible d\'extraire le fichier.'; +$Definition['Yaga.Error.ArchiveOpen'] = 'Impossible d\'ouvrir l\'archive.'; +$Definition['Yaga.Error.ArchiveSave'] = 'Impossible de sauvegarder l\'archive: %s'; +$Definition['Yaga.Error.DeleteFailed'] = 'Impossible de supprimer %s'; +$Definition['Yaga.Error.FileDNE'] = 'Le fichier n\'existe pas.'; +$Definition['Yaga.Error.Includes'] = 'Vous devez selectionnez au moins un item à transporter.'; +$Definition['Yaga.Error.NeedJS'] = 'Ceci doit être fait via Javascript'; +$Definition['Yaga.Error.NoActions'] = 'Il n\y a pas d\'actions définies.'; +$Definition['Yaga.Error.NoBadges'] = 'Vous ne pouvez pas attribuer de badges sans en avoir défini.'; +$Definition['Yaga.Error.NoRanks'] = 'Vous ne pouvez pas promouvoir un utilisateur sans avoir créé de rang.'; +$Definition['Yaga.Error.NoRules'] = 'Vous ne pouvez pas ajoutez ou éditer les badges sans avoir défini des règles !'; +$Definition['Yaga.Error.ReactToOwn'] = 'Vous ne pouvez pas réagir à votre propre contenu.'; +$Definition['Yaga.Error.Rule404'] = 'Règle non trouvée.'; +$Definition['Yaga.Error.TransportCopy'] = 'Impossible de copier le fichier image.'; +$Definition['Yaga.Error.TransportRequirements'] = 'Il semble que vous n\'avez pas tous les pré-requis pour transporter uneconfiguration Yaga automatiquement. Référez vous au manuel "manual_transport.md" pour plus d\'information.'; + +// Leader Board +$Definition['Yaga.LeaderBoard.AllTime'] = 'Les plus décorés'; +$Definition['Yaga.LeaderBoard.Max'] = 'Maximum de membres sur le leaderboard'; +$Definition['Yaga.LeaderBoard.Month'] = "Les plus décorés ce mois-ci"; +$Definition['Yaga.LeaderBoard.Use'] = 'Afficher le leaderboard sur la page d\'activité'; +$Definition['Yaga.LeaderBoard.Week'] = "Les plus décorés cette semaine"; +$Definition['Yaga.LeaderBoard.Year'] = "Les plus décorés cette année"; + +// Titres +$Definition['Yaga.Perks'] = 'Titres'; +$Definition['Yaga.Perks.Curation'] = 'Opération'; +$Definition['Yaga.Perks.EditTimeout'] = 'Durée effective'; +$Definition['Yaga.Perks.Emoticons'] = 'Formatter les émoticônes'; +$Definition['Yaga.Perks.MeActions'] = 'Format /me Actions'; +$Definition['Yaga.Perks.Signatures'] = 'Éditer la signature'; +$Definition['Yaga.Perks.Tags'] = 'Ajouter des tags'; + +// Rangs +$Definition['Yaga.Rank'] = 'Rang'; +$Definition['Yaga.Rank.Add'] = 'Ajouter un rang'; +$Definition['Yaga.Rank.Added'] = 'Rang ajouté avec succès !'; +$Definition['Yaga.Rank.Delete'] = 'Supprimer le rang'; +$Definition['Yaga.Rank.Edit'] = 'Éditer le rang'; +$Definition['Yaga.Rank.Photo.Desc'] = 'Cette image sera affichée sur le fil d\'activité et dans les notifications concernant les promotions.'; +$Definition['Yaga.Rank.PhotoDeleted'] = 'La photo de rang a été supprimée.'; +$Definition['Yaga.Rank.PhotoUploaded'] = 'La photo de rang à été mise en ligne avec succès !'; +$Definition['Yaga.Rank.Progression'] = 'Progression'; +$Definition['Yaga.Rank.Progression.Desc'] = 'Autoriser les utilisateurs à progresser automatiquement après ce rang.'; +$Definition['Yaga.Rank.Promote'] = 'Editer le rang'; +$Definition['Yaga.Rank.Promote.Format'] = "Editer le rang de %s"; +$Definition['Yaga.Rank.PromotedHeadlineFormat'] = '{ActivityUserID,You} avez été oromu au rang de {Data.Name,text}.'; +$Definition['Yaga.Rank.RecordActivity'] = 'Enregistrer cette opération d\'édition dans le fil d\'activité public.'; +$Definition['Yaga.Rank.Updated'] = 'Rangs mis à jour avec succès !'; +$Definition['Yaga.Ranks'] = 'Rangs'; +$Definition['Yaga.Ranks.AgeReq'] = 'Age requis'; +$Definition['Yaga.Ranks.Desc'] = "Les rangs sont attribués aux utilisateurs suivant l'âge de leur compte, les points accumulés, et le nombre total de posts. Chaque Ranks have associated perks that can be used to alter the user's experience."; +$Definition['Yaga.Ranks.Manage'] = 'Gérer les rangs'; +$Definition['Yaga.Ranks.Notify'] = 'Me notifier quand je suis promu.'; +$Definition['Yaga.Ranks.PointsReq'] = 'Points requis'; +$Definition['Yaga.Ranks.PostsReq'] = 'Commentaires requis'; +$Definition['Yaga.Ranks.RequiredAgeDNC'] = 'L\'âge du compte n\'importe pas'; +$Definition['Yaga.Ranks.RequiredAgeFormat'] = 'Le compte doit être plus vieux que %s.'; +$Definition['Yaga.Ranks.Settings.Desc'] = 'Içi, ous pouvez gérer les rangs disponibles.You can manage the available ranks here. Les rangs désactivés ne seont pas attribués automatiquement. Faites glissers les items pour modifier leur classement.'; +$Definition['Yaga.Ranks.Use'] = 'Utiliser les rangs'; + +// Rules +$Definition['Yaga.Rules.AwardCombo'] = 'Combo de récompenses'; +$Definition['Yaga.Rules.AwardCombo.Criteria.Head'] = 'Nombre de badges différents'; +$Definition['Yaga.Rules.AwardCombo.Desc'] = 'Attribuer ce badge si le nombre de badges uniques reçu par l\'utilisateur atteint ou dépasse celui spécifié, dans l\'intervalle de temps défini.'; +$Definition['Yaga.Rules.CakeDayPost'] = 'Commenter le jour de son anniversaire'; +$Definition['Yaga.Rules.CakeDayPost.Desc'] = 'Attribuer ce badge si l\'utilisateur poste un commentaire le jour de son anniversaire.'; +$Definition['Yaga.Rules.CommentCount'] = 'Nombre total de commentaires'; +$Definition['Yaga.Rules.CommentCount.Criteria.Head'] = 'Total des commentaires'; +$Definition['Yaga.Rules.CommentCount.Desc'] = 'Attribuer ce badge si l\'utilisateur atteint ou dépasse le nombre de commentaires spécifié.'; +$Definition['Yaga.Rules.CommentMarathon'] = 'Marathon de commentaires'; +$Definition['Yaga.Rules.CommentMarathon.Criteria.Head'] = 'Nombre de commentaires'; +$Definition['Yaga.Rules.CommentMarathon.Desc'] = 'Attibuer ce badge si l\'utilisateur a rédigé un nombre de commentaires supérieur ou égal à celui spécifié, dans l\'intervalle de temps défini.'; +$Definition['Yaga.Rules.DiscussionBodyLength'] = 'Longueur de post'; +$Definition['Yaga.Rules.DiscussionBodyLength.Criteria.Head'] = 'Combien de caractères ?'; +$Definition['Yaga.Rules.DiscussionBodyLength.Desc'] = 'Attribuer ce badge si l\'utilisateur possède une disccussion qui atteint le nombre de caractère spécifiés. Régler ce nombre de manière à ce qu\'il soit inférieur à %s.'; +$Definition['Yaga.Rules.DiscussionCategory'] = 'Discussion dans la catégorie'; +$Definition['Yaga.Rules.DiscussionCategory.Criteria.Head'] = 'Selectionner une catégorie :'; +$Definition['Yaga.Rules.DiscussionCategory.Desc'] = 'Attribuer ce badge si l\'utilisateur possède une discussion dans la catégorie spécifiée.'; +$Definition['Yaga.Rules.DiscussionCount'] = 'Nombre total de discussions'; +$Definition['Yaga.Rules.DiscussionCount.Criteria.Head'] = 'Nombre total de discussions'; +$Definition['Yaga.Rules.DiscussionCount.Desc'] = 'Attibuer ce badge si le nombre total de discussion que l\'utilisateur à crée atteint le nombre spécifié.'; +$Definition['Yaga.Rules.DiscussionPageCount'] = 'Nombre de pages dans la discussion'; +$Definition['Yaga.Rules.DiscussionPageCount.Criteria.Head'] = 'Combien de pages ?'; +$Definition['Yaga.Rules.DiscussionPageCount.Desc'] = 'Attribuer ce badge si l\'utilsateur possède une discussion dont le nombre de page atteint celui spécifié.'; +$Definition['Yaga.Rules.HasMentioned'] = 'Mention'; +$Definition['Yaga.Rules.HasMentioned.Desc'] = 'Attribuer ce badge si l\'utilisateur mentionne quelqu\'un. Les mentions sont de la forme `@nom`.'; +$Definition['Yaga.Rules.HolidayVisit'] = 'Visite pendant les vacances'; +$Definition['Yaga.Rules.HolidayVisit.Criteria.Head'] = 'Date des vacances'; +$Definition['Yaga.Rules.HolidayVisit.Desc'] = 'Attribuer le badge si l\'utilisateur visite le forum durant le jour de l\'année spécifié.'; +$Definition['Yaga.Rules.LengthOfService'] = 'Temps de service'; +$Definition['Yaga.Rules.LengthOfService.Criteria.Head'] = 'Time Served'; +$Definition['Yaga.Rules.LengthOfService.Desc'] = "Award this badge if the user's account is older than the specified number of days, weeks, or years."; +$Definition['Yaga.Rules.ManualAward'] = 'Attribution manuelle'; +$Definition['Yaga.Rules.ManualAward.Desc'] = 'Ce badge ne sera jamais attribué automatiquement. Utiliser cette méthode pour les badges à attribuer manuellement.'; +$Definition['Yaga.Rules.NecroPost'] = 'Commenter une discussion morte.'; +$Definition['Yaga.Rules.NecroPost.Criteria.Head'] = 'Quelle durée avant de considérer une discussion comme morte ?'; +$Definition['Yaga.Rules.NecroPost.Desc'] = 'Attribuer ce badge pour tout commentaire sur une discussion morte'; +$Definition['Yaga.Rules.NewbieComment'] = "Commenter une discussion d'un nouvel utilisateur"; +$Definition['Yaga.Rules.NewbieComment.Criteria.Head'] = 'Ancienneté de l\'utilisateur'; +$Definition['Yaga.Rules.NewbieComment.Desc'] = 'Attribuer ce badge si le commenatire est placé dans la discussion d\'un nouvel utilisateur.'; +$Definition['Yaga.Rules.PhotoExists'] = 'L\'utilisateur à une photo de profil'; +$Definition['Yaga.Rules.PhotoExists.Desc'] = 'Attribuer ce badge si l\'utilisateur a ujouté une photo de profil.'; +$Definition['Yaga.Rules.PostCount'] = 'Nombre total de commentaires'; +$Definition['Yaga.Rules.PostCount.Criteria.Head'] = 'Nombre total de commentaires'; +$Definition['Yaga.Rules.PostCount.Desc'] = 'Attribuer ce badge si le nombre total de disuccions/commentaires de l\'utilisateur atteint ou dépasse le nombre fixé.'; +$Definition['Yaga.Rules.PostReactions'] = 'Nombre de réactions à des commentaires'; +$Definition['Yaga.Rules.PostReactions.Criteria.Head'] = 'Nombre de réactions'; +$Definition['Yaga.Rules.PostReactions.Desc'] = 'Attribuer ce badge si l\'utilisateur possède un commentaire avec la réaction spécifiée.'; +$Definition['Yaga.Rules.PostReactions.LabelFormat'] = "# of %s's:"; +$Definition['Yaga.Rules.QnAAnserCount'] = 'Réponses acceptées (Plugin QnA requis)'; +$Definition['Yaga.Rules.QnAAnserCount.Criteria.Head'] = 'Combien de réponses acceptées ?'; +$Definition['Yaga.Rules.QnAAnserCount.Desc'] = 'Attribuer le badge si l\'utilisateur Award this badge if the user has accepted answers that fit the criteria.'; +$Definition['Yaga.Rules.ReactionCount'] = 'Nombre total de réactions'; +$Definition['Yaga.Rules.ReactionCount.Criteria.Head'] = 'Nombre total de réactions'; +$Definition['Yaga.Rules.ReactionCount.Desc'] = 'Attribuer ce badge si l\'utilsateur à reçu un nombre total x de réactions du type spécifié.'; +$Definition['Yaga.Rules.ReflexComment'] = 'Commenter une nouvelle discussion rapidement'; +$Definition['Yaga.Rules.ReflexComment.Criteria.Head'] = 'Temps en secondes mis pour commenter'; +$Definition['Yaga.Rules.ReflexComment.Desc'] = "Attribuer ce badge si un commentaire est posté x secondes après la création de la discussion."; +$Definition['Yaga.Rules.SocialConnection'] = 'Connection aux réseaux sociaux'; +$Definition['Yaga.Rules.SocialConnection.Criteria.Head'] = 'Quel réseau social ?'; +$Definition['Yaga.Rules.SocialConnection.Desc'] = 'Attribuer se badge quand l\'utilisateur se connecte au réseau social spécifié.'; + +// Transport +$Definition['Yaga.Export'] = 'Exporter une configuration Yaga'; +$Definition['Yaga.Export.Desc'] = 'Vous pouvez exporter votre configuration Yaga pour la sauvegarder ou la transporter. Selectionnez les parties de cette configuration que vous voulez exporter.'; +$Definition['Yaga.Export.Success'] = 'Votre configuration Yaga a été exporter dans le fichier: %s'; +$Definition['Yaga.Import'] = 'Importer une configuration Yaga'; +$Definition['Yaga.Import.Desc'] = 'Vous pouvez importer une configuration Yaga pour remplacer votre configuration actuelle. Selectionner les sections de votre configuration actuelle qui doivent être remplacées.'; +$Definition['Yaga.Import.Success'] = 'Vous avez remplacé votre configuration Yaga avec le contenu de : %s'; +$Definition['Yaga.Transport'] = 'Importer / Exporter une configuration'; +$Definition['Yaga.Transport.Desc'] = 'Vous pouvez utiliser ces outils pour faciliter le transport de votre configuration Yaga entre vos différents sites par un simple transfert de fichier.'; +$Definition['Yaga.Transport.File'] = 'Fichier de transport Yaga'; +$Definition['Yaga.Transport.Return'] = 'Retour à la page principale des réglages Yaga.'; From 98df0715447cd5441644b60ca228b6cbd97b0d44 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Fri, 14 Aug 2015 08:10:29 -0500 Subject: [PATCH 069/111] Add a space between "earned" and date Closes #103 Thanks @austins --- views/yaga/badgedetail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/yaga/badgedetail.php b/views/yaga/badgedetail.php index e329a3edf..0232c0a5c 100644 --- a/views/yaga/badgedetail.php +++ b/views/yaga/badgedetail.php @@ -18,7 +18,7 @@ if($UserBadgeAward) { echo Wrap( UserPhoto(Gdn::Session()->User) . - T('Yaga.Badge.Earned') . + T('Yaga.Badge.Earned') . ' ' . Wrap(Gdn_Format::Date($UserBadgeAward->DateInserted, 'html'), 'span', array('class' => 'DateReceived')), 'div', array('class' => 'EarnedThisBadge')); From 9a8986cf747822c83f5c579aa71e1f8312cbc658 Mon Sep 17 00:00:00 2001 From: bleistivt Date: Tue, 18 Aug 2015 23:06:40 +0200 Subject: [PATCH 070/111] NecroPost: Check for existence of DateLastComment This fixes a bug where this badge will be awarded if no DateLastComment is set. --- library/rules/class.necropost.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/rules/class.necropost.php b/library/rules/class.necropost.php index 01344f6e3..31665adf8 100644 --- a/library/rules/class.necropost.php +++ b/library/rules/class.necropost.php @@ -19,7 +19,7 @@ public function Award($Sender, $User, $Criteria) { $Discussion = $DiscussionModel->GetID($DiscussionID); $LastCommentDate = strtotime($Discussion->DateLastComment); - if($LastCommentDate < $NecroDate) { + if($Discussion->DateLastComment && $LastCommentDate < $NecroDate) { return TRUE; } else { From 3045d15a5404dd92814a09b0785eb4f14154ea3e Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Fri, 21 Aug 2015 08:01:29 -0500 Subject: [PATCH 071/111] Update French locale Thanks @MrVlad! --- locale/fr.php | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/locale/fr.php b/locale/fr.php index 15059e15f..6964ea7a5 100644 --- a/locale/fr.php +++ b/locale/fr.php @@ -17,8 +17,8 @@ $Definition['Image Files'] = 'Fichiers images'; $Definition['Image'] = 'Image'; $Definition['Less than:'] = 'Moins de:'; -$Definition['More than or:'] = 'Supérieur ou égal à :'; -$Definition['More than:'] = 'Supérieur à :'; +$Definition['More than or:'] = 'Supérieur ou égal à:'; +$Definition['More than:'] = 'Supérieur à:'; $Definition['Photo'] = 'Photo'; $Definition['Rule'] = 'Règle'; $Definition['Time Frame'] = 'Écart temporel'; @@ -38,7 +38,7 @@ $Definition['Yaga.Action.InvalidTargetType'] = 'Cible invalide !'; $Definition['Yaga.Action.Move'] = 'Déplacer les %s réactions?'; $Definition['Yaga.Action.PermDesc'] = "Un utilisateur aura besoin des permissions suivantes pour utiliser cette action. la permission par defaut est 'Yaga.Reactions.Add'."; -$Definition['Yaga.ActionUpdated'] = 'Action mis à jour !'; +$Definition['Yaga.ActionUpdated'] = 'Action mis à jour !'; $Definition['Yaga.Actions.Current'] = 'Actions actuelles'; $Definition['Yaga.Actions.Desc'] = "Les actions sont affichées au dessous des contenus générés par les utilisateurs, comme des discussion, commentaires ou posts d'activités. Les autres utilisateurs peuvent réagir en choisissant une 'réaction' parmi celles proposées. L'auteur du contenu se verra crédité des points définis par les règles, selon le type de réaction. Ceci permet d'entretenir une volonté de qualité de rédaction pour les utilisateurs."; $Definition['Yaga.Actions.Manage'] = 'Gérer les actions'; @@ -53,7 +53,7 @@ $Definition['Yaga.Badge'] = 'Badge'; $Definition['Yaga.Badge.Add'] = 'Ajouter un badge'; $Definition['Yaga.Badge.Added'] = 'Badge ajouté avec succès !'; -$Definition['Yaga.Badge.AlreadyAwarded'] = '%s a déjà ce badge !'; +$Definition['Yaga.Badge.AlreadyAwarded'] = '%s a déjà ce badge !'; $Definition['Yaga.Badge.Award'] = 'Attribuer le badge'; $Definition['Yaga.Badge.Delete'] = 'Supprimer le badge'; $Definition['Yaga.Badge.DetailLink'] = 'Voir les statistiques de ce badge'; @@ -64,15 +64,15 @@ $Definition['Yaga.Badge.EarnedBySingle'] = '%s personne a reçu badge.'; $Definition['Yaga.Badge.EarnedHeadlineFormat'] = '{ActivityUserID,You} avez reçu le badge {Data.Name,text}.'; $Definition['Yaga.Badge.Edit'] = 'Editer le badge'; -$Definition['Yaga.Badge.GiveTo'] = 'Attribuer le badge à %s'; -$Definition['Yaga.Badge.PhotoDeleted'] = 'L\'image du badge à été supprimée.'; +$Definition['Yaga.Badge.GiveTo'] = 'Attribuer le badge à %s'; +$Definition['Yaga.Badge.PhotoDeleted'] = 'L\'image du badge à été supprimée.'; $Definition['Yaga.Badge.Reason'] = 'Raison (optionnel)'; $Definition['Yaga.Badge.RecentRecipients'] = 'Derniers détenteurs'; -$Definition['Yaga.Badge.Updated'] = 'Badge mis à jour avec succès !'; +$Definition['Yaga.Badge.Updated'] = 'Badge mis à jour avec succès !'; $Definition['Yaga.Badge.View'] = 'Voir le badge: '; $Definition['Yaga.Badges'] = 'Badges'; $Definition['Yaga.Badges.All'] = 'Tous les badges'; -$Definition['Yaga.Badges.Desc'] = 'Les badges sont remis aux utilisateurs qui remplissent les critères définis par les règles. Ils sont ajoutés à leur profil et leur accordent des points. Ils peuvent ainsi être utilisés pour créer un système de récompenses qui favorisent les comportements vertueux.'; +$Definition['Yaga.Badges.Desc'] = 'Les badges sont remis aux utilisateurs qui remplissent les critères définis par les règles. Ils sont ajoutés à leur profil et leur accordent des points. Ils peuvent ainsi être utilisés pour créer un système de récompenses qui favorisent les comportements vertueux.'; $Definition['Yaga.Badges.Manage'] = 'Gérer les badges'; $Definition['Yaga.Badges.Mine'] = 'Mes badges'; $Definition['Yaga.Badges.Notify'] = 'Me notifier quand je reçois un badge.'; @@ -94,13 +94,13 @@ $Definition['Yaga.Error.ArchiveSave'] = 'Impossible de sauvegarder l\'archive: %s'; $Definition['Yaga.Error.DeleteFailed'] = 'Impossible de supprimer %s'; $Definition['Yaga.Error.FileDNE'] = 'Le fichier n\'existe pas.'; -$Definition['Yaga.Error.Includes'] = 'Vous devez selectionnez au moins un item à transporter.'; +$Definition['Yaga.Error.Includes'] = 'Vous devez selectionnez au moins un item à transporter.'; $Definition['Yaga.Error.NeedJS'] = 'Ceci doit être fait via Javascript'; $Definition['Yaga.Error.NoActions'] = 'Il n\y a pas d\'actions définies.'; $Definition['Yaga.Error.NoBadges'] = 'Vous ne pouvez pas attribuer de badges sans en avoir défini.'; $Definition['Yaga.Error.NoRanks'] = 'Vous ne pouvez pas promouvoir un utilisateur sans avoir créé de rang.'; $Definition['Yaga.Error.NoRules'] = 'Vous ne pouvez pas ajoutez ou éditer les badges sans avoir défini des règles !'; -$Definition['Yaga.Error.ReactToOwn'] = 'Vous ne pouvez pas réagir à votre propre contenu.'; +$Definition['Yaga.Error.ReactToOwn'] = 'Vous ne pouvez pas réagir à votre propre contenu.'; $Definition['Yaga.Error.Rule404'] = 'Règle non trouvée.'; $Definition['Yaga.Error.TransportCopy'] = 'Impossible de copier le fichier image.'; $Definition['Yaga.Error.TransportRequirements'] = 'Il semble que vous n\'avez pas tous les pré-requis pour transporter uneconfiguration Yaga automatiquement. Référez vous au manuel "manual_transport.md" pour plus d\'information.'; @@ -118,7 +118,7 @@ $Definition['Yaga.Perks.Curation'] = 'Opération'; $Definition['Yaga.Perks.EditTimeout'] = 'Durée effective'; $Definition['Yaga.Perks.Emoticons'] = 'Formatter les émoticônes'; -$Definition['Yaga.Perks.MeActions'] = 'Format /me Actions'; +$Definition['Yaga.Perks.MeActions'] = 'Formatter les réactions personnelles'; $Definition['Yaga.Perks.Signatures'] = 'Éditer la signature'; $Definition['Yaga.Perks.Tags'] = 'Ajouter des tags'; @@ -130,14 +130,14 @@ $Definition['Yaga.Rank.Edit'] = 'Éditer le rang'; $Definition['Yaga.Rank.Photo.Desc'] = 'Cette image sera affichée sur le fil d\'activité et dans les notifications concernant les promotions.'; $Definition['Yaga.Rank.PhotoDeleted'] = 'La photo de rang a été supprimée.'; -$Definition['Yaga.Rank.PhotoUploaded'] = 'La photo de rang à été mise en ligne avec succès !'; +$Definition['Yaga.Rank.PhotoUploaded'] = 'La photo de rang à été mise en ligne avec succès !'; $Definition['Yaga.Rank.Progression'] = 'Progression'; -$Definition['Yaga.Rank.Progression.Desc'] = 'Autoriser les utilisateurs à progresser automatiquement après ce rang.'; +$Definition['Yaga.Rank.Progression.Desc'] = 'Autoriser les utilisateurs à progresser automatiquement après ce rang.'; $Definition['Yaga.Rank.Promote'] = 'Editer le rang'; $Definition['Yaga.Rank.Promote.Format'] = "Editer le rang de %s"; $Definition['Yaga.Rank.PromotedHeadlineFormat'] = '{ActivityUserID,You} avez été oromu au rang de {Data.Name,text}.'; $Definition['Yaga.Rank.RecordActivity'] = 'Enregistrer cette opération d\'édition dans le fil d\'activité public.'; -$Definition['Yaga.Rank.Updated'] = 'Rangs mis à jour avec succès !'; +$Definition['Yaga.Rank.Updated'] = 'Rangs mis à jour avec succès !'; $Definition['Yaga.Ranks'] = 'Rangs'; $Definition['Yaga.Ranks.AgeReq'] = 'Age requis'; $Definition['Yaga.Ranks.Desc'] = "Les rangs sont attribués aux utilisateurs suivant l'âge de leur compte, les points accumulés, et le nombre total de posts. Chaque Ranks have associated perks that can be used to alter the user's experience."; @@ -151,6 +151,9 @@ $Definition['Yaga.Ranks.Use'] = 'Utiliser les rangs'; // Rules +$Definition['Yaga.Rules.DiscussionWordMention'] = 'Le commentaire contient la chaîne de caractères ...'; +$Definition['Yaga.Rules.DiscussionWordMention.Criteria.Head'] = 'Chaîne de caractères'; +$Definition['Yaga.Rules.DiscussionWordMention.Desc'] = 'Le commentaire contient la chaîne de caractères spécifiée ci-dessous'; $Definition['Yaga.Rules.AwardCombo'] = 'Combo de récompenses'; $Definition['Yaga.Rules.AwardCombo.Criteria.Head'] = 'Nombre de badges différents'; $Definition['Yaga.Rules.AwardCombo.Desc'] = 'Attribuer ce badge si le nombre de badges uniques reçu par l\'utilisateur atteint ou dépasse celui spécifié, dans l\'intervalle de temps défini.'; @@ -161,16 +164,16 @@ $Definition['Yaga.Rules.CommentCount.Desc'] = 'Attribuer ce badge si l\'utilisateur atteint ou dépasse le nombre de commentaires spécifié.'; $Definition['Yaga.Rules.CommentMarathon'] = 'Marathon de commentaires'; $Definition['Yaga.Rules.CommentMarathon.Criteria.Head'] = 'Nombre de commentaires'; -$Definition['Yaga.Rules.CommentMarathon.Desc'] = 'Attibuer ce badge si l\'utilisateur a rédigé un nombre de commentaires supérieur ou égal à celui spécifié, dans l\'intervalle de temps défini.'; +$Definition['Yaga.Rules.CommentMarathon.Desc'] = 'Attibuer ce badge si l\'utilisateur a rédigé un nombre de commentaires supérieur ou égal à celui spécifié, dans l\'intervalle de temps défini.'; $Definition['Yaga.Rules.DiscussionBodyLength'] = 'Longueur de post'; $Definition['Yaga.Rules.DiscussionBodyLength.Criteria.Head'] = 'Combien de caractères ?'; -$Definition['Yaga.Rules.DiscussionBodyLength.Desc'] = 'Attribuer ce badge si l\'utilisateur possède une disccussion qui atteint le nombre de caractère spécifiés. Régler ce nombre de manière à ce qu\'il soit inférieur à %s.'; +$Definition['Yaga.Rules.DiscussionBodyLength.Desc'] = 'Attribuer ce badge si l\'utilisateur possède une disccussion qui atteint le nombre de caractère spécifiés. Régler ce nombre de manière à ce qu\'il soit inférieur à %s.'; $Definition['Yaga.Rules.DiscussionCategory'] = 'Discussion dans la catégorie'; $Definition['Yaga.Rules.DiscussionCategory.Criteria.Head'] = 'Selectionner une catégorie :'; $Definition['Yaga.Rules.DiscussionCategory.Desc'] = 'Attribuer ce badge si l\'utilisateur possède une discussion dans la catégorie spécifiée.'; $Definition['Yaga.Rules.DiscussionCount'] = 'Nombre total de discussions'; $Definition['Yaga.Rules.DiscussionCount.Criteria.Head'] = 'Nombre total de discussions'; -$Definition['Yaga.Rules.DiscussionCount.Desc'] = 'Attibuer ce badge si le nombre total de discussion que l\'utilisateur à crée atteint le nombre spécifié.'; +$Definition['Yaga.Rules.DiscussionCount.Desc'] = 'Attibuer ce badge si le nombre total de discussion que l\'utilisateur à crée atteint le nombre spécifié.'; $Definition['Yaga.Rules.DiscussionPageCount'] = 'Nombre de pages dans la discussion'; $Definition['Yaga.Rules.DiscussionPageCount.Criteria.Head'] = 'Combien de pages ?'; $Definition['Yaga.Rules.DiscussionPageCount.Desc'] = 'Attribuer ce badge si l\'utilsateur possède une discussion dont le nombre de page atteint celui spécifié.'; @@ -183,19 +186,19 @@ $Definition['Yaga.Rules.LengthOfService.Criteria.Head'] = 'Time Served'; $Definition['Yaga.Rules.LengthOfService.Desc'] = "Award this badge if the user's account is older than the specified number of days, weeks, or years."; $Definition['Yaga.Rules.ManualAward'] = 'Attribution manuelle'; -$Definition['Yaga.Rules.ManualAward.Desc'] = 'Ce badge ne sera jamais attribué automatiquement. Utiliser cette méthode pour les badges à attribuer manuellement.'; +$Definition['Yaga.Rules.ManualAward.Desc'] = 'Ce badge ne sera jamais attribué automatiquement. Utiliser cette méthode pour les badges à attribuer manuellement.'; $Definition['Yaga.Rules.NecroPost'] = 'Commenter une discussion morte.'; $Definition['Yaga.Rules.NecroPost.Criteria.Head'] = 'Quelle durée avant de considérer une discussion comme morte ?'; $Definition['Yaga.Rules.NecroPost.Desc'] = 'Attribuer ce badge pour tout commentaire sur une discussion morte'; $Definition['Yaga.Rules.NewbieComment'] = "Commenter une discussion d'un nouvel utilisateur"; $Definition['Yaga.Rules.NewbieComment.Criteria.Head'] = 'Ancienneté de l\'utilisateur'; $Definition['Yaga.Rules.NewbieComment.Desc'] = 'Attribuer ce badge si le commenatire est placé dans la discussion d\'un nouvel utilisateur.'; -$Definition['Yaga.Rules.PhotoExists'] = 'L\'utilisateur à une photo de profil'; +$Definition['Yaga.Rules.PhotoExists'] = 'L\'utilisateur à une photo de profil'; $Definition['Yaga.Rules.PhotoExists.Desc'] = 'Attribuer ce badge si l\'utilisateur a ujouté une photo de profil.'; $Definition['Yaga.Rules.PostCount'] = 'Nombre total de commentaires'; $Definition['Yaga.Rules.PostCount.Criteria.Head'] = 'Nombre total de commentaires'; $Definition['Yaga.Rules.PostCount.Desc'] = 'Attribuer ce badge si le nombre total de disuccions/commentaires de l\'utilisateur atteint ou dépasse le nombre fixé.'; -$Definition['Yaga.Rules.PostReactions'] = 'Nombre de réactions à des commentaires'; +$Definition['Yaga.Rules.PostReactions'] = 'Nombre de réactions à des commentaires'; $Definition['Yaga.Rules.PostReactions.Criteria.Head'] = 'Nombre de réactions'; $Definition['Yaga.Rules.PostReactions.Desc'] = 'Attribuer ce badge si l\'utilisateur possède un commentaire avec la réaction spécifiée.'; $Definition['Yaga.Rules.PostReactions.LabelFormat'] = "# of %s's:"; @@ -204,7 +207,7 @@ $Definition['Yaga.Rules.QnAAnserCount.Desc'] = 'Attribuer le badge si l\'utilisateur Award this badge if the user has accepted answers that fit the criteria.'; $Definition['Yaga.Rules.ReactionCount'] = 'Nombre total de réactions'; $Definition['Yaga.Rules.ReactionCount.Criteria.Head'] = 'Nombre total de réactions'; -$Definition['Yaga.Rules.ReactionCount.Desc'] = 'Attribuer ce badge si l\'utilsateur à reçu un nombre total x de réactions du type spécifié.'; +$Definition['Yaga.Rules.ReactionCount.Desc'] = 'Attribuer ce badge si l\'utilsateur à reçu un nombre total x de réactions du type spécifié.'; $Definition['Yaga.Rules.ReflexComment'] = 'Commenter une nouvelle discussion rapidement'; $Definition['Yaga.Rules.ReflexComment.Criteria.Head'] = 'Temps en secondes mis pour commenter'; $Definition['Yaga.Rules.ReflexComment.Desc'] = "Attribuer ce badge si un commentaire est posté x secondes après la création de la discussion."; @@ -222,4 +225,4 @@ $Definition['Yaga.Transport'] = 'Importer / Exporter une configuration'; $Definition['Yaga.Transport.Desc'] = 'Vous pouvez utiliser ces outils pour faciliter le transport de votre configuration Yaga entre vos différents sites par un simple transfert de fichier.'; $Definition['Yaga.Transport.File'] = 'Fichier de transport Yaga'; -$Definition['Yaga.Transport.Return'] = 'Retour à la page principale des réglages Yaga.'; +$Definition['Yaga.Transport.Return'] = 'Retour à la page principale des réglages Yaga.'; From 5dbfc7cc2017373292706abc3462b3912e88b430 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Tue, 17 Nov 2015 10:36:22 -0600 Subject: [PATCH 072/111] Create .travis.yml --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..e2a0bdd42 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,8 @@ +language: php +php: + - 5.3 + - 5.4 + - 5.5 + - 5.6 + - hhvm + - nightly From fca22ffddac12910b2e077f41ad7e555af00c712 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Tue, 17 Nov 2015 10:43:33 -0600 Subject: [PATCH 073/111] Start the trek to 1.1 --- settings/about.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings/about.php b/settings/about.php index acf001067..beea2add9 100755 --- a/settings/about.php +++ b/settings/about.php @@ -1,9 +1,9 @@ 'Yet Another Gamification Application', 'Description' => 'Yaga provides customizable reactions, badges, and ranks for your Vanilla forum software. Increase user activity by letting users react to content with emotions. Give users badges based on statistics and engagement in your community. Create and award custom badges for special events and recognition. Award Ranks which can confer different (configurable) permissions based on community perception and participation.', - 'Version' => '1.0.3', + 'Version' => '1.0.0-alpha', 'Url' => 'http://github.com/hgtonight/application-yaga', 'Author' => 'Zachary Doll', 'AuthorEmail' => 'hgtonight@daklutz.com', From 6b30a8aa2d9497cca24e1770996f7fd808e03f8c Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Tue, 17 Nov 2015 10:46:14 -0600 Subject: [PATCH 074/111] Update reqs and licensing terms. --- LICENSE.md | 836 ++++++++++++++------------------------------- README.md | 2 +- settings/about.php | 8 +- 3 files changed, 257 insertions(+), 589 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 78f62ade3..0671f06ac 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,596 +1,264 @@ -GNU GENERAL PUBLIC LICENSE -========================== +The GNU General Public License, Version 2, June 1991 (GPLv2) +============================================================ -Version 3, 29 June 2007 - -Copyright © 2007 Free Software Foundation, Inc. <> +> Copyright (C) 1989, 1991 Free Software Foundation, Inc. +> 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -## Preamble -The GNU General Public License is a free, copyleft license for software and other -kinds of works. +Preamble +-------- -The licenses for most software and other practical works are designed to take away -your freedom to share and change the works. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change all versions of a -program--to make sure it remains free software for all its users. We, the Free -Software Foundation, use the GNU General Public License for most of our software; it -applies also to any other work released this way by its authors. You can apply it to +The licenses for most software are designed to take away your freedom to share +and change it. By contrast, the GNU General Public License is intended to +guarantee your freedom to share and change free software--to make sure the +software is free for all its users. This General Public License applies to most +of the Free Software Foundation's software and to any other program whose +authors commit to using it. (Some other Free Software Foundation software is +covered by the GNU Library General Public License instead.) You can apply it to your programs, too. -When we speak of free software, we are referring to freedom, not price. Our General -Public Licenses are designed to make sure that you have the freedom to distribute -copies of free software (and charge for them if you wish), that you receive source -code or can get it if you want it, that you can change the software or use pieces of -it in new free programs, and that you know you can do these things. - -To protect your rights, we need to prevent others from denying you these rights or -asking you to surrender the rights. Therefore, you have certain responsibilities if -you distribute copies of the software, or if you modify it: responsibilities to -respect the freedom of others. - -For example, if you distribute copies of such a program, whether gratis or for a fee, -you must pass on to the recipients the same freedoms that you received. You must make -sure that they, too, receive or can get the source code. And you must show them these -terms so they know their rights. - -Developers that use the GNU GPL protect your rights with two steps: (1) assert -copyright on the software, and (2) offer you this License giving you legal permission -to copy, distribute and/or modify it. - -For the developers' and authors' protection, the GPL clearly explains that there is -no warranty for this free software. For both users' and authors' sake, the GPL -requires that modified versions be marked as changed, so that their problems will not -be attributed erroneously to authors of previous versions. - -Some devices are designed to deny users access to install or run modified versions of -the software inside them, although the manufacturer can do so. This is fundamentally -incompatible with the aim of protecting users' freedom to change the software. The -systematic pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we have designed -this version of the GPL to prohibit the practice for those products. If such problems -arise substantially in other domains, we stand ready to extend this provision to -those domains in future versions of the GPL, as needed to protect the freedom of -users. - -Finally, every program is threatened constantly by software patents. States should -not allow patents to restrict development and use of software on general-purpose -computers, but in those that do, we wish to avoid the special danger that patents -applied to a free program could make it effectively proprietary. To prevent this, the -GPL assures that patents cannot be used to render the program non-free. - -The precise terms and conditions for copying, distribution and modification follow. - -## TERMS AND CONDITIONS - -### 0. Definitions. - -“This License” refers to version 3 of the GNU General Public License. - -“Copyright” also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - -“The Program” refers to any copyrightable work licensed under this -License. Each licensee is addressed as “you”. “Licensees” and -“recipients” may be individuals or organizations. - -To “modify” a work means to copy from or adapt all or part of the work in -a fashion requiring copyright permission, other than the making of an exact copy. The -resulting work is called a “modified version” of the earlier work or a -work “based on” the earlier work. - -A “covered work” means either the unmodified Program or a work based on -the Program. - -To “propagate” a work means to do anything with it that, without -permission, would make you directly or secondarily liable for infringement under -applicable copyright law, except executing it on a computer or modifying a private -copy. Propagation includes copying, distribution (with or without modification), -making available to the public, and in some countries other activities as well. - -To “convey” a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through a computer -network, with no transfer of a copy, is not conveying. - -An interactive user interface displays “Appropriate Legal Notices” to the -extent that it includes a convenient and prominently visible feature that (1) -displays an appropriate copyright notice, and (2) tells the user that there is no -warranty for the work (except to the extent that warranties are provided), that -licensees may convey the work under this License, and how to view a copy of this -License. If the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - -### 1. Source Code. - -The “source code” for a work means the preferred form of the work for -making modifications to it. “Object code” means any non-source form of a -work. - -A “Standard Interface” means an interface that either is an official -standard defined by a recognized standards body, or, in the case of interfaces -specified for a particular programming language, one that is widely used among -developers working in that language. - -The “System Libraries” of an executable work include anything, other than -the work as a whole, that (a) is included in the normal form of packaging a Major -Component, but which is not part of that Major Component, and (b) serves only to -enable use of the work with that Major Component, or to implement a Standard -Interface for which an implementation is available to the public in source code form. -A “Major Component”, in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system (if any) on which -the executable work runs, or a compiler used to produce the work, or an object code -interpreter used to run it. - -The “Corresponding Source” for a work in object code form means all the -source code needed to generate, install, and (for an executable work) run the object -code and to modify the work, including scripts to control those activities. However, -it does not include the work's System Libraries, or general-purpose tools or -generally available free programs which are used unmodified in performing those -activities but which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for the work, and -the source code for shared libraries and dynamically linked subprograms that the work -is specifically designed to require, such as by intimate data communication or -control flow between those subprograms and other parts of the work. - -The Corresponding Source need not include anything that users can regenerate -automatically from other parts of the Corresponding Source. - -The Corresponding Source for a work in source code form is that same work. - -### 2. Basic Permissions. - -All rights granted under this License are granted for the term of copyright on the -Program, and are irrevocable provided the stated conditions are met. This License -explicitly affirms your unlimited permission to run the unmodified Program. The -output from running a covered work is covered by this License only if the output, -given its content, constitutes a covered work. This License acknowledges your rights -of fair use or other equivalent, as provided by copyright law. - -You may make, run and propagate covered works that you do not convey, without -conditions so long as your license otherwise remains in force. You may convey covered -works to others for the sole purpose of having them make modifications exclusively -for you, or provide you with facilities for running those works, provided that you -comply with the terms of this License in conveying all material for which you do not -control copyright. Those thus making or running the covered works for you must do so -exclusively on your behalf, under your direction and control, on terms that prohibit -them from making any copies of your copyrighted material outside their relationship -with you. - -Conveying under any other circumstances is permitted solely under the conditions -stated below. Sublicensing is not allowed; section 10 makes it unnecessary. - -### 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - -No covered work shall be deemed part of an effective technological measure under any -applicable law fulfilling obligations under article 11 of the WIPO copyright treaty -adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention -of such measures. - -When you convey a covered work, you waive any legal power to forbid circumvention of -technological measures to the extent such circumvention is effected by exercising -rights under this License with respect to the covered work, and you disclaim any -intention to limit operation or modification of the work as a means of enforcing, -against the work's users, your or third parties' legal rights to forbid circumvention -of technological measures. - -### 4. Conveying Verbatim Copies. - -You may convey verbatim copies of the Program's source code as you receive it, in any -medium, provided that you conspicuously and appropriately publish on each copy an -appropriate copyright notice; keep intact all notices stating that this License and -any non-permissive terms added in accord with section 7 apply to the code; keep -intact all notices of the absence of any warranty; and give all recipients a copy of -this License along with the Program. - -You may charge any price or no price for each copy that you convey, and you may offer -support or warranty protection for a fee. - -### 5. Conveying Modified Source Versions. - -You may convey a work based on the Program, or the modifications to produce it from -the Program, in the form of source code under the terms of section 4, provided that -you also meet all of these conditions: - -* **a)** The work must carry prominent notices stating that you modified it, and giving a -relevant date. -* **b)** The work must carry prominent notices stating that it is released under this -License and any conditions added under section 7. This requirement modifies the -requirement in section 4 to “keep intact all notices”. -* **c)** You must license the entire work, as a whole, under this License to anyone who -comes into possession of a copy. This License will therefore apply, along with any -applicable section 7 additional terms, to the whole of the work, and all its parts, -regardless of how they are packaged. This License gives no permission to license the -work in any other way, but it does not invalidate such permission if you have -separately received it. -* **d)** If the work has interactive user interfaces, each must display Appropriate Legal -Notices; however, if the Program has interactive interfaces that do not display -Appropriate Legal Notices, your work need not make them do so. - -A compilation of a covered work with other separate and independent works, which are -not by their nature extensions of the covered work, and which are not combined with -it such as to form a larger program, in or on a volume of a storage or distribution -medium, is called an “aggregate” if the compilation and its resulting -copyright are not used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work in an aggregate -does not cause this License to apply to the other parts of the aggregate. - -### 6. Conveying Non-Source Forms. - -You may convey a covered work in object code form under the terms of sections 4 and -5, provided that you also convey the machine-readable Corresponding Source under the -terms of this License, in one of these ways: - -* **a)** Convey the object code in, or embodied in, a physical product (including a -physical distribution medium), accompanied by the Corresponding Source fixed on a -durable physical medium customarily used for software interchange. -* **b)** Convey the object code in, or embodied in, a physical product (including a -physical distribution medium), accompanied by a written offer, valid for at least -three years and valid for as long as you offer spare parts or customer support for -that product model, to give anyone who possesses the object code either (1) a copy of -the Corresponding Source for all the software in the product that is covered by this -License, on a durable physical medium customarily used for software interchange, for -a price no more than your reasonable cost of physically performing this conveying of -source, or (2) access to copy the Corresponding Source from a network server at no -charge. -* **c)** Convey individual copies of the object code with a copy of the written offer to -provide the Corresponding Source. This alternative is allowed only occasionally and -noncommercially, and only if you received the object code with such an offer, in -accord with subsection 6b. -* **d)** Convey the object code by offering access from a designated place (gratis or for -a charge), and offer equivalent access to the Corresponding Source in the same way -through the same place at no further charge. You need not require recipients to copy -the Corresponding Source along with the object code. If the place to copy the object -code is a network server, the Corresponding Source may be on a different server -(operated by you or a third party) that supports equivalent copying facilities, -provided you maintain clear directions next to the object code saying where to find -the Corresponding Source. Regardless of what server hosts the Corresponding Source, -you remain obligated to ensure that it is available for as long as needed to satisfy -these requirements. -* **e)** Convey the object code using peer-to-peer transmission, provided you inform -other peers where the object code and Corresponding Source of the work are being -offered to the general public at no charge under subsection 6d. - -A separable portion of the object code, whose source code is excluded from the -Corresponding Source as a System Library, need not be included in conveying the -object code work. - -A “User Product” is either (1) a “consumer product”, which -means any tangible personal property which is normally used for personal, family, or -household purposes, or (2) anything designed or sold for incorporation into a -dwelling. In determining whether a product is a consumer product, doubtful cases -shall be resolved in favor of coverage. For a particular product received by a -particular user, “normally used” refers to a typical or common use of -that class of product, regardless of the status of the particular user or of the way -in which the particular user actually uses, or expects or is expected to use, the -product. A product is a consumer product regardless of whether the product has -substantial commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - -“Installation Information” for a User Product means any methods, -procedures, authorization keys, or other information required to install and execute -modified versions of a covered work in that User Product from a modified version of -its Corresponding Source. The information must suffice to ensure that the continued -functioning of the modified object code is in no case prevented or interfered with -solely because modification has been made. - -If you convey an object code work under this section in, or with, or specifically for -use in, a User Product, and the conveying occurs as part of a transaction in which -the right of possession and use of the User Product is transferred to the recipient -in perpetuity or for a fixed term (regardless of how the transaction is -characterized), the Corresponding Source conveyed under this section must be -accompanied by the Installation Information. But this requirement does not apply if -neither you nor any third party retains the ability to install modified object code -on the User Product (for example, the work has been installed in ROM). - -The requirement to provide Installation Information does not include a requirement to -continue to provide support service, warranty, or updates for a work that has been -modified or installed by the recipient, or for the User Product in which it has been -modified or installed. Access to a network may be denied when the modification itself -materially and adversely affects the operation of the network or violates the rules -and protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, in accord with -this section must be in a format that is publicly documented (and with an -implementation available to the public in source code form), and must require no -special password or key for unpacking, reading or copying. - -### 7. Additional Terms. - -“Additional permissions” are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. Additional -permissions that are applicable to the entire Program shall be treated as though they -were included in this License, to the extent that they are valid under applicable -law. If additional permissions apply only to part of the Program, that part may be -used separately under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - -When you convey a copy of a covered work, you may at your option remove any -additional permissions from that copy, or from any part of it. (Additional -permissions may be written to require their own removal in certain cases when you -modify the work.) You may place additional permissions on material, added by you to a -covered work, for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you add to a -covered work, you may (if authorized by the copyright holders of that material) -supplement the terms of this License with terms: - -* **a)** Disclaiming warranty or limiting liability differently from the terms of -sections 15 and 16 of this License; or -* **b)** Requiring preservation of specified reasonable legal notices or author -attributions in that material or in the Appropriate Legal Notices displayed by works -containing it; or -* **c)** Prohibiting misrepresentation of the origin of that material, or requiring that -modified versions of such material be marked in reasonable ways as different from the -original version; or -* **d)** Limiting the use for publicity purposes of names of licensors or authors of the -material; or -* **e)** Declining to grant rights under trademark law for use of some trade names, -trademarks, or service marks; or -* **f)** Requiring indemnification of licensors and authors of that material by anyone -who conveys the material (or modified versions of it) with contractual assumptions of -liability to the recipient, for any liability that these contractual assumptions -directly impose on those licensors and authors. - -All other non-permissive additional terms are considered “further -restrictions” within the meaning of section 10. If the Program as you received -it, or any part of it, contains a notice stating that it is governed by this License -along with a term that is a further restriction, you may remove that term. If a -license document contains a further restriction but permits relicensing or conveying -under this License, you may add to a covered work material governed by the terms of -that license document, provided that the further restriction does not survive such -relicensing or conveying. - -If you add terms to a covered work in accord with this section, you must place, in -the relevant source files, a statement of the additional terms that apply to those -files, or a notice indicating where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the form of a -separately written license, or stated as exceptions; the above requirements apply -either way. - -### 8. Termination. - -You may not propagate or modify a covered work except as expressly provided under -this License. Any attempt otherwise to propagate or modify it is void, and will -automatically terminate your rights under this License (including any patent licenses -granted under the third paragraph of section 11). - -However, if you cease all violation of this License, then your license from a -particular copyright holder is reinstated (a) provisionally, unless and until the -copyright holder explicitly and finally terminates your license, and (b) permanently, -if the copyright holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is reinstated permanently -if the copyright holder notifies you of the violation by some reasonable means, this -is the first time you have received notice of violation of this License (for any -work) from that copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - -Termination of your rights under this section does not terminate the licenses of -parties who have received copies or rights from you under this License. If your -rights have been terminated and not permanently reinstated, you do not qualify to -receive new licenses for the same material under section 10. - -### 9. Acceptance Not Required for Having Copies. - -You are not required to accept this License in order to receive or run a copy of the -Program. Ancillary propagation of a covered work occurring solely as a consequence of -using peer-to-peer transmission to receive a copy likewise does not require -acceptance. However, nothing other than this License grants you permission to -propagate or modify any covered work. These actions infringe copyright if you do not -accept this License. Therefore, by modifying or propagating a covered work, you -indicate your acceptance of this License to do so. - -### 10. Automatic Licensing of Downstream Recipients. - -Each time you convey a covered work, the recipient automatically receives a license -from the original licensors, to run, modify and propagate that work, subject to this -License. You are not responsible for enforcing compliance by third parties with this +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the freedom to +distribute copies of free software (and charge for this service if you wish), +that you receive source code or can get it if you want it, that you can change +the software or use pieces of it in new free programs; and that you know you can +do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny +you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of the +software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a +fee, you must give the recipients all the rights that you have. You must make +sure that they, too, receive or can get the source code. And you must show them +these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer +you this license which gives you legal permission to copy, distribute and/or +modify the software. + +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If the +software is modified by someone else and passed on, we want its recipients to +know that what they have is not the original, so that any problems introduced by +others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish +to avoid the danger that redistributors of a free program will individually +obtain patent licenses, in effect making the program proprietary. To prevent +this, we have made it clear that any patent must be licensed for everyone's free +use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification +follow. + + +Terms And Conditions For Copying, Distribution And Modification +--------------------------------------------------------------- + +**0.** This License applies to any program or other work which contains a notice +placed by the copyright holder saying it may be distributed under the terms of +this General Public License. The "Program", below, refers to any such program or +work, and a "work based on the Program" means either the Program or any +derivative work under copyright law: that is to say, a work containing the +Program or a portion of it, either verbatim or with modifications and/or +translated into another language. (Hereinafter, translation is included without +limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by +this License; they are outside its scope. The act of running the Program is not +restricted, and the output from the Program is covered only if its contents +constitute a work based on the Program (independent of having been made by +running the Program). Whether that is true depends on what the Program does. + +**1.** You may copy and distribute verbatim copies of the Program's source code +as you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all the notices that refer to this License +and to the absence of any warranty; and give any other recipients of the Program +a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at +your option offer warranty protection in exchange for a fee. + +**2.** You may modify your copy or copies of the Program or any portion of it, +thus forming a work based on the Program, and copy and distribute such +modifications or work under the terms of Section 1 above, provided that you also +meet all of these conditions: + +* **a)** You must cause the modified files to carry prominent notices stating + that you changed the files and the date of any change. + +* **b)** You must cause any work that you distribute or publish, that in whole + or in part contains or is derived from the Program or any part thereof, to + be licensed as a whole at no charge to all third parties under the terms of + this License. + +* **c)** If the modified program normally reads commands interactively when + run, you must cause it, when started running for such interactive use in the + most ordinary way, to print or display an announcement including an + appropriate copyright notice and a notice that there is no warranty (or + else, saying that you provide a warranty) and that users may redistribute + the program under these conditions, and telling the user how to view a copy + of this License. (Exception: if the Program itself is interactive but does + not normally print such an announcement, your work based on the Program is + not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Program, and can be reasonably +considered independent and separate works in themselves, then this License, and +its terms, do not apply to those sections when you distribute them as separate +works. But when you distribute the same sections as part of a whole which is a +work based on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the entire whole, +and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your +rights to work written entirely by you; rather, the intent is to exercise the +right to control the distribution of derivative or collective works based on the +Program. + +In addition, mere aggregation of another work not based on the Program with the +Program (or with a work based on the Program) on a volume of a storage or +distribution medium does not bring the other work under the scope of this License. -An “entity transaction” is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an organization, or -merging organizations. If propagation of a covered work results from an entity -transaction, each party to that transaction who receives a copy of the work also -receives whatever licenses to the work the party's predecessor in interest had or -could give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if the predecessor -has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the rights granted or -affirmed under this License. For example, you may not impose a license fee, royalty, -or other charge for exercise of rights granted under this License, and you may not -initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging -that any patent claim is infringed by making, using, selling, offering for sale, or -importing the Program or any portion of it. - -### 11. Patents. - -A “contributor” is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The work thus -licensed is called the contributor's “contributor version”. - -A contributor's “essential patent claims” are all patent claims owned or -controlled by the contributor, whether already acquired or hereafter acquired, that -would be infringed by some manner, permitted by this License, of making, using, or -selling its contributor version, but do not include claims that would be infringed -only as a consequence of further modification of the contributor version. For -purposes of this definition, “control” includes the right to grant patent -sublicenses in a manner consistent with the requirements of this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free patent license -under the contributor's essential patent claims, to make, use, sell, offer for sale, -import and otherwise run, modify and propagate the contents of its contributor -version. - -In the following three paragraphs, a “patent license” is any express -agreement or commitment, however denominated, not to enforce a patent (such as an -express permission to practice a patent or covenant not to sue for patent -infringement). To “grant” such a patent license to a party means to make -such an agreement or commitment not to enforce a patent against the party. - -If you convey a covered work, knowingly relying on a patent license, and the -Corresponding Source of the work is not available for anyone to copy, free of charge -and under the terms of this License, through a publicly available network server or -other readily accessible means, then you must either (1) cause the Corresponding -Source to be so available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner consistent with -the requirements of this License, to extend the patent license to downstream -recipients. “Knowingly relying” means you have actual knowledge that, but -for the patent license, your conveying the covered work in a country, or your -recipient's use of the covered work in a country, would infringe one or more -identifiable patents in that country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or arrangement, you -convey, or propagate by procuring conveyance of, a covered work, and grant a patent -license to some of the parties receiving the covered work authorizing them to use, -propagate, modify or convey a specific copy of the covered work, then the patent -license you grant is automatically extended to all recipients of the covered work and -works based on it. - -A patent license is “discriminatory” if it does not include within the -scope of its coverage, prohibits the exercise of, or is conditioned on the -non-exercise of one or more of the rights that are specifically granted under this -License. You may not convey a covered work if you are a party to an arrangement with -a third party that is in the business of distributing software, under which you make -payment to the third party based on the extent of your activity of conveying the -work, and under which the third party grants, to any of the parties who would receive -the covered work from you, a discriminatory patent license (a) in connection with -copies of the covered work conveyed by you (or copies made from those copies), or (b) -primarily for and in connection with specific products or compilations that contain -the covered work, unless you entered into that arrangement, or that patent license -was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting any implied -license or other defenses to infringement that may otherwise be available to you -under applicable patent law. - -### 12. No Surrender of Others' Freedom. - -If conditions are imposed on you (whether by court order, agreement or otherwise) -that contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot convey a covered work so as to satisfy +**3.** You may copy and distribute the Program (or a work based on it, under +Section 2) in object code or executable form under the terms of Sections 1 and 2 +above provided that you also do one of the following: + +* **a)** Accompany it with the complete corresponding machine-readable source + code, which must be distributed under the terms of Sections 1 and 2 above on + a medium customarily used for software interchange; or, + +* **b)** Accompany it with a written offer, valid for at least three years, to + give any third party, for a charge no more than your cost of physically + performing source distribution, a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of Sections 1 + and 2 above on a medium customarily used for software interchange; or, + +* **c)** Accompany it with the information you received as to the offer to + distribute corresponding source code. (This alternative is allowed only for + noncommercial distribution and only if you received the program in object + code or executable form with such an offer, in accord with Subsection b + above.) + +The source code for a work means the preferred form of the work for making +modifications to it. For an executable work, complete source code means all the +source code for all modules it contains, plus any associated interface +definition files, plus the scripts used to control compilation and installation +of the executable. However, as a special exception, the source code distributed +need not include anything that is normally distributed (in either source or +binary form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component itself +accompanies the executable. + +If distribution of executable or object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the source code +from the same place counts as distribution of the source code, even though third +parties are not compelled to copy the source along with the object code. + +**4.** You may not copy, modify, sublicense, or distribute the Program except as +expressly provided under this License. Any attempt otherwise to copy, modify, +sublicense or distribute the Program is void, and will automatically terminate +your rights under this License. However, parties who have received copies, or +rights, from you under this License will not have their licenses terminated so +long as such parties remain in full compliance. + +**5.** You are not required to accept this License, since you have not signed +it. However, nothing else grants you permission to modify or distribute the +Program or its derivative works. These actions are prohibited by law if you do +not accept this License. Therefore, by modifying or distributing the Program (or +any work based on the Program), you indicate your acceptance of this License to +do so, and all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + +**6.** Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the original +licensor to copy, distribute or modify the Program subject to these terms and +conditions. You may not impose any further restrictions on the recipients' +exercise of the rights granted herein. You are not responsible for enforcing +compliance by third parties to this License. + +**7.** If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), conditions +are imposed on you (whether by court order, agreement or otherwise) that +contradict the conditions of this License, they do not excuse you from the +conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not convey it at all. For example, if you -agree to terms that obligate you to collect a royalty for further conveying from -those to whom you convey the Program, the only way you could satisfy both those terms -and this License would be to refrain entirely from conveying the Program. - -### 13. Use with the GNU Affero General Public License. - -Notwithstanding any other provision of this License, you have permission to link or -combine any covered work with a work licensed under version 3 of the GNU Affero -General Public License into a single combined work, and to convey the resulting work. -The terms of this License will continue to apply to the part which is the covered -work, but the special requirements of the GNU Affero General Public License, section -13, concerning interaction through a network will apply to the combination as such. - -### 14. Revised Versions of this License. - -The Free Software Foundation may publish revised and/or new versions of the GNU -General Public License from time to time. Such new versions will be similar in spirit -to the present version, but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Program specifies that -a certain numbered version of the GNU General Public License “or any later -version” applies to it, you have the option of following the terms and -conditions either of that numbered version or of any later version published by the -Free Software Foundation. If the Program does not specify a version number of the GNU -General Public License, you may choose any version ever published by the Free -Software Foundation. - -If the Program specifies that a proxy can decide which future versions of the GNU -General Public License can be used, that proxy's public statement of acceptance of a -version permanently authorizes you to choose that version for the Program. - -Later license versions may give you additional or different permissions. However, no -additional obligations are imposed on any author or copyright holder as a result of -your choosing to follow a later version. - -### 15. Disclaimer of Warranty. - -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER -EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE -QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE -DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -### 16. Limitation of Liability. - -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY -COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS -PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, -INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE -OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE -WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - -### 17. Interpretation of Sections 15 and 16. - -If the disclaimer of warranty and limitation of liability provided above cannot be -given local legal effect according to their terms, reviewing courts shall apply local -law that most closely approximates an absolute waiver of all civil liability in -connection with the Program, unless a warranty or assumption of liability accompanies -a copy of the Program in return for a fee. - -END OF TERMS AND CONDITIONS - -## How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible use to -the public, the best way to achieve this is to make it free software which everyone -can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach them -to the start of each source file to most effectively state the exclusion of warranty; -and each file should have at least the “copyright” line and a pointer to -where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - -If the program does terminal interaction, make it output a short notice like this -when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type 'show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate parts of -the General Public License. Of course, your program's commands might be different; -for a GUI interface, you would use an “about box”. - -You should also get your employer (if you work as a programmer) or school, if any, to -sign a “copyright disclaimer” for the program, if necessary. For more -information on this, and how to apply and follow the GNU GPL, see -<>. - -The GNU General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may consider it -more useful to permit linking proprietary applications with the library. If this is -what you want to do, use the GNU Lesser General Public License instead of this -License. But first, please read -<>. +obligations, then as a consequence you may not distribute the Program at all. +For example, if a patent license would not permit royalty-free redistribution of +the Program by all those who receive copies directly or indirectly through you, +then the only way you could satisfy both it and this License would be to refrain +entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply and the +section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or +other property right claims or to contest validity of any such claims; this +section has the sole purpose of protecting the integrity of the free software +distribution system, which is implemented by public license practices. Many +people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose that +choice. + +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. + +**8.** If the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the original copyright +holder who places the Program under this License may add an explicit +geographical distribution limitation excluding those countries, so that +distribution is permitted only in or among countries not thus excluded. In such +case, this License incorporates the limitation as if written in the body of this +License. + +**9.** The Free Software Foundation may publish revised and/or new versions of +the General Public License from time to time. Such new versions will be similar +in spirit to the present version, but may differ in detail to address new +problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies +a version number of this License which applies to it and "any later version", +you have the option of following the terms and conditions either of that version +or of any later version published by the Free Software Foundation. If the +Program does not specify a version number of this License, you may choose any +version ever published by the Free Software Foundation. + +**10.** If you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to ask for +permission. For software which is copyrighted by the Free Software Foundation, +write to the Free Software Foundation; we sometimes make exceptions for this. +Our decision will be guided by the two goals of preserving the free status of +all derivatives of our free software and of promoting the sharing and reuse of +software generally. + + +No Warranty +----------- + +**11.** BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR +THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE +STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM +"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +**12.** IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR +INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA +BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER +OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. diff --git a/README.md b/README.md index 6ccd530cc..febd80b54 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ **Y**​et **A**​nother **G**​amification **A**​pplication is a Garden application that provides a gamification platform for Vanilla Forums and other Garden applications. It integrates by default with Vanilla Forums. Out of the box, it provides Reactions, Badges, and Ranks. -It is released under the GPLv3 and may be released under a different license _**with permission**_. +It is released under the GPLv2 and may be released under a different license _**with permission**_. ## Documentation diff --git a/settings/about.php b/settings/about.php index beea2add9..5347fd773 100755 --- a/settings/about.php +++ b/settings/about.php @@ -4,16 +4,16 @@ 'Name' => 'Yet Another Gamification Application', 'Description' => 'Yaga provides customizable reactions, badges, and ranks for your Vanilla forum software. Increase user activity by letting users react to content with emotions. Give users badges based on statistics and engagement in your community. Create and award custom badges for special events and recognition. Award Ranks which can confer different (configurable) permissions based on community perception and participation.', 'Version' => '1.0.0-alpha', - 'Url' => 'http://github.com/hgtonight/application-yaga', + 'Url' => 'http://github.com/hgtonight/application-yaga', 'Author' => 'Zachary Doll', 'AuthorEmail' => 'hgtonight@daklutz.com', 'AuthorUrl' => 'http://www.daklutz.com', - 'License' => 'GPLv3', + 'License' => 'GPLv2', 'SettingsUrl' => '/yaga/settings', - 'SettingsPermission' => 'Garden.Settings.Manage', + 'SettingsPermission' => 'Garden.Settings.Manage', // Application requirements - 'RequiredApplications' => array('Vanilla' => '2.1'), + 'RequiredApplications' => array('Vanilla' => '2.2'), // Application-specific permissions 'RegisterPermissions' => array( From b9ec9193fba6a1322a1ac4c3c92250d4995de90d Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Tue, 17 Nov 2015 11:01:52 -0600 Subject: [PATCH 075/111] Add a CLA. licensing is a bitch --- cla.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 cla.md diff --git a/cla.md b/cla.md new file mode 100644 index 000000000..7a8f2779d --- /dev/null +++ b/cla.md @@ -0,0 +1,20 @@ +These terms apply to your contribution of materials to a product or project owned or managed by us ('project'), and set out the intellectual property rights you grant to us (Zachary Doll) in the contributed materials. If this contribution is on behalf of a company, the term 'you' will also mean the company for which you are making the contribution. If you agree to be bound by these terms, check the box below. + +Read this agreement carefully before agreeing. + +1. The term 'contribution' means any source code, object code, patch, tool, sample, graphic, specification, manual, documentation, or any other material posted or submitted by you to a project. +2. With respect to any worldwide copyrights, or copyright applications and registrations, in your contribution: + * you hereby assign to us joint ownership, and to the extent that such assignment is or becomes invalid, ineffective or unenforceable, you hereby grant to us a perpetual, irrevocable, non-exclusive, worldwide, no-charge, royalty-free, unrestricted license to exercise all rights under those copyrights. This includes, at our option, the right to sublicense these same rights to third parties through multiple levels of sublicensees or other licensing arrangements; + * you agree that each of us can do all things in relation to your contribution as if each of us were the sole owners, and if one of us makes a derivative work of your contribution, the one who makes the derivative work (or has it made) will be the sole owner of that derivative work; + * you agree that you will not assert any moral rights in your contribution against us, our licensees or transferees; + * you agree that we may register a copyright in your contribution and exercise all ownership rights associated with it; and + * you agree that neither of us has any duty to consult with, obtain the consent of, pay or render an accounting to the other for any use or distribution of your contribution. +3. With respect to any patents you own, or that you can license without payment to any third party, you hereby grant to us a perpetual, irrevocable, non-exclusive, worldwide, no-charge, royalty-free license to: + * make, have made, use, sell, offer to sell, import, and otherwise transfer your contribution in whole or in part, alone or in combination with or included in any product, work or materials arising out of the project to which your contribution was submitted, and + * at our option, to sublicense these same rights to third parties through multiple levels of sublicensees or other licensing arrangements. +4. Except as set out above, you keep all right, title, and interest in your contribution. The rights that you grant to us under these terms are effective on the date you first submitted a contribution to us, even if your submission took place before the date you sign these terms. Any contribution we make available under any license will also be made available under a suitable FSF (Free Software Foundation) or OSI (Open Source Initiative) approved license. +5. With respect to your contribution, you represent that: + * it is an original work and that you can legally grant the rights set out in these terms; + * it does not to the best of your knowledge violate any third party's copyrights, trademarks, patents, or other intellectual property rights; and + * you are authorized to sign this contract on behalf of your company (if you are making the contribution on behalf of a company). +6. These terms will be governed by the laws of the State of North Dakota and applicable US Federal law. Any choice of law rules will not apply. From d7dddb582383f015a8d41e65b4aae03e78e9f945 Mon Sep 17 00:00:00 2001 From: bleistivt Date: Sun, 22 Nov 2015 14:20:39 +0100 Subject: [PATCH 076/111] Deleted users can't lead either. --- modules/class.leaderboardmodule.php | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/class.leaderboardmodule.php b/modules/class.leaderboardmodule.php index 328f79981..ace0cc51b 100755 --- a/modules/class.leaderboardmodule.php +++ b/modules/class.leaderboardmodule.php @@ -74,6 +74,7 @@ public function GetData() { ->From('User u') ->Join('UserPoints up', 'u.UserID = up.UserID') ->Where('u.Banned', 0) + ->Where('u.Deleted', 0) ->Where('up.SlotType', $slot) ->Where('up.TimeSlot', gmdate('Y-m-d', Gdn_Statistics::TimeSlotStamp($slot))) ->Where('up.Source', 'Total') From 4dc1e5d1b8e15a2cbc414593b5c1cd5f804b567f Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Tue, 26 Jan 2016 16:16:14 -0600 Subject: [PATCH 077/111] Revert "Create .travis.yml" This reverts commit 5dbfc7cc2017373292706abc3462b3912e88b430. --- .travis.yml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index e2a0bdd42..000000000 --- a/.travis.yml +++ /dev/null @@ -1,8 +0,0 @@ -language: php -php: - - 5.3 - - 5.4 - - 5.5 - - 5.6 - - hhvm - - nightly From 2039acc20bd252d262a630b1fe62df6b0aeb37af Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Tue, 26 Jan 2016 16:27:20 -0600 Subject: [PATCH 078/111] Fix rankcontroller toggle method --- controllers/class.rankcontroller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/class.rankcontroller.php b/controllers/class.rankcontroller.php index 82779f97f..77577d595 100644 --- a/controllers/class.rankcontroller.php +++ b/controllers/class.rankcontroller.php @@ -197,7 +197,7 @@ public function Toggle($RankID) { $this->Permission('Yaga.Ranks.Manage'); $this->AddSideMenu('rank/settings'); - $Rank = $this->RankModel->Get($RankID); + $Rank = $this->RankModel->GetByID($RankID); if($Rank->Enabled) { $Enable = FALSE; @@ -212,7 +212,7 @@ public function Toggle($RankID) { $Slider = Wrap(Wrap(Anchor($ToggleText, 'rank/toggle/' . $Rank->RankID, 'Hijack SmallButton'), 'span', array('class' => "ActivateSlider ActivateSlider-{$ActiveClass}")), 'td'); $this->RankModel->Enable($RankID, $Enable); - $this->JsonTarget('#RankID_' . $RankID . ' td:nth-child(5)', $Slider, 'ReplaceWith'); + $this->JsonTarget('#RankID_' . $RankID . ' td:nth-child(6)', $Slider, 'ReplaceWith'); $this->Render('Blank', 'Utility', 'Dashboard'); } From c3f5057a2e995aa747baa5f026dbfa7855727452 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 27 Jan 2016 08:24:05 -0600 Subject: [PATCH 079/111] Only set rank if it is a new rank --- models/class.rankmodel.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/models/class.rankmodel.php b/models/class.rankmodel.php index ebc8a6059..136b03e01 100644 --- a/models/class.rankmodel.php +++ b/models/class.rankmodel.php @@ -192,6 +192,14 @@ public function Delete($RankID) { */ public function Set($RankID, $UserID, $Activity = FALSE) { $Rank = $this->GetByID($RankID); + $UserModel = Gdn::UserModel(); + $OldRankID = $UserModel->GetID($UserID)->RankID; + + // Don't bother setting a rank that they already have + if($Rank->RankID == $OldRankID) { + return; + } + if($Activity) { // Throw up a promotion activity $ActivityModel = new ActivityModel(); @@ -220,10 +228,6 @@ public function Set($RankID, $UserID, $Activity = FALSE) { $ActivityModel->SaveQueue(); } - // Update the rank id - $UserModel = Gdn::UserModel(); - $OldRankID = $UserModel->GetID($UserID)->RankID; - $UserModel->SetField($UserID, 'RankID', $Rank->RankID); // Update the roles if necessary From fb200cf7d3b84222aa07f4d161fe4c9e3d171751 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 27 Jan 2016 08:32:00 -0600 Subject: [PATCH 080/111] Note requiring Vanilla 2.2 and pretty URLs --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index febd80b54..06cbbd0b6 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,16 @@ It is released under the GPLv2 and may be released under a different license _**with permission**_. +## Requirements + +Yaga requires: + +* Vanilla 2.2.x (Garden is the actual requirement +* Pretty URLs enabled ## Documentation Yaga's [main documentation page is here](http://hgtonight.github.io/Application-Yaga/). --- -Copyright 2013 - 2014 © Zachary Doll +Copyright 2013 - 2016 © Zachary Doll From 7921f29c39c5b7399a9eb4b8f925d8938316e689 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 27 Jan 2016 09:08:24 -0600 Subject: [PATCH 081/111] Make german locale better; closes #108 --- locale/de-DE.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/de-DE.php b/locale/de-DE.php index a4c2f4031..b3a16f8a5 100644 --- a/locale/de-DE.php +++ b/locale/de-DE.php @@ -58,7 +58,7 @@ $Definition['Yaga.Badge.Award'] = 'Auszeichnung verleihen'; $Definition['Yaga.Badge.Delete'] = 'Auszeichnung löschen'; $Definition['Yaga.Badge.DetailLink'] = 'Statistik zu dieser Auszeichnung'; -$Definition['Yaga.Badge.Earned'] = 'Du hast diese Auszeichnung erhalten'; +$Definition['Yaga.Badge.Earned'] = 'Du hast diese Auszeichnung erhalten am'; $Definition['Yaga.Badge.Earned.Format'] = 'Du hast eine Auszeichnung für %s von %s erhalten!'; $Definition['Yaga.Badge.EarnedByNone'] = 'Diese Auszeichnung hat bislang noch niemand erhalten.'; $Definition['Yaga.Badge.EarnedByPlural'] = '%s Benutzer haben diese Auszeichnung.'; From 399f4669951f251c378c5e5a8b5e71445ac5ab68 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 27 Jan 2016 09:17:14 -0600 Subject: [PATCH 082/111] Require view permission to see badge list and details. --- controllers/class.yagacontroller.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/controllers/class.yagacontroller.php b/controllers/class.yagacontroller.php index a98acf262..a2105f9c2 100644 --- a/controllers/class.yagacontroller.php +++ b/controllers/class.yagacontroller.php @@ -110,6 +110,7 @@ public function Ranks() { } public function Badges($BadgeID = FALSE, $Slug = NULL) { + $this->permission('Yaga.Badges.View'); $this->FrontendStyle(); $this->AddCssFile('badges.css'); $this->AddModule('BadgesModule'); @@ -129,6 +130,7 @@ public function Badges($BadgeID = FALSE, $Slug = NULL) { } public function BadgeDetail($BadgeID, $Slug = NULL) { + $this->permission('Yaga.Badges.View'); $Badge = Yaga::BadgeModel()->GetByID($BadgeID); if(!$Badge) { From 0c73459632bfe847ff176765c8892e25736a08b4 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 27 Jan 2016 09:18:07 -0600 Subject: [PATCH 083/111] Add rank view permission --- settings/about.php | 1 + 1 file changed, 1 insertion(+) diff --git a/settings/about.php b/settings/about.php index 5347fd773..7bbc7fa4c 100755 --- a/settings/about.php +++ b/settings/about.php @@ -26,5 +26,6 @@ 'Yaga.Badges.View' => 1, // Can a user view badges? 'Yaga.Ranks.Add' => 0, // Can a user assign ranks manually? 'Yaga.Ranks.Manage' => 0, // Can a user adit/edit/delete ranks from the system? + 'Yaga.Ranks.View' => 1, // Can a user view ranks? ) ); From 6cffb649f2546d455864ec42897a19f267546929 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 27 Jan 2016 09:20:12 -0600 Subject: [PATCH 084/111] Require rank view permission for frontend page --- controllers/class.yagacontroller.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/controllers/class.yagacontroller.php b/controllers/class.yagacontroller.php index a2105f9c2..b0df1c2d9 100644 --- a/controllers/class.yagacontroller.php +++ b/controllers/class.yagacontroller.php @@ -91,14 +91,15 @@ private function FrontendStyle() { $this->AddCssFile('style.css'); $this->MasterView = 'default'; - $Module = new LeaderBoardModule(); - $Module->SlotType = 'w'; - $this->AddModule($Module); - $Module = new LeaderBoardModule(); - $this->AddModule($Module); + $WeeklyModule = new LeaderBoardModule(); + $WeeklyModule->SlotType = 'w'; + $this->AddModule($WeeklyModule); + $AllTimeModule = new LeaderBoardModule(); + $this->AddModule($AllTimeModule); } public function Ranks() { + $this->permission('Yaga.Ranks.View'); $this->FrontendStyle(); $this->AddCssFile('ranks.css'); $this->Title(T('Yaga.Ranks.All')); From dd8bbae52edf6c65d0cc030b9b7b56a3ff44c9a1 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 27 Jan 2016 09:32:50 -0600 Subject: [PATCH 085/111] Throw a 404 exception instead of just returning --- settings/class.hooks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/class.hooks.php b/settings/class.hooks.php index 6f921513f..0ac8f16e5 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -142,7 +142,7 @@ public function UserInfoModule_OnBasicInfo_Handler($Sender) { */ public function ProfileController_Reactions_Create($Sender, $UserReference = '', $Username = '', $ActionID = '', $Page = 0) { if(!C('Yaga.Reactions.Enabled')) { - return; + throw notFoundException(); } list($Offset, $Limit) = OffsetLimit($Page, C('Yaga.ReactedContent.PerPage', 5)); From 4e14e86b6c71df4cce70a44ec384408651f6baeb Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 27 Jan 2016 10:42:31 -0600 Subject: [PATCH 086/111] Include the action name in the breadcrumbs --- settings/class.hooks.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/settings/class.hooks.php b/settings/class.hooks.php index 0ac8f16e5..41e2b62fd 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -155,6 +155,7 @@ public function ProfileController_Reactions_Create($Sender, $UserReference = '', // Tell the ProfileController what tab to load $Sender->GetUserInfo($UserReference, $Username); $Sender->_SetBreadcrumbs(T('Yaga.Reactions'), UserUrl($Sender->User, '', 'reactions')); + $Sender->SetTabView(T('Yaga.Reactions'), 'reactions', 'profile', 'Yaga'); $Sender->AddJsFile('jquery.expander.js'); @@ -177,16 +178,18 @@ public function ProfileController_Reactions_Create($Sender, $UserReference = '', $Sender->Head->AddTag('meta', array('name' => 'robots', 'content' => 'noindex,noarchive')); } - $ReactionModel = Yaga::ReactionModel(); - // Build a pager + $BaseUrl = 'profile/reactions/' . $Sender->User->UserID . '/' . Gdn_Format::Url($Sender->User->Name) . '/' . $ActionID; $PagerFactory = new Gdn_PagerFactory(); $Sender->Pager = $PagerFactory->GetPager('Pager', $Sender); $Sender->Pager->ClientID = 'Pager'; $Sender->Pager->Configure( - $Offset, $Limit, $Data->TotalRecords, 'profile/reactions/' . $Sender->User->UserID . '/' . Gdn_Format::Url($Sender->User->Name) . '/' . $ActionID . '/%1$s/' + $Offset, $Limit, $Data->TotalRecords, $BaseUrl . '/%1$s/' ); + // Add the specific action to the breadcrumbs + $action = Yaga::ActionModel()->GetID($ActionID); + $Sender->Data['Breadcrumbs'][] = array('Name' => $action->Name, 'Url' => $BaseUrl); // Render the ProfileController $Sender->Render(); } From fe5cc0d1de0acf56da775bfb95bf7f38440674ad Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 27 Jan 2016 10:53:51 -0600 Subject: [PATCH 087/111] Get rid of useless breadcrumb root --- settings/class.hooks.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/settings/class.hooks.php b/settings/class.hooks.php index 41e2b62fd..0210cc298 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -154,8 +154,6 @@ public function ProfileController_Reactions_Create($Sender, $UserReference = '', // Tell the ProfileController what tab to load $Sender->GetUserInfo($UserReference, $Username); - $Sender->_SetBreadcrumbs(T('Yaga.Reactions'), UserUrl($Sender->User, '', 'reactions')); - $Sender->SetTabView(T('Yaga.Reactions'), 'reactions', 'profile', 'Yaga'); $Sender->AddJsFile('jquery.expander.js'); @@ -189,7 +187,10 @@ public function ProfileController_Reactions_Create($Sender, $UserReference = '', // Add the specific action to the breadcrumbs $action = Yaga::ActionModel()->GetID($ActionID); - $Sender->Data['Breadcrumbs'][] = array('Name' => $action->Name, 'Url' => $BaseUrl); + if($action) { + $Sender->_SetBreadcrumbs($action->Name, $BaseUrl); + } + // Render the ProfileController $Sender->Render(); } From 7f6c7cce6df223e6fffcdd3f3985ba6553065c37 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 27 Jan 2016 11:03:22 -0600 Subject: [PATCH 088/111] Remove serializing and unserializing of user permissions' --- settings/class.hooks.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/settings/class.hooks.php b/settings/class.hooks.php index 0210cc298..b7fe45cb6 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -513,12 +513,10 @@ private function RevokePermission($User, $Permission = '') { if($Permission === '') { return; } - - $TempPerms = unserialize($User->Permissions); + $TempPerms =& $User->Permissions; $Key = array_search($Permission, $TempPerms); if($Key) { unset($TempPerms[$Key]); - $User->Permissions = serialize($TempPerms); } } From 64ad46e7ad02140673292ad12660042c3bf17bf6 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 27 Jan 2016 11:19:12 -0600 Subject: [PATCH 089/111] Allow for serialized permissions as well --- settings/class.hooks.php | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/settings/class.hooks.php b/settings/class.hooks.php index b7fe45cb6..bb7d41d0e 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -513,10 +513,21 @@ private function RevokePermission($User, $Permission = '') { if($Permission === '') { return; } - $TempPerms =& $User->Permissions; - $Key = array_search($Permission, $TempPerms); - if($Key) { - unset($TempPerms[$Key]); + + if(!is_array($User->Permissions)) { + $TempPerms = unserialize($User->Permissions); + $Key = array_search($Permission, $TempPerms); + if($Key) { + unset($TempPerms[$Key]); + $User->Permissions = serialize($TempPerms); + } + } + else { + $TempPerms =& $User->Permissions; + $Key = array_search($Permission, $TempPerms); + if($Key) { + unset($TempPerms[$Key]); + } } } From fa7c21f03389c18ceb0146eb125590debb2fcb1e Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 27 Jan 2016 11:21:02 -0600 Subject: [PATCH 090/111] Granting permissions should handle unserialized perms as well --- settings/class.hooks.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/settings/class.hooks.php b/settings/class.hooks.php index bb7d41d0e..239fe712f 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -493,11 +493,17 @@ private function GrantPermission($User, $Permission = '') { if($Permission === '') { return; } - - $TempPerms = unserialize($User->Permissions); - if(!in_array($Permission, $TempPerms)) { + + if(!is_array($User->Permissions)) { + $TempPerms = unserialize($User->Permissions); + if(!in_array($Permission, $TempPerms)) { + $TempPerms[] = $Permission; + $User->Permissions = serialize($TempPerms); + } + } + else { + $TempPerms =& $User->Permissions; $TempPerms[] = $Permission; - $User->Permissions = serialize($TempPerms); } } From 2236baa758c3f129a7d1d8bac770113bb7fcd870 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 27 Jan 2016 15:06:30 -0600 Subject: [PATCH 091/111] Update doc blocks to mark new functionality as since 1.1 --- controllers/class.badgecontroller.php | 2 + controllers/class.yagacontroller.php | 60 +++++++++++++++++++++++---- library/class.yaga.php | 7 ++++ library/functions.render.php | 5 +++ library/interface.yagarule.php | 8 ++++ models/class.actedmodel.php | 1 + models/class.badgemodel.php | 1 + models/class.reactionmodel.php | 1 + settings/class.hooks.php | 7 ++++ 9 files changed, 84 insertions(+), 8 deletions(-) diff --git a/controllers/class.badgecontroller.php b/controllers/class.badgecontroller.php index d15ba135b..d66e80008 100644 --- a/controllers/class.badgecontroller.php +++ b/controllers/class.badgecontroller.php @@ -313,6 +313,8 @@ public function Award($UserID) { * This takes in a sort array and updates the badge sort order. * * Renders the Save tree and/or the Result of the sort update. + * + * @since 1.1 */ public function Sort() { // Check permission diff --git a/controllers/class.yagacontroller.php b/controllers/class.yagacontroller.php index b0df1c2d9..93bfd6677 100644 --- a/controllers/class.yagacontroller.php +++ b/controllers/class.yagacontroller.php @@ -35,6 +35,8 @@ public function Initialize() { /** * Redirect to settings by default + * + * @since 1.0 */ public function Index() { $this->Settings(); @@ -42,6 +44,8 @@ public function Index() { /** * This handles all the core settings for the gamification application. + * + * @since 1.0 */ public function Settings() { $this->Permission('Garden.Settings.Manage'); @@ -85,6 +89,12 @@ public function Settings() { $this->Render('settings'); } + /** + * Performs the necessary functions to change a backend controller into a + * frontend controller + * + * @since 1.1 + */ private function FrontendStyle() { $this->RemoveCssFile('admin.css'); unset($this->Assets['Panel']['SideMenuModule']); @@ -98,6 +108,12 @@ private function FrontendStyle() { $this->AddModule($AllTimeModule); } + /** + * Displays a summary of ranks currently configured on a frontend page to help + * users understand what is valued in this community + * + * @since 1.1 + */ public function Ranks() { $this->permission('Yaga.Ranks.View'); $this->FrontendStyle(); @@ -110,6 +126,16 @@ public function Ranks() { $this->Render('ranks'); } + /** + * Displays a summary of badges currently configured on a frontend page to + * help users understand what is valued in this community. + * + * Also provides a convenience redirect to badge details + * + * @param int $BadgeID The badge ID you want to see details + * @param string $Slug The badge slug you want to see details + * @since 1.1 + */ public function Badges($BadgeID = FALSE, $Slug = NULL) { $this->permission('Yaga.Badges.View'); $this->FrontendStyle(); @@ -130,6 +156,13 @@ public function Badges($BadgeID = FALSE, $Slug = NULL) { $this->Render('badges'); } + /** + * Displays information about the specified badge including recent recipients + * of the badge. + * + * @param int $BadgeID + * @param string $Slug + */ public function BadgeDetail($BadgeID, $Slug = NULL) { $this->permission('Yaga.Badges.View'); $Badge = Yaga::BadgeModel()->GetByID($BadgeID); @@ -157,6 +190,8 @@ public function BadgeDetail($BadgeID, $Slug = NULL) { /** * Import a Yaga transport file + * + * @since 1.0 */ public function Import() { $this->Title(T('Yaga.Import')); @@ -204,6 +239,8 @@ public function Import() { /** * Create a Yaga transport file + * + * @since 1.0 */ public function Export() { $this->Title(T('Yaga.Export')); @@ -237,6 +274,7 @@ public function Export() { * Yaga sections to be included in the transport file. * * @return array + * @since 1.0 */ protected function _FindIncludes() { $FormValues = $this->Form->FormValues(); @@ -257,6 +295,7 @@ protected function _FindIncludes() { * @param array An array containing the config areas to transfer * @param string Where to save the transport file * @return mixed False on failure, the path to the transport file on success + * @since 1.0 */ protected function _ExportData($Include = array(), $Path = NULL) { $StartTime = microtime(TRUE); @@ -361,6 +400,7 @@ protected function _ExportData($Include = array(), $Path = NULL) { * * @param string The transport file path * @return boolean Whether or not the transport file was extracted successfully + * @since 1.0 */ protected function _ExtractZip($Filename) { if(!file_exists($Filename)) { @@ -405,6 +445,7 @@ protected function _ExtractZip($Filename) { * @param array Which tables should be overwritten * @return bool Pass/Fail on the import being executed. Errors can exist on the * form with a passing return value. + * @since 1.0 */ protected function _ImportData($Info, $Include) { if(!$Info) { @@ -447,6 +488,7 @@ protected function _ImportData($Info, $Include) { * @param array The nested array * @param string What should the configuration strings be prefixed with * @return array + * @since 1.0 */ protected function _NestedToDotNotation($Configs, $Prefix = '') { $ConfigStrings = array(); @@ -468,6 +510,7 @@ protected function _NestedToDotNotation($Configs, $Prefix = '') { * * @param stdClass The metadata object read in from the transport file * @return boolean Whether or not the checksum is valid + * @since 1.0 */ protected function _ValidateChecksum($MetaData) { $Hashes = array(); @@ -507,19 +550,20 @@ protected function _ValidateChecksum($MetaData) { } /** - * Returns a list of all files in a directory, recursively (Thanks @businessdad) - * - * @param string Directory The directory to scan for files - * @return array A list of Files and, optionally, Directories. - */ - protected function _GetFiles($Directory) { + * Returns a list of all files in a directory, recursively (Thanks @businessdad) + * + * @param string Directory The directory to scan for files + * @return array A list of Files and, optionally, Directories. + * @since 1.0 + */ + protected function _GetFiles($Directory) { $Files = array_diff(scandir($Directory), array('.', '..')); $Result = array(); foreach($Files as $File) { $FileName = $Directory . '/' . $File; if(is_dir($FileName)) { - $Result = array_merge($Result, $this->_GetFiles($FileName)); - continue; + $Result = array_merge($Result, $this->_GetFiles($FileName)); + continue; } $Result[] = $FileName; } diff --git a/library/class.yaga.php b/library/class.yaga.php index 60e8a5a3e..18294d326 100644 --- a/library/class.yaga.php +++ b/library/class.yaga.php @@ -66,6 +66,7 @@ public static function ActedModel() { /** * Get a reference to the action model + * @since 1.0 * @return ActionModel */ public static function ActionModel() { @@ -77,6 +78,7 @@ public static function ActionModel() { /** * Get a reference to the reaction model + * @since 1.0 * @return ReactionModel */ public static function ReactionModel() { @@ -88,6 +90,7 @@ public static function ReactionModel() { /** * Get a reference to the badge model + * @since 1.0 * @return BadgeModel */ public static function BadgeModel() { @@ -99,6 +102,7 @@ public static function BadgeModel() { /** * Get a reference to the badge award model + * @since 1.0 * @return BadgeAwardModel */ public static function BadgeAwardModel() { @@ -110,6 +114,7 @@ public static function BadgeAwardModel() { /** * Get a reference to the rank model + * @since 1.0 * @return RankModel */ public static function RankModel() { @@ -124,6 +129,7 @@ public static function RankModel() { * * May be expanded in future versions. * + * @since 1.1 * @param int $UserID * @param int $Value * @param string $Source @@ -139,6 +145,7 @@ public static function GivePoints($UserID, $Value, $Source = 'Other', $Timestamp * @param mixed $Sender The sending object * @param string $Handler The event handler to check associated rules for awards * (e.g. BadgeAwardModel_AfterBadgeAward_Handler or Base_AfterConnection) + * @since 1.1 */ public static function ExecuteBadgeHooks($Sender, $Handler) { $Session = Gdn::Session(); diff --git a/library/functions.render.php b/library/functions.render.php index a7f4aeeec..172e19866 100644 --- a/library/functions.render.php +++ b/library/functions.render.php @@ -12,6 +12,7 @@ * Renders a list of available actions that also contains the current count of * reactions an item has received if allowed * + * @since 1.0 * @param int $ID * @param string $Type 'discussion', 'activity', or 'comment' * @return string Rendered list of actions available @@ -44,6 +45,7 @@ function RenderReactionList($ID, $Type) { /** * Renders the reaction record for a specific item * + * @since 1.0 * @param int $ID * @param string $Type 'discussion', 'activity', or 'comment' * @return string Rendered list of existing reactions @@ -80,6 +82,7 @@ function RenderReactionRecord($ID, $Type) { /** * Renders an action row used to construct the action admin screen * + * @since 1.0 * @param stdClass $Action * @return string */ @@ -104,6 +107,7 @@ function RenderActionRow($Action) { /** * Render a simple permission perk form * + * @since 1.0 * @param string $Perm The permission you want to grant/revoke * @param string $Label Translation code used on the form */ @@ -127,6 +131,7 @@ function RenderPerkPermissionForm($Perm, $Label) { /** * Render a perk form for the specified configuration * + * @since 1.0 * @param string $Config The configuration you want to override (i.e. 'Vanilla.EditTimeout') * @param string $Label Translation code used on the form * @param array $Options The options you want shown instead of default/enable/disable. diff --git a/library/interface.yagarule.php b/library/interface.yagarule.php index c61886a83..bce558d37 100644 --- a/library/interface.yagarule.php +++ b/library/interface.yagarule.php @@ -12,6 +12,7 @@ interface YagaRule { * This performs the grunt work of an award rule. Given an expected criteria, * it determines if a specific user meets muster. * + * @since 1.0 * @param mixed $Sender The object calling the award method. * @param UserObject $User the user object of the calling user * @param stdClass $Criteria This is a standard object with properties that @@ -24,6 +25,8 @@ public function Award($Sender, $User, $Criteria); /** * This determines what hook(s) the rule should be checked on. + * + * @since 1.0 * @return array The hook name(s) in lower case to fire our calculations on */ public function Hooks(); @@ -31,6 +34,7 @@ public function Hooks(); /** * Returns the needed criteria form for this rule's criteria. * + * @since 1.0 * @param Gdn_Form $Form * @return string The fully rendered form. */ @@ -39,6 +43,7 @@ public function Form($Form); /** * This validates the submitted criteria and does what it wants with the form * + * @since 1.0 * @param array $Criteria * @param Gdn_Form $Form */ @@ -47,6 +52,7 @@ public function Validate($Criteria, $Form); /** * Returns a string representing a user friendly name of this rule. * + * @since 1.0 * @return string Name shown on forms */ public function Name(); @@ -54,6 +60,7 @@ public function Name(); /** * Returns a string representing the in depth description of how to use this rule. * + * @since 1.0 * @return string The description */ public function Description(); @@ -63,6 +70,7 @@ public function Description(); * other than the calling user. Rules that depend on interaction should return * true. * + * @since 1.0 * @return bool Whether or not interactions need to be checked */ public function Interacts(); diff --git a/models/class.actedmodel.php b/models/class.actedmodel.php index 0d21eaa8c..33d16e1c8 100644 --- a/models/class.actedmodel.php +++ b/models/class.actedmodel.php @@ -468,6 +468,7 @@ protected function CondenseAndPrep(&$Content, $Limit, $Offset) { /** * Wrapper for GetRecord() * + * @since 1.1 * @param string $RecordType * @param int $ID * @return array diff --git a/models/class.badgemodel.php b/models/class.badgemodel.php index fe517c9e5..1d6868eb8 100644 --- a/models/class.badgemodel.php +++ b/models/class.badgemodel.php @@ -171,6 +171,7 @@ public function GetWithEarned($UserID) { /** * Updates the sort field for each badge in the sort array * + * @since 1.1 * @param array $SortArray * @return boolean */ diff --git a/models/class.reactionmodel.php b/models/class.reactionmodel.php index c58d4f4b9..7da8824c6 100644 --- a/models/class.reactionmodel.php +++ b/models/class.reactionmodel.php @@ -219,6 +219,7 @@ public function Set($ID, $Type, $AuthorID, $UserID, $ActionID) { /** * Fills the memory cache with the specified reaction records * + * @since 1.1 * @param string $Type * @param array $IDs */ diff --git a/settings/class.hooks.php b/settings/class.hooks.php index 239fe712f..f57d507d0 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -582,6 +582,7 @@ public function DiscussionController_Render_Before($Sender) { /** * Insert JS and CSS files into the appropiate controllers * + * @since 1.1 * @param DiscussionsController $Sender */ public function DiscussionsController_Render_Before($Sender) { @@ -748,6 +749,12 @@ public function Base_Render_Before($Sender) { } } + /** + * Adds links to the frontend + * + * @since 1.1 + * @param MenuModule $Menu + */ protected function AddMenuLinks($Menu) { if(C('Yaga.Badges.Enabled')) { $Menu->AddLink('Yaga', T('Badges'), 'yaga/badges'); From 7275ce0f01ea0234bd5bb2ab7fd7b8adee988149 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 27 Jan 2016 15:47:54 -0600 Subject: [PATCH 092/111] Remove the errant magnific-popup.css file in backend controllers --- controllers/class.actioncontroller.php | 1 + controllers/class.badgecontroller.php | 1 + controllers/class.rankcontroller.php | 1 + controllers/class.yagacontroller.php | 1 + 4 files changed, 4 insertions(+) diff --git a/controllers/class.actioncontroller.php b/controllers/class.actioncontroller.php index 970a5c92a..be5b0e4e1 100644 --- a/controllers/class.actioncontroller.php +++ b/controllers/class.actioncontroller.php @@ -31,6 +31,7 @@ public function Initialize() { $this->AddJsFile('jquery-ui-1.10.0.custom.min.js'); $this->AddJsFile('admin.actions.js'); $this->AddCssFile('reactions.css'); + $this->removeCssFile('magnific-popup.css'); } /** diff --git a/controllers/class.badgecontroller.php b/controllers/class.badgecontroller.php index d66e80008..136974815 100644 --- a/controllers/class.badgecontroller.php +++ b/controllers/class.badgecontroller.php @@ -31,6 +31,7 @@ public function Initialize() { $this->AddJsFile('jquery-ui-1.10.0.custom.min.js'); $this->AddJsFile('admin.badges.js'); $this->AddCssFile('badges.css'); + $this->removeCssFile('magnific-popup.css'); } /** diff --git a/controllers/class.rankcontroller.php b/controllers/class.rankcontroller.php index 77577d595..74f742264 100644 --- a/controllers/class.rankcontroller.php +++ b/controllers/class.rankcontroller.php @@ -30,6 +30,7 @@ public function Initialize() { } $this->AddJsFile('jquery-ui-1.10.0.custom.min.js'); $this->AddJsFile('admin.ranks.js'); + $this->removeCssFile('magnific-popup.css'); } /** diff --git a/controllers/class.yagacontroller.php b/controllers/class.yagacontroller.php index 93bfd6677..e5395ba64 100644 --- a/controllers/class.yagacontroller.php +++ b/controllers/class.yagacontroller.php @@ -31,6 +31,7 @@ public function Initialize() { $this->AddSideMenu('yaga/settings'); $this->AddCssFile('yaga.css'); + $this->removeCssFile('magnific-popup.css'); } /** From 14a5ad8094cacb47e6af92b5c19b82154ab1d55a Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 27 Jan 2016 16:17:38 -0600 Subject: [PATCH 093/111] System shouldn't earn points or badges --- library/class.yaga.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/library/class.yaga.php b/library/class.yaga.php index 18294d326..32f8b2a21 100644 --- a/library/class.yaga.php +++ b/library/class.yaga.php @@ -51,7 +51,7 @@ class Yaga { * @var BadgeAwardModel */ protected static $_BadgeAwardModel = NULL; - + /** * Get a reference to the acted model * @since 1.1 @@ -136,6 +136,9 @@ public static function RankModel() { * @param int $Timestamp */ public static function GivePoints($UserID, $Value, $Source = 'Other', $Timestamp = FALSE) { + if($UserID == Gdn::userModel()->getSystemUserID()) { + return; + } UserModel::GivePoints($UserID, $Value, $Source, $Timestamp); } @@ -201,7 +204,11 @@ public static function ExecuteBadgeHooks($Sender, $Handler) { $AwardedUserIDs[] = $UserID; } + $systemUserID = Gdn::userModel()->getSystemUserID(); foreach($AwardedUserIDs as $AwardedUserID) { + if($AwardedUserID == $systemUserID) { + continue; + } $BadgeAwardModel->Award($Badge->BadgeID, $AwardedUserID, $UserID); } } From 9d437b0d2b5969bbd1d3d89486560419fd51e9b0 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 23 Mar 2016 15:38:55 -0500 Subject: [PATCH 094/111] Add index to reaction table --- settings/structure.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/settings/structure.php b/settings/structure.php index 2d286503c..44eb46ab3 100755 --- a/settings/structure.php +++ b/settings/structure.php @@ -12,6 +12,7 @@ $Database = Gdn::Database(); $SQL = $Database->SQL(); // To run queries. $Construct = $Database->Structure(); // To modify and add database tables. +$Px = $Database->DatabasePrefix; // Tracks the data associated with reacting to content $Construct->Table('Reaction') @@ -24,6 +25,11 @@ ->Column('DateInserted', 'datetime') ->Set($Explicit, $Drop); +$result = $SQL->query("SHOW INDEX FROM ${Px}Reaction WHERE Key_name = 'IX_ParentID_ParentType'")->result(); +if(!$result) { + $SQL->query("ALTER TABLE ${Px}Reaction ADD INDEX IX_ParentID_ParentType (ParentID, ParentType)"); +} + // Describes actions that can be taken on a comment, discussion or activity $Construct->Table('Action') ->PrimaryKey('ActionID') From f927fdac1950238d9b7dcf4a62d13e527ef787ff Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Wed, 23 Mar 2016 15:58:50 -0500 Subject: [PATCH 095/111] Add better action defaults --- settings/stub.php | 98 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 70 insertions(+), 28 deletions(-) diff --git a/settings/stub.php b/settings/stub.php index e67d43182..8783c351c 100644 --- a/settings/stub.php +++ b/settings/stub.php @@ -1,35 +1,77 @@ SQL(); -// Insert stub actions -$SQL->Insert('Action', array( - 'Name' => 'Like', - 'Description' => 'I approve!', - 'Tooltip' => 'This indicates casual approval', - 'CssClass' => 'ReactThumbsUp', - 'AwardValue' => 1 -)); -$SQL->Insert('Action', array( - 'Name' => 'Dislike', - 'Description' => 'I disapprove!', - 'Tooltip' => 'This indicates casual disapproval', - 'CssClass' => 'ReactThumbsUp2', - 'AwardValue' => -1 -)); -$SQL->Insert('Action', array( - 'Name' => 'Promote', - 'Description' => 'This post deserves to be featured on the best of page!', - 'Tooltip' => 'Click me if this content should be featured.', - 'CssClass' => 'ReactPointUp', - 'AwardValue' => 5, - 'Permission' => 'Garden.Curation.Manage' -)); +// Only insert stub content if nothing exists +$Row = $SQL->get('Action', '', 'asc', 1)->firstRow(DATASET_TYPE_ARRAY); +if (!$Row) { + $SQL->Insert('Action', array( + 'ActionID' => 1, + 'Name' => 'Promote', + 'Description' => 'This post deserves to be featured on the best of page!', + 'Tooltip' => 'Click me if this content should be featured.', + 'CssClass' => 'ReactPointUp', + 'AwardValue' => 5, + 'Permission' => 'Garden.Curation.Manage', + 'Sort' => 0 + )); + + $SQL->Insert('Action', array( + 'ActionID' => 2, + 'Name' => 'Insightful', + 'Description' => 'This post brings new meaning to the discussion.', + 'Tooltip' => 'Insightful', + 'CssClass' => 'ReactEye2', + 'AwardValue' => 1, + 'Permission' => 'Yaga.Reactions.Add', + 'Sort' => 1 + )); + + $SQL->Insert('Action', array( + 'ActionID' => 3, + 'Name' => 'Awesome', + 'Description' => 'This post is made of pure win.', + 'Tooltip' => 'Awesome', + 'CssClass' => 'ReactHeart', + 'AwardValue' => 1, + 'Permission' => 'Yaga.Reactions.Add', + 'Sort' => 2 + )); + + $SQL->Insert('Action', array( + 'ActionID' => 4, + 'Name' => 'LOL', + 'Description' => 'This post is funny.', + 'Tooltip' => 'LOL', + 'CssClass' => 'ReactWink', + 'AwardValue' => 1, + 'Permission' => 'Yaga.Reactions.Add', + 'Sort' => 3 + )); + + $SQL->Insert('Action', array( + 'ActionID' => 5, + 'Name' => 'WTF', + 'Description' => 'This post is all sorts of shocking.', + 'Tooltip' => 'WTF', + 'CssClass' => 'ReactShocked', + 'AwardValue' => 1, + 'Permission' => 'Yaga.Reactions.Add', + 'Sort' => 4 + )); + + $SQL->Insert('Action', array( + 'ActionID' => 6, + 'Name' => 'Spam', + 'Description' => 'This post is spam.', + 'Tooltip' => 'Spam', + 'CssClass' => 'ReactWarning', + 'AwardValue' => -5, + 'Permission' => 'Garden.Curation.Manage', + 'Sort' => 5 + )); +} // Insert stub badge $SQL->Insert('Badge', array( From fb8ecad4ba0efc7904bfc57bf8544f817d6e7fef Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Thu, 24 Mar 2016 11:17:22 -0500 Subject: [PATCH 096/111] Recreate default badge in SVG --- design/images/default_badges.svg | 4417 +++++++++++++++--------------- 1 file changed, 2232 insertions(+), 2185 deletions(-) diff --git a/design/images/default_badges.svg b/design/images/default_badges.svg index 1e175dfb1..0f02cd693 100644 --- a/design/images/default_badges.svg +++ b/design/images/default_badges.svg @@ -1,6 +1,4 @@ - - + width="850" + version="1.1"> + + + + + id="stop3886" /> + id="stop3888" /> + id="stop3878" /> + id="stop3880" /> + id="stop3870" /> + id="stop3872" /> + d="m 30.743876,22.29273 c 13.316177,16.003371 31.070497,24.324116 31.070497,24.324116 0,0 8.878034,23.685997 22.194209,39.689365 0,0 -19.66036,36.730359 -32.405565,42.035949 -9.804999,4.08164 -34.170085,-4.89904 -34.170085,-4.89904 0,0 -10.5210089,-32.945403 -9.5069715,-47.592012 C 9.2440771,56.812453 30.743876,22.29273 30.743876,22.29273 z" /> + transform="matrix(0.53264707,0.64013484,-0.44381433,0.76826257,41.060363,23.783738)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> - + + xlink:href="#linearGradient3868-2" + id="radialGradient3874-8" + fy="1004.014" + fx="45.061192" + r="44.015625" + cy="1004.014" + cx="45.061192" /> + id="stop3870-4" /> + id="stop3872-5" /> + d="m 30.743876,22.29273 c 13.316177,16.003371 31.070497,24.324116 31.070497,24.324116 0,0 8.878034,23.685997 22.194209,39.689365 0,0 -19.66036,36.730359 -32.405565,42.035949 -9.804999,4.08164 -34.170085,-4.89904 -34.170085,-4.89904 0,0 -10.5210089,-32.945403 -9.5069715,-47.592012 C 9.2440771,56.812453 30.743876,22.29273 30.743876,22.29273 z" /> + xlink:href="#linearGradient3868" + id="radialGradient4132" + fy="1004.014" + fx="45.061192" + r="44.015625" + cy="1004.014" + cx="45.061192" /> + xlink:href="#linearGradient3876" + id="radialGradient3094" + fy="54.464844" + fx="44.788662" + r="50" + cy="54.464844" + cx="44.788662" /> + d="m 55.513855,54.269409 c -6.853808,-8.236901 -16.495904,-9.381696 -25.754519,-4.43088 -0.432146,-5.664339 0.433102,-11.496023 3.824653,-17.1653 -8.360583,-2.792408 -19.92894,13.242217 -13.106315,24.396246 -0.751738,0.786672 -1.499978,1.615482 -2.227454,2.488924 -1.534592,-3.56709 -2.153723,-7.565067 -1.423696,-13.54777 -4.875188,0.160828 -12.4619283,16.534749 -4.6705,22.534926 -0.662902,1.184129 -1.319549,2.378598 -1.911162,3.601215 C 8.6787071,69.435561 7.6236874,66.593629 7.1930487,64.248779 4.523286,67.739606 3.8054004,76.837257 6.8497936,80.513495 0.52268547,99.252184 1.8589516,119.95082 11.132422,131.09567 c 9.273471,11.14485 23.629664,9.3054 35.266417,-3.05216 3.056319,3.65559 9.130752,0.99543 11.029487,-3.42201 -1.676739,-0.1878 -3.805126,-1.17168 -5.936606,-2.90429 0.726981,-1.05993 1.423033,-2.20704 2.110905,-3.36116 5.497712,9.9707 15.294545,-3.74713 14.52447,-10.69243 -3.948059,2.11527 -6.786132,1.95838 -9.495569,0.425 0.464352,-1.18966 0.89452,-2.40073 1.295322,-3.60916 8.837464,7.66626 17.68442,-11.638947 14.271481,-22.99595 -3.254039,5.834539 -7.074713,8.114396 -11.015389,8.52348 1.705358,-14.028315 -0.815276,-27.500679 -7.669085,-35.737581 z" /> + xlink:href="#linearGradient3884" + id="radialGradient3115" + fy="1001.5329" + fx="43.595982" + r="33.019657" + cy="1001.5329" + cx="43.595982" /> - + id="radialGradient3122" + fy="1004.014" + fx="45.061192" + r="44.015625" + cy="1004.014" + cx="45.061192" /> - - - - - + cx="45.061192" /> - - - - - + cx="44.788662" /> + xlink:href="#linearGradient3868" + id="radialGradient4540" + fy="1004.014" + fx="45.061192" + r="44.015625" + cy="1004.014" + cx="45.061192" /> + xlink:href="#linearGradient3868" + id="radialGradient4574" + fy="1004.014" + fx="45.061192" + r="44.015625" + cy="1004.014" + cx="45.061192" /> + xlink:href="#linearGradient3868" + id="radialGradient4690" + fy="1004.014" + fx="45.061192" + r="44.015625" + cy="1004.014" + cx="45.061192" /> + xlink:href="#linearGradient3868" + id="radialGradient3147" + fy="1004.014" + fx="45.061192" + r="44.015625" + cy="1004.014" + cx="45.061192" /> + xlink:href="#linearGradient3868" + id="radialGradient3175" + fy="1004.014" + fx="45.061192" + r="44.015625" + cy="1004.014" + cx="45.061192" /> - - - - - + cx="44.788662" /> - - - - - + cx="44.788662" /> - - - - - + cx="44.788662" /> + + xlink:href="#linearGradient3876" + id="radialGradient7165" + fy="54.464844" + fx="44.788662" + r="50" + cy="54.464844" + cx="44.788662" /> + + + + + + xlink:href="#linearGradient3876" + id="radialGradient3329" + fy="54.464844" + fx="44.788662" + r="50" + cy="54.464844" + cx="44.788662" /> + + + + + + xlink:href="#linearGradient3876" + id="radialGradient3473" + fy="54.464844" + fx="44.788662" + r="50" + cy="54.464844" + cx="44.788662" /> + + + + + + xlink:href="#linearGradient3876" + id="radialGradient3617" + fy="54.464844" + fx="44.788662" + r="50" + cy="54.464844" + cx="44.788662" /> + + + + + + xlink:href="#linearGradient3876" + id="radialGradient3773" + fy="54.464844" + fx="44.788662" + r="50" + cy="54.464844" + cx="44.788662" /> + + + + + + xlink:href="#linearGradient3876" + id="radialGradient3902" + fy="54.464844" + fx="44.788662" + r="50" + cy="54.464844" + cx="44.788662" /> + xlink:href="#linearGradient3868" + id="radialGradient3919" + fy="1004.014" + fx="45.061192" + r="44.015625" + cy="1004.014" + cx="45.061192" /> + gradientUnits="userSpaceOnUse" + id="linearGradient5011" + y2="0" + x2="1" + y1="0" + x1="0"> + id="stop5013" /> + id="stop5015" /> + gradientUnits="userSpaceOnUse" + id="linearGradient4979" + y2="0" + x2="1" + y1="0" + x1="0"> + id="stop4981" /> + id="stop4983" /> + gradientUnits="userSpaceOnUse" + id="linearGradient4927" + y2="0" + x2="1" + y1="0" + x1="0"> + id="stop4929" /> + id="stop4931" /> + gradientUnits="userSpaceOnUse" + id="linearGradient4891" + y2="0" + x2="1" + y1="0" + x1="0"> + id="stop4893" /> + id="stop4895" /> + gradientUnits="userSpaceOnUse" + id="linearGradient4871" + y2="0" + x2="1" + y1="0" + x1="0"> + id="stop4873" /> + id="stop4875" /> - - - - + id="stop4877" /> - - - - - - - - - - - - - - - - - - - - - + x1="0"> + + + - - - + x1="0" /> - - - + x1="0" /> - + x2="1" + y1="0" + x1="0" /> + + + + + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient4927" + id="linearGradient5322" + y2="0" + x2="1" + y1="0" + x1="0" /> + + + + xlink:href="#linearGradient4979" + id="linearGradient5399" + y2="0" + x2="1" + y1="0" + x1="0" /> + + + + xlink:href="#linearGradient4761" + id="linearGradient5457" + y2="0" + x2="1" + y1="0" + x1="0" /> + + + + xlink:href="#linearGradient5011" + id="linearGradient5503" + y2="0" + x2="1" + y1="0" + x1="0" /> + + + + + xlink:href="#linearGradient4891" + id="linearGradient5558" + y2="0" + x2="1" + y1="0" + x1="0" /> + + + + + xlink:href="#linearGradient4761" + id="linearGradient5598" + y2="0" + x2="1" + y1="0" + x1="0" /> + + + + + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient4891" + id="linearGradient5623" + y2="0" + x2="1" + y1="0" + x1="0" /> + + + + + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient4891" + id="linearGradient5644" + y2="0" + x2="1" + y1="0" + x1="0" /> + + + + @@ -1103,2207 +1130,2227 @@ + id="portrait-upload" + transform="matrix(0.99795595,0,0,1,625.1022,-952.36218)"> + transform="translate(0,952.36218)" + d="M 0,10 C 25,10 50,0 50,0 c 0,0 25,10 50,10 0,0 1.72669,46.370947 -9,62.214634 C 82.747852,84.403329 50,100 50,100 50,100 17.252148,84.403329 9,72.214634 -1.7266978,56.370947 0,10 0,10 z" /> + d="M 48.03125,959.4375 C 34.495643,964.14891 20.331474,967.26061 6,968.21875 c 0.5221736,18.08466 -0.5896199,37.56115 8.6875,53.68745 9.428796,10.8425 22.946654,17.2515 35.5625,23.5626 10.549116,-5.9047 21.789018,-11.1375 30.9375,-19.0938 9.676867,-8.1515 10.434093,-21.8099 11.935318,-33.46455 0.816364,-8.20318 0.810212,-16.45673 0.908432,-24.6917 -15.189243,-0.82151 -29.932595,-4.75961 -44.375,-9.34375 l -0.944986,0.32711 -0.680014,0.23539 z" /> + d="m 28.88373,970.60287 c -2.67249,0 -4.82866,2.15617 -4.82866,4.82867 0,2.22709 1.53447,4.1095 3.58255,4.6729 l 0,14.9013 c -2.01378,0.2299 -3.58255,1.9227 -3.58255,3.99786 0,2.0754 1.56877,3.7682 3.58255,3.998 l 0,17.2897 c -2.04583,0.5649 -3.58255,2.3955 -3.58255,4.6209 0,2.6725 2.15617,4.8287 4.82866,4.8287 2.67248,0 4.88058,-2.1562 4.88058,-4.8287 0,-0.2105 -0.0258,-0.4196 -0.0519,-0.623 l 12.46105,0 c 0.29771,1.9383 1.92436,3.4268 3.946,3.4268 2.02165,0 3.64829,-1.4885 3.946,-3.4268 l 12.14953,0 c -0.0261,0.2034 -0.0519,0.4125 -0.0519,0.623 0,2.6725 2.15618,4.8287 4.82866,4.8287 2.67249,0 4.88058,-2.1562 4.88058,-4.8287 0,-2.191 -1.48135,-4.0251 -3.47871,-4.6209 l 0,-17.2896 c 2.01379,-0.2299 3.58256,-1.9226 3.58256,-3.9981 0,-2.07516 -1.56877,-3.76797 -3.58256,-3.99786 l 0,-14.9532 c 1.99325,-0.5984 3.47871,-2.4329 3.47871,-4.621 0,-2.6725 -2.20809,-4.82867 -4.88058,-4.82867 -2.67248,0 -4.82866,2.15617 -4.82866,4.82867 0,0.2993 0.0518,0.5984 0.10385,0.8827 l -12.09761,0 c -0.0809,-2.1607 -1.86939,-3.8941 -4.04985,-3.8941 -2.18045,0 -3.96898,1.7334 -4.04984,3.8941 l -12.40913,0 c 0.052,-0.2843 0.10384,-0.5834 0.10384,-0.8827 0,-2.6725 -2.2081,-4.82867 -4.88058,-4.82867 z m 5.39979,12.30527 31.36032,0 0,34.89096 -31.36032,0 0,-34.89096 z m 15.73208,2.59609 c -4.37583,0 -7.94392,3.5681 -7.94392,7.9439 0,4.3758 3.56809,7.89197 7.94392,7.89197 4.37583,0 7.94392,-3.51617 7.94392,-7.89197 0,-4.3758 -3.56809,-7.9439 -7.94392,-7.9439 z m -6.17861,15.68017 c -2.54289,0.3447 -2.90758,3.3229 -2.90758,3.3229 l 0,11.6303 18.27622,0 0,-11.6303 c 0,0 -0.36469,-2.9782 -2.90758,-3.3229 -2.19749,-0.2978 -4.60438,1.7134 -6.23053,1.7134 -1.62615,0 -4.03304,-2.0112 -6.23053,-1.7134 z" /> + clip-path="url(#clipPath3853)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-48.33771,973.62125)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + id="achievement-combo" + transform="matrix(0.99795595,0,0,1,625.1022,-327.36218)"> + transform="translate(0,952.36218)" + d="M 0,10 C 25,10 50,0 50,0 c 0,0 25,10 50,10 0,0 1.72669,46.370947 -9,62.214634 C 82.747852,84.403329 50,100 50,100 50,100 17.252148,84.403329 9,72.214634 -1.7266978,56.370947 0,10 0,10 z" /> + d="M 48.03125,959.4375 C 34.495643,964.14891 20.331474,967.26061 6,968.21875 c 0.5221736,18.08466 -0.5896199,37.56115 8.6875,53.68745 9.428796,10.8425 22.946654,17.2515 35.5625,23.5626 10.549116,-5.9047 21.789018,-11.1375 30.9375,-19.0938 9.676867,-8.1515 10.434093,-21.8099 11.935318,-33.46455 0.816364,-8.20318 0.810212,-16.45673 0.908432,-24.6917 -15.189243,-0.82151 -29.932595,-4.75961 -44.375,-9.34375 l -0.944986,0.32711 -0.680014,0.23539 z" /> + d="m 49.904257,967.14674 c -11.11257,0 -20.157511,9.04482 -20.157511,20.15751 0,7.01684 3.620451,13.16565 9.076449,16.76075 l -9.410551,21.7167 13.809566,0 6.626363,-17.7631 6.682049,17.7631 13.809566,0 -9.410552,-21.6609 c 5.475182,-3.5891 9.076448,-9.77237 9.076448,-16.81655 0,-11.11269 -8.989257,-20.15751 -20.101827,-20.15751 z m 0,3.67513 c 9.096812,0 16.482386,7.38553 16.482386,16.48238 0,9.09685 -7.385574,16.48235 -16.482386,16.48235 -9.096812,0 -16.482384,-7.3855 -16.482384,-16.48235 0,-9.09685 7.385572,-16.48238 16.482384,-16.48238 z m -21.549604,3.73072 c -8.064654,0 -14.644821,6.5803 -14.644821,14.6449 0,5.09249 2.611134,9.53004 6.57068,12.13911 l -6.849098,15.7584 10.023071,0 4.844485,-12.8629 3.229656,8.5196 3.73081,-8.6867 c -1.420438,-0.9359 -2.70206,-2.0886 -3.842178,-3.341 -0.989531,0.2654 -1.989815,0.3898 -3.062605,0.3898 -6.60177,0 -11.972002,-5.31464 -11.972002,-11.91631 0,-6.60168 5.370232,-11.97209 11.972002,-11.97209 0.187164,0 0.371764,0 0.556837,0 0.510107,-0.87722 1.094024,-1.71844 1.726196,-2.50567 -0.759313,-0.12296 -1.489097,-0.1675 -2.283033,-0.1675 z m 43.377627,0 c -0.877504,0 -1.725999,0.0749 -2.561451,0.22273 0.626958,0.78812 1.165329,1.62811 1.670511,2.50586 0.294786,-0.0213 0.590628,-0.0552 0.89094,-0.0552 6.601774,0 11.972003,5.37041 11.972003,11.97209 0,6.60165 -5.370229,11.91643 -11.972003,11.91643 -1.155309,0 -2.228165,-0.1391 -3.28534,-0.4456 -1.165442,1.3023 -2.485266,2.4899 -3.953545,3.4525 l 3.897862,8.965 3.341023,-8.8536 4.844485,12.8628 10.023071,0 -6.849098,-15.7028 c 3.973466,-2.60478 6.57068,-7.0827 6.57068,-12.19473 0,-8.06461 -6.524493,-14.64491 -14.589138,-14.64491 z" /> + clip-path="url(#clipPath3853-5)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-48.33771,973.62125)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + id="welcome-committee" + transform="matrix(0.99795595,0,0,1,625.1022,-577.36218)"> + transform="translate(0,952.36218)" + d="M 0,10 C 25,10 50,0 50,0 c 0,0 25,10 50,10 0,0 1.72669,46.370947 -9,62.214634 C 82.747852,84.403329 50,100 50,100 50,100 17.252148,84.403329 9,72.214634 -1.7266978,56.370947 0,10 0,10 z" /> + d="M 48.03125,959.4375 C 34.495643,964.14891 20.331474,967.26061 6,968.21875 c 0.5221736,18.08466 -0.5896199,37.56115 8.6875,53.68745 9.428796,10.8425 22.946654,17.2515 35.5625,23.5626 10.549116,-5.9047 21.789018,-11.1375 30.9375,-19.0938 9.676867,-8.1515 10.434093,-21.8099 11.935318,-33.46455 0.816364,-8.20318 0.810212,-16.45673 0.908432,-24.6917 -15.189243,-0.82151 -29.932595,-4.75961 -44.375,-9.34375 l -0.944986,0.32711 -0.680014,0.23539 z" /> + d="m 49.98866,966.77657 c -5.365203,0 -9.707128,4.39608 -9.707128,9.76114 0,5.3652 4.341925,9.7071 9.707128,9.7071 5.365204,0 9.707129,-4.3419 9.707129,-9.7071 0,-5.36506 -4.341925,-9.76114 -9.707129,-9.76114 z m -18.659257,6.74115 c -4.216328,0 -7.603918,3.44158 -7.603918,7.65784 0,4.2164 3.38759,7.65781 7.603918,7.65781 4.216327,0 7.657846,-3.44141 7.657846,-7.65781 0,-4.21626 -3.441519,-7.65784 -7.657846,-7.65784 z m 37.264586,0 c -4.216328,0 -7.657845,3.44158 -7.657845,7.65784 0,4.2164 3.441517,7.65781 7.657845,7.65781 4.21633,0 7.60392,-3.44141 7.60392,-7.65781 0,-4.21626 -3.38759,-7.65784 -7.60392,-7.65784 z m -26.155317,12.45736 c -0.395361,-0.0379 -0.798332,10e-4 -1.186427,0.0535 -3.592794,0.48699 -4.098566,4.63785 -4.098566,4.63785 l 0,16.44807 c 0,0 0.0069,3.829 3.397495,3.829 l 0,17.6346 c 0,0 0.02398,2.5885 1.725712,2.5885 l 15.531405,0 c 1.694908,0 1.725713,-2.5885 1.725713,-2.5885 l 0,-17.6346 c 3.349709,0 3.451423,-3.829 3.451423,-3.829 l 0,-16.44807 c 0,0 -0.505772,-4.15086 -4.098565,-4.63785 -3.10478,-0.42091 -6.492801,2.42669 -8.790345,2.42669 -2.010385,0 -4.890304,-2.2172 -7.657845,-2.48071 z m -17.958188,2.64258 c -2.823436,0.38276 -3.235709,3.66714 -3.235709,3.66714 l 0,12.9428 c 0,0 0.03158,3.02 2.696424,3.02 l 0,13.8596 c 0,0 0.01037,1.9954 1.348213,1.9954 l 12.187838,0 c 1.331974,0 1.348213,-1.9954 1.348213,-1.9954 l 0,-9.5453 c -2.135793,-0.2133 -3.774994,-1.9552 -3.774994,-4.1526 l 0,-19.09066 c -1.342707,0.56622 -2.612003,1.24044 -3.613209,1.24044 -1.579907,0 -3.865077,-1.73416 -6.039991,-1.94142 -0.31068,-0.0294 -0.611782,-0.0397 -0.916785,0 z m 50.153498,0 c -2.16789,0.2133 -4.406191,1.94142 -5.986064,1.94142 -1.053271,0 -2.406367,-0.77294 -3.828923,-1.34829 l 0,19.19851 c 0,2.1432 -1.600822,3.8702 -3.667137,4.1526 l 0,9.5453 c 0,0 0.01037,1.9954 1.348212,1.9954 l 12.241769,0 c 1.331974,0 1.348212,-1.9954 1.348212,-1.9954 l 0,-13.8596 c 2.632418,0 2.696424,-3.02 2.696424,-3.02 l 0,-12.9428 c 0,0 -0.412273,-3.28438 -3.235709,-3.66714 -0.304986,-0.0414 -0.607088,-0.031 -0.916785,0 z" /> + clip-path="url(#clipPath3853)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-48.33771,973.62125)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + id="anniversary-5" + transform="translate(500,-202.3622)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 50.000001,975.05446 c -1.750773,0 -3.166881,3.50378 -3.166881,5.25455 0,1.75077 1.416108,3.16688 3.166881,3.16688 1.750774,0 3.166881,-1.41611 3.166881,-3.16688 0,-1.75077 -1.416107,-5.25455 -3.166881,-5.25455 z m -3.449954,9.80141 0,6.84686 c -13.188723,0.53835 -23.388919,4.1144 -23.388919,8.45677 l 0,20.9651 c 0,4.7152 12.016993,8.5453 26.838873,8.5453 14.82188,0 26.838871,-3.8301 26.838871,-8.5453 l 0,-20.9651 c 0,-4.34237 -10.200193,-7.91842 -23.388917,-8.45677 l 0,-6.84686 -6.899908,0 z m 0,9.99605 0,7.43068 6.899908,0 0,-7.43068 c 10.993129,0.39188 19.425893,2.61389 19.425893,5.30758 0,2.97 -10.242428,5.3784 -22.875847,5.3784 -12.633419,0 -22.875849,-2.4084 -22.875849,-5.3784 0,-2.69369 8.432766,-4.9157 19.425895,-5.30758 z m 27.263481,15.65748 0,5.6968 c -4.474518,2.7331 -13.456752,4.6 -23.813527,4.6 -10.038804,0 -18.786093,-1.7556 -23.388919,-4.3523 l 0,-5.6968 c 4.601512,2.5982 13.346548,4.3522 23.388919,4.3522 10.360789,0 19.34077,-1.8651 23.813527,-4.5999 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.60979,896.81019)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> x5 + y="978.18988" + x="80.538483">x5 + id="anniversary-4" + transform="translate(375,-202.3622)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 50.000001,975.05446 c -1.750773,0 -3.166881,3.50378 -3.166881,5.25455 0,1.75077 1.416108,3.16688 3.166881,3.16688 1.750774,0 3.166881,-1.41611 3.166881,-3.16688 0,-1.75077 -1.416107,-5.25455 -3.166881,-5.25455 z m -3.449954,9.80141 0,6.84686 c -13.188723,0.53835 -23.388919,4.1144 -23.388919,8.45677 l 0,20.9651 c 0,4.7152 12.016993,8.5453 26.838873,8.5453 14.82188,0 26.838871,-3.8301 26.838871,-8.5453 l 0,-20.9651 c 0,-4.34237 -10.200193,-7.91842 -23.388917,-8.45677 l 0,-6.84686 -6.899908,0 z m 0,9.99605 0,7.43068 6.899908,0 0,-7.43068 c 10.993129,0.39188 19.425893,2.61389 19.425893,5.30758 0,2.97 -10.242428,5.3784 -22.875847,5.3784 -12.633419,0 -22.875849,-2.4084 -22.875849,-5.3784 0,-2.69369 8.432766,-4.9157 19.425895,-5.30758 z m 27.263481,15.65748 0,5.6968 c -4.474518,2.7331 -13.456752,4.6 -23.813527,4.6 -10.038804,0 -18.786093,-1.7556 -23.388919,-4.3523 l 0,-5.6968 c 4.601512,2.5982 13.346548,4.3522 23.388919,4.3522 10.360789,0 19.34077,-1.8651 23.813527,-4.5999 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.60979,896.81019)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> x4 + y="978.18988" + x="80.538483">x4 + id="anniversary-3" + transform="translate(250,-202.3622)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 50.000001,975.05446 c -1.750773,0 -3.166881,3.50378 -3.166881,5.25455 0,1.75077 1.416108,3.16688 3.166881,3.16688 1.750774,0 3.166881,-1.41611 3.166881,-3.16688 0,-1.75077 -1.416107,-5.25455 -3.166881,-5.25455 z m -3.449954,9.80141 0,6.84686 c -13.188723,0.53835 -23.388919,4.1144 -23.388919,8.45677 l 0,20.9651 c 0,4.7152 12.016993,8.5453 26.838873,8.5453 14.82188,0 26.838871,-3.8301 26.838871,-8.5453 l 0,-20.9651 c 0,-4.34237 -10.200193,-7.91842 -23.388917,-8.45677 l 0,-6.84686 -6.899908,0 z m 0,9.99605 0,7.43068 6.899908,0 0,-7.43068 c 10.993129,0.39188 19.425893,2.61389 19.425893,5.30758 0,2.97 -10.242428,5.3784 -22.875847,5.3784 -12.633419,0 -22.875849,-2.4084 -22.875849,-5.3784 0,-2.69369 8.432766,-4.9157 19.425895,-5.30758 z m 27.263481,15.65748 0,5.6968 c -4.474518,2.7331 -13.456752,4.6 -23.813527,4.6 -10.038804,0 -18.786093,-1.7556 -23.388919,-4.3523 l 0,-5.6968 c 4.601512,2.5982 13.346548,4.3522 23.388919,4.3522 10.360789,0 19.34077,-1.8651 23.813527,-4.5999 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.60979,896.81019)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> x3 + y="978.18988" + x="80.538483">x3 + id="anniversary-2" + transform="translate(125,-202.3622)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 50.000001,975.05446 c -1.750773,0 -3.166881,3.50378 -3.166881,5.25455 0,1.75077 1.416108,3.16688 3.166881,3.16688 1.750774,0 3.166881,-1.41611 3.166881,-3.16688 0,-1.75077 -1.416107,-5.25455 -3.166881,-5.25455 z m -3.449954,9.80141 0,6.84686 c -13.188723,0.53835 -23.388919,4.1144 -23.388919,8.45677 l 0,20.9651 c 0,4.7152 12.016993,8.5453 26.838873,8.5453 14.82188,0 26.838871,-3.8301 26.838871,-8.5453 l 0,-20.9651 c 0,-4.34237 -10.200193,-7.91842 -23.388917,-8.45677 l 0,-6.84686 -6.899908,0 z m 0,9.99605 0,7.43068 6.899908,0 0,-7.43068 c 10.993129,0.39188 19.425893,2.61389 19.425893,5.30758 0,2.97 -10.242428,5.3784 -22.875847,5.3784 -12.633419,0 -22.875849,-2.4084 -22.875849,-5.3784 0,-2.69369 8.432766,-4.9157 19.425895,-5.30758 z m 27.263481,15.65748 0,5.6968 c -4.474518,2.7331 -13.456752,4.6 -23.813527,4.6 -10.038804,0 -18.786093,-1.7556 -23.388919,-4.3523 l 0,-5.6968 c 4.601512,2.5982 13.346548,4.3522 23.388919,4.3522 10.360789,0 19.34077,-1.8651 23.813527,-4.5999 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.60979,896.81019)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> x2 + y="978.18988" + x="80.538483">x2 + id="anniversary-1" + transform="translate(6.366175e-7,-202.3622)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 50.000001,975.05446 c -1.750773,0 -3.166881,3.50378 -3.166881,5.25455 0,1.75077 1.416108,3.16688 3.166881,3.16688 1.750774,0 3.166881,-1.41611 3.166881,-3.16688 0,-1.75077 -1.416107,-5.25455 -3.166881,-5.25455 z m -3.449954,9.80141 0,6.84686 c -13.188723,0.53835 -23.388919,4.1144 -23.388919,8.45677 l 0,20.9651 c 0,4.7152 12.016993,8.5453 26.838873,8.5453 14.82188,0 26.838871,-3.8301 26.838871,-8.5453 l 0,-20.9651 c 0,-4.34237 -10.200193,-7.91842 -23.388917,-8.45677 l 0,-6.84686 -6.899908,0 z m 0,9.99605 0,7.43068 6.899908,0 0,-7.43068 c 10.993129,0.39188 19.425893,2.61389 19.425893,5.30758 0,2.97 -10.242428,5.3784 -22.875847,5.3784 -12.633419,0 -22.875849,-2.4084 -22.875849,-5.3784 0,-2.69369 8.432766,-4.9157 19.425895,-5.30758 z m 27.263481,15.65748 0,5.6968 c -4.474518,2.7331 -13.456752,4.6 -23.813527,4.6 -10.038804,0 -18.786093,-1.7556 -23.388919,-4.3523 l 0,-5.6968 c 4.601512,2.5982 13.346548,4.3522 23.388919,4.3522 10.360789,0 19.34077,-1.8651 23.813527,-4.5999 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + id="comment-5" + transform="translate(500,-327.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(-0.0908222,0,0,0.0908222,42.12827,930.57673)"> + transform="matrix(-11.010524,0,0,11.010524,413.36315,-3501.171)" + d="m 22.90625,367.875 c -6.342951,0 -11.46875,5.09455 -11.46875,11.4375 l 0,12.875 c 0,6.27719 4.998591,11.33313 11.25,11.4375 l -2.5,10.84375 17.15625,-10.84375 9.46875,0 c 6.342951,0 11.46875,-5.09455 11.46875,-11.4375 l 0,-12.875 c 0,-6.34295 -5.125799,-11.4375 -11.46875,-11.4375 l -23.90625,0 z m -2.34375,8.71875 28.5,0 0,2 -28.5,0 0,-2 z m 0,7.1875 28.5,0 0,2 -28.5,0 0,-2 z m 0,7.15625 28.5,0 0,2 -28.5,0 0,-2 z" /> + d="m -353,681.15625 c -59.68356,0 -107.71875,48.06644 -107.71875,107.75 l 0,121 c 0,59.06482 47.0528,106.70545 105.875,107.68755 l -23.75,102 161.71875,-101.9688 89.03125,0 c 38.44543,0 72.068088,-19.92144 91.125,-50.0625 l -73.0625,0 c -80.61898,0 -145.53125,-64.91227 -145.53125,-145.53125 l 0,-140.875 -97.6875,0 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x5 + y="979.42731" + x="80.873962">x5 + id="comment-4" + transform="translate(375,-327.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(-0.0908222,0,0,0.0908222,42.12827,930.57673)"> + transform="matrix(-11.010524,0,0,11.010524,413.36315,-3501.171)" + d="m 22.90625,367.875 c -6.342951,0 -11.46875,5.09455 -11.46875,11.4375 l 0,12.875 c 0,6.27719 4.998591,11.33313 11.25,11.4375 l -2.5,10.84375 17.15625,-10.84375 9.46875,0 c 6.342951,0 11.46875,-5.09455 11.46875,-11.4375 l 0,-12.875 c 0,-6.34295 -5.125799,-11.4375 -11.46875,-11.4375 l -23.90625,0 z m -2.34375,8.71875 28.5,0 0,2 -28.5,0 0,-2 z m 0,7.1875 28.5,0 0,2 -28.5,0 0,-2 z m 0,7.15625 28.5,0 0,2 -28.5,0 0,-2 z" /> + d="m -353,681.15625 c -59.68356,0 -107.71875,48.06644 -107.71875,107.75 l 0,121 c 0,59.06482 47.0528,106.70545 105.875,107.68755 l -23.75,102 161.71875,-101.9688 89.03125,0 c 38.44543,0 72.068088,-19.92144 91.125,-50.0625 l -73.0625,0 c -80.61898,0 -145.53125,-64.91227 -145.53125,-145.53125 l 0,-140.875 -97.6875,0 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x4 + y="979.42731" + x="80.873962">x4 + id="comment-3" + transform="translate(250,-327.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(-0.0908222,0,0,0.0908222,42.12827,930.57673)"> + transform="matrix(-11.010524,0,0,11.010524,413.36315,-3501.171)" + d="m 22.90625,367.875 c -6.342951,0 -11.46875,5.09455 -11.46875,11.4375 l 0,12.875 c 0,6.27719 4.998591,11.33313 11.25,11.4375 l -2.5,10.84375 17.15625,-10.84375 9.46875,0 c 6.342951,0 11.46875,-5.09455 11.46875,-11.4375 l 0,-12.875 c 0,-6.34295 -5.125799,-11.4375 -11.46875,-11.4375 l -23.90625,0 z m -2.34375,8.71875 28.5,0 0,2 -28.5,0 0,-2 z m 0,7.1875 28.5,0 0,2 -28.5,0 0,-2 z m 0,7.15625 28.5,0 0,2 -28.5,0 0,-2 z" /> + d="m -353,681.15625 c -59.68356,0 -107.71875,48.06644 -107.71875,107.75 l 0,121 c 0,59.06482 47.0528,106.70545 105.875,107.68755 l -23.75,102 161.71875,-101.9688 89.03125,0 c 38.44543,0 72.068088,-19.92144 91.125,-50.0625 l -73.0625,0 c -80.61898,0 -145.53125,-64.91227 -145.53125,-145.53125 l 0,-140.875 -97.6875,0 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x3 + y="979.42731" + x="80.873962">x3 + id="comment-2" + transform="translate(125,-327.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(-0.0908222,0,0,0.0908222,42.12827,930.57673)"> + transform="matrix(-11.010524,0,0,11.010524,413.36315,-3501.171)" + d="m 22.90625,367.875 c -6.342951,0 -11.46875,5.09455 -11.46875,11.4375 l 0,12.875 c 0,6.27719 4.998591,11.33313 11.25,11.4375 l -2.5,10.84375 17.15625,-10.84375 9.46875,0 c 6.342951,0 11.46875,-5.09455 11.46875,-11.4375 l 0,-12.875 c 0,-6.34295 -5.125799,-11.4375 -11.46875,-11.4375 l -23.90625,0 z m -2.34375,8.71875 28.5,0 0,2 -28.5,0 0,-2 z m 0,7.1875 28.5,0 0,2 -28.5,0 0,-2 z m 0,7.15625 28.5,0 0,2 -28.5,0 0,-2 z" /> + d="m -353,681.15625 c -59.68356,0 -107.71875,48.06644 -107.71875,107.75 l 0,121 c 0,59.06482 47.0528,106.70545 105.875,107.68755 l -23.75,102 161.71875,-101.9688 89.03125,0 c 38.44543,0 72.068088,-19.92144 91.125,-50.0625 l -73.0625,0 c -80.61898,0 -145.53125,-64.91227 -145.53125,-145.53125 l 0,-140.875 -97.6875,0 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x2 + y="979.42731" + x="80.873962">x2 + id="comment-1" + transform="translate(6.366175e-7,-327.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(-0.0908222,0,0,0.0908222,42.12827,930.57673)"> + transform="matrix(-11.010524,0,0,11.010524,413.36315,-3501.171)" + d="m 22.90625,367.875 c -6.342951,0 -11.46875,5.09455 -11.46875,11.4375 l 0,12.875 c 0,6.27719 4.998591,11.33313 11.25,11.4375 l -2.5,10.84375 17.15625,-10.84375 9.46875,0 c 6.342951,0 11.46875,-5.09455 11.46875,-11.4375 l 0,-12.875 c 0,-6.34295 -5.125799,-11.4375 -11.46875,-11.4375 l -23.90625,0 z m -2.34375,8.71875 28.5,0 0,2 -28.5,0 0,-2 z m 0,7.1875 28.5,0 0,2 -28.5,0 0,-2 z m 0,7.15625 28.5,0 0,2 -28.5,0 0,-2 z" /> + d="m -353,681.15625 c -59.68356,0 -107.71875,48.06644 -107.71875,107.75 l 0,121 c 0,59.06482 47.0528,106.70545 105.875,107.68755 l -23.75,102 161.71875,-101.9688 89.03125,0 c 38.44543,0 72.068088,-19.92144 91.125,-50.0625 l -73.0625,0 c -80.61898,0 -145.53125,-64.91227 -145.53125,-145.53125 l 0,-140.875 -97.6875,0 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + y="-1069.0178" + x="51.643356" /> + id="anniversary-longtime" + transform="translate(625.88566,-202.36221)"> + d="m 49.114337,952.36218 c -12.64349,0 -23.862024,8.02302 -30.828919,20.375 -4.033359,-3.9527 -6.759354,-9.23185 -6.632517,-16.71875 -10.8595399,5.574 -13.3696777,28.57384 1.074714,30.84375 -0.323693,1.29845 -0.617073,2.62604 -0.859771,3.96875 -3.9145633,-1.32358 -7.1033835,-3.82343 -10.0715993,-9.09375 -5.2070213,4.62481 -3.1684968,24.20912 9.0890043,21.62502 0.02303,1.5218 0.05938,3.0457 0.184236,4.5312 -3.4105858,-0.6369 -6.3468641,-1.8461 -8.2906453,-3.25 -0.7111724,5.1469 4.2295442,12.7991 9.8566563,12.8125 4.897455,20.2381 19.371704,34.9063 36.478841,34.9063 17.107137,0 31.581386,-14.6682 36.478841,-34.9063 5.627113,-0.013 10.56783,-7.6656 9.856657,-12.8125 -1.943782,1.4039 -4.88006,2.6131 -8.290646,3.25 0.12486,-1.4855 0.161206,-3.0094 0.184237,-4.5312 12.257499,2.5841 14.296024,-17.00021 9.089004,-21.62502 -2.968216,5.27032 -6.157036,7.77017 -10.071599,9.09375 -0.242698,-1.34271 -0.536079,-2.6703 -0.859771,-3.96875 14.444393,-2.26991 11.934254,-25.26975 1.074713,-30.84375 0.126838,7.4869 -2.599157,12.76605 -6.632516,16.71875 -6.966896,-12.35198 -18.185429,-20.375 -30.82892,-20.375 z" /> + d="M 49.3125,958.40625 C 29.859131,959.55673 18.347334,979.8065 17.21875,997.5 c -1.839843,19.1708 6.943716,41.8679 26.59375,48.1875 16.359357,3.9288 31.638602,-9.6517 35.96875,-24.625 7.747068,-21.17231 1.701769,-49.35337 -19.3125,-60.4375 -3.52009,-1.55423 -7.315859,-2.41264 -11.15625,-2.21875 z" /> + d="m 49.999587,974.73791 c -1.559838,0 -2.821513,3.12167 -2.821513,4.68153 0,1.55986 1.261675,2.82153 2.821513,2.82153 1.559847,0 2.821513,-1.26167 2.821513,-2.82153 0,-1.55986 -1.261666,-4.68153 -2.821513,-4.68153 z m -3.073713,8.73247 0,6.10021 c -11.750413,0.47968 -20.838221,3.6657 -20.838221,7.5345 l 0,18.67871 c 0,4.201 10.706467,7.6134 23.911934,7.6134 13.205467,0 23.911934,-3.4124 23.911934,-7.6134 l 0,-18.67871 c 0,-3.8688 -9.087799,-7.05482 -20.838212,-7.5345 l 0,-6.10021 -6.147435,0 z m 0,8.90597 0,6.62034 6.147435,0 0,-6.62034 c 9.794265,0.34916 17.307383,2.32884 17.307383,4.72874 0,2.6461 -9.125433,4.79191 -20.381105,4.79191 -11.255672,0 -20.381105,-2.14581 -20.381105,-4.79191 0,-2.3999 7.513127,-4.37958 17.307392,-4.72874 z m 24.290238,13.94995 0,5.0755 c -3.986547,2.4351 -11.989212,4.0984 -21.216525,4.0984 -8.94401,0 -16.737357,-1.5642 -20.838222,-3.8777 l 0,-5.0755 c 4.099698,2.3148 11.891031,3.8776 20.838222,3.8776 9.230885,0 17.231546,-1.6617 21.216525,-4.0983 z" /> + clip-path="url(#clipPath3099)" + transform="matrix(1.0888157,-0.92329738,0.62899331,0.76826259,-45.465117,961.92482)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + id="mention" + transform="matrix(0.99795595,0,0,1,750.1022,-952.36218)"> + transform="translate(0,952.36218)" + d="M 0,10 C 25,10 50,0 50,0 c 0,0 25,10 50,10 0,0 1.72669,46.370947 -9,62.214634 C 82.747852,84.403329 50,100 50,100 50,100 17.252148,84.403329 9,72.214634 -1.7266978,56.370947 0,10 0,10 z" /> + d="M 48.03125,959.4375 C 34.495643,964.14891 20.331474,967.26061 6,968.21875 c 0.5221736,18.08466 -0.5896199,37.56115 8.6875,53.68745 9.428796,10.8425 22.946654,17.2515 35.5625,23.5626 10.549116,-5.9047 21.789018,-11.1375 30.9375,-19.0938 9.676867,-8.1515 10.434093,-21.8099 11.935318,-33.46455 0.816364,-8.20318 0.810212,-16.45673 0.908432,-24.6917 -15.189243,-0.82151 -29.932595,-4.75961 -44.375,-9.34375 l -0.944986,0.32711 -0.680014,0.23539 z" /> + d="m 80.223452,995.77249 c -6e-5,3.34737 -0.666691,6.59541 -1.999892,9.74421 -1.418421,3.3757 -3.361576,6.028 -5.829473,7.957 -2.836777,2.2126 -5.82952,3.319 -8.97824,3.3189 -1.78718,10e-5 -3.361561,-0.4964 -4.72315,-1.4892 -0.567384,-0.4255 -1.205646,-1.1773 -1.91479,-2.2552 -2.609823,2.5814 -5.673485,3.8721 -9.190994,3.8721 -3.659402,0 -6.793982,-1.2765 -9.403749,-3.8296 -3.092048,-3.0353 -4.638062,-7.0634 -4.638048,-12.0844 -1.4e-5,-5.6451 1.971509,-10.0562 5.914575,-13.23337 2.779969,-2.24098 6.070569,-3.36148 9.871809,-3.36153 2.496287,5e-5 5.120256,0.83688 7.871916,2.51051 l 0.510611,-1.82969 8.04212,0 -2.3403,19.19048 c -0.14188,1.1631 -0.212798,2.4538 -0.212754,3.8721 -4.4e-5,1.1063 0.326179,1.6595 0.97867,1.6595 0.510566,0 1.077911,-0.1276 1.702036,-0.383 2.212598,-0.9077 3.985551,-2.7374 5.318863,-5.489 1.163005,-2.4112 1.744533,-4.93591 1.744587,-7.57409 -5.4e-5,-5.24791 -1.673721,-9.70157 -5.021007,-13.36099 -4.311868,-4.70891 -10.141335,-7.06339 -17.488419,-7.06344 -5.900416,5e-5 -11.063254,1.88647 -15.488527,5.65927 -5.50326,4.68064 -8.254882,10.77959 -8.254875,18.29688 -7e-6,8.14147 3.16294,14.50987 9.488851,19.10537 4.028131,2.9218 9.091683,4.3827 15.190671,4.3827 5.049336,0 9.602278,-0.8935 13.658838,-2.6807 l 2.80836,-1.234 1.276527,-0.6382 c 0.113419,-0.057 0.31199,-0.1418 0.595712,-0.2553 l 2.765809,7.0209 -0.46806,0.2127 c -0.170256,0.085 -0.38301,0.1986 -0.638264,0.3404 l -0.425509,0.2128 -2.042443,0.9361 c -5.247988,2.4112 -11.049088,3.6168 -17.403318,3.6168 -7.999593,0 -14.722628,-1.9573 -20.169126,-5.872 -3.971425,-2.8651 -7.070546,-6.5244 -9.297371,-10.9781 -2.226831,-4.4537 -3.340245,-9.1626 -3.340246,-14.12692 10e-7,-8.14137 2.666521,-15.07716 7.999569,-20.80739 6.29752,-6.77972 14.268714,-10.1696 23.913605,-10.16966 9.304423,6e-5 16.864292,3.10627 22.67963,9.31864 4.623806,4.93595 6.935736,10.76542 6.935796,17.48842 z m -23.871054,3.44663 c -3.7e-5,-2.01405 -0.680851,-3.63098 -2.042443,-4.85081 -1.361662,-1.21975 -3.063697,-1.82965 -5.106108,-1.82968 -1.673697,3e-5 -3.17716,0.62411 -4.510395,1.87224 -1.730427,1.64533 -2.595628,3.98563 -2.595605,7.02093 -2.3e-5,1.9573 0.468037,3.6168 1.404179,4.9784 1.077931,1.5886 2.538844,2.3829 4.382743,2.3829 2.38282,0 4.411077,-1.0212 6.084779,-3.0637 1.58853,-1.9006 2.382813,-4.0707 2.38285,-6.51028 z" /> + clip-path="url(#clipPath3853)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-48.33771,973.62125)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + id="moon-landing" + transform="matrix(0.99795595,0,0,1,750.1022,-827.36218)"> + transform="translate(0,952.36218)" + d="M 0,10 C 25,10 50,0 50,0 c 0,0 25,10 50,10 0,0 1.72669,46.370947 -9,62.214634 C 82.747852,84.403329 50,100 50,100 50,100 17.252148,84.403329 9,72.214634 -1.7266978,56.370947 0,10 0,10 z" /> + d="M 48.03125,959.4375 C 34.495643,964.14891 20.331474,967.26061 6,968.21875 c 0.5221736,18.08466 -0.5896199,37.56115 8.6875,53.68745 9.428796,10.8425 22.946654,17.2515 35.5625,23.5626 10.549116,-5.9047 21.789018,-11.1375 30.9375,-19.0938 9.676867,-8.1515 10.434093,-21.8099 11.935318,-33.46455 0.816364,-8.20318 0.810212,-16.45673 0.908432,-24.6917 -15.189243,-0.82151 -29.932595,-4.75961 -44.375,-9.34375 l -0.944986,0.32711 -0.680014,0.23539 z" /> + id="g3924" + transform="matrix(0.77081921,0,0,0.77081921,-77.998116,400.24253)"> + transform="translate(0.32161241,-2.1440827)" + d="m 193.50347,813.97955 a 26.10421,7.0754733 0 1 1 -52.20842,0 26.10421,7.0754733 0 1 1 52.20842,0 z" /> + d="m 150.62243,760.66147 c -1.68271,0.34419 -14.90903,9.14536 -14.36597,22.01448 0.41376,9.80503 8.48661,5.22921 9.38128,3.99726 1.69129,-2.32886 4.69273,-8.4564 5.41289,-12.14478 l -0.21441,29.90996 c -2.60054,1.22378 -3.66137,6.41189 4.2894,7.38203 6.83441,0.83392 8.34626,-2.64433 9.07288,-4.63297 l 2.89451,-14.97663 2.18232,15.01487 c 0,0 0.73892,5.05692 9.42398,4.51133 6.34621,-0.39867 7.20582,-4.62898 3.57967,-7.59583 0,-3.05945 0.61128,-29.61276 0.61128,-29.61276 0,0 12.91774,-4.31241 17.58148,-19.83276 3.47815,-11.57484 -9.6089,-10.42644 -10.4759,-3.00049 -1.46642,5.75806 -5.53415,8.05731 -8.67971,9.50416 -8.10677,3.72882 -28.49539,1.01661 -30.6937,-0.53787 z" /> + y="768.90338" + x="156.49878" + ry="2.9835119" + height="16.056793" + width="20.477776" /> + y="773.89398" + x="161.0554" + height="5.9941468" + width="10.876257" /> + d="m 150.62243,760.66147 c 0.34418,-5.58351 0.54255,-12.25317 1.83304,-14.69757 3.58334,-6.78743 21.03478,-7.92294 26.93589,-1.65616 1.64049,1.74215 2.80456,8.37979 1.92477,16.8916 -8.10677,3.72882 -28.49539,1.01661 -30.6937,-0.53787 z" /> + d="m 158.04477,749.94452 c 0,0 5.96333,-1.08491 8.97766,-1.08491 3.01433,0 8.97766,1.08491 8.97766,1.08491 l 0,6.8892 c 0,0 -5.98511,0.37972 -8.97766,0.37972 -2.99255,0 -8.97766,-0.37972 -8.97766,-0.37972 z" /> + clip-path="url(#clipPath3853)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-48.33771,973.62125)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + id="unimpressed-necropost" + transform="translate(750,-702.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 14.889144,981.11719 c -0.389629,1.56835 -0.603249,3.2473 -0.603249,4.99189 0,8.69263 5.239735,15.73722 11.703033,15.73722 6.463301,0 11.703034,-7.04459 11.703034,-15.73722 0,-1.74459 -0.213618,-3.42354 -0.603249,-4.99189 l -22.199569,0 z" /> + d="m 13.997098,1008.6697 62.862924,0" /> + d="m 53.037112,980.3933 c -0.544676,1.64938 -0.844549,3.43398 -0.844549,5.30105 0,8.30191 5.897347,15.03595 13.165913,15.03595 7.268563,0 13.158372,-6.73404 13.158372,-15.03595 0,-1.86725 -0.299771,-3.65153 -0.844549,-5.30105 l -24.635187,0 z" /> + transform="matrix(0.24129966,0,0,0.24129966,33.81169,859.01538)" + d="m 136.83109,544.06165 a 11.18946,11.18946 0 1 1 -22.37892,0 11.18946,11.18946 0 1 1 22.37892,0 z" /> + transform="matrix(0.24129966,0,0,0.24129966,-4.9656339,859.27252)" + d="m 136.83109,544.06165 a 11.18946,11.18946 0 1 1 -22.37892,0 11.18946,11.18946 0 1 1 22.37892,0 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + id="running-man" + transform="matrix(0.99795595,0,0,1,625.1022,-827.36218)"> + transform="translate(0,952.36218)" + d="M 0,10 C 25,10 50,0 50,0 c 0,0 25,10 50,10 0,0 1.72669,46.370947 -9,62.214634 C 82.747852,84.403329 50,100 50,100 50,100 17.252148,84.403329 9,72.214634 -1.7266978,56.370947 0,10 0,10 z" /> + d="M 48.03125,959.4375 C 34.495643,964.14891 20.331474,967.26061 6,968.21875 c 0.5221736,18.08466 -0.5896199,37.56115 8.6875,53.68745 9.428796,10.8425 22.946654,17.2515 35.5625,23.5626 10.549116,-5.9047 21.789018,-11.1375 30.9375,-19.0938 9.676867,-8.1515 10.434093,-21.8099 11.935318,-33.46455 0.816364,-8.20318 0.810212,-16.45673 0.908432,-24.6917 -15.189243,-0.82151 -29.932595,-4.75961 -44.375,-9.34375 l -0.944986,0.32711 -0.680014,0.23539 z" /> + transform="matrix(0.64735729,0,0,0.64735729,-882.86984,-167.23739)"> + d="m 1437.313,1778.738 31.668,29.75 7.332,-14.875 c 0,0 1.584,-4.792 7.168,-2.125 5.582,2.667 1.666,7.917 1.666,7.917 l -10.666,20.917 c 0,0 -1.502,2.583 -4.834,2.583 -3.334,0 -5.916,-2.583 -5.916,-2.583 l -11.085,-10.25 c 0,0 -5.5,4.167 -13,19.167 l 18.833,15.667 c 0,0 3.879,4.373 0.5,8.167 -2.9,3.257 -7.583,0.417 -7.583,0.417 l -23.584,-19.417 c 0,0 -2.162,-2.003 -1.999,-5.25 0.148,-2.962 10.833,-17.75 10.833,-17.75 l -15.667,-14.667 -2.75,14.917 -14.167,12.917 c 0,0 -5.5,2.916 -7.5,-0.667 -2,-3.583 -0.501,-5.635 1.166,-6.942 1.667,-1.307 11.917,-10.558 11.917,-10.558 l 2.084,-16.583 30.417,-28.333 c 0,0 2.167,-1.333 4.25,-1.333 2.083,0 18.544,11.29 18.544,11.29 0,0 3.457,3.042 0.873,6.293 -2.133,2.682 -6.416,0.04 -6.416,0.04 l -12.418,-7.54 -9.666,8.831 z" /> + r="11.75" + cy="1770.572" + cx="1409.354" /> + clip-path="url(#clipPath3853)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-48.33771,973.62125)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + id="cakeday" + transform="matrix(0.99795595,0,0,1,625.1022,-702.36218)"> + transform="translate(0,952.36218)" + d="M 0,10 C 25,10 50,0 50,0 c 0,0 25,10 50,10 0,0 1.72669,46.370947 -9,62.214634 C 82.747852,84.403329 50,100 50,100 50,100 17.252148,84.403329 9,72.214634 -1.7266978,56.370947 0,10 0,10 z" /> + d="M 48.03125,959.4375 C 34.495643,964.14891 20.331474,967.26061 6,968.21875 c 0.5221736,18.08466 -0.5896199,37.56115 8.6875,53.68745 9.428796,10.8425 22.946654,17.2515 35.5625,23.5626 10.549116,-5.9047 21.789018,-11.1375 30.9375,-19.0938 9.676867,-8.1515 10.434093,-21.8099 11.935318,-33.46455 0.816364,-8.20318 0.810212,-16.45673 0.908432,-24.6917 -15.189243,-0.82151 -29.932595,-4.75961 -44.375,-9.34375 l -0.944986,0.32711 -0.680014,0.23539 z" /> + transform="matrix(0.27273062,0,0,0.27273062,-761.02854,665.58657)"> + style="fill:#2c6020;fill-opacity:1" + id="g574"> + points="3078.442,1217.196 3078.442,1193.699 2953.207,1252.099 2953.207,1275.596 " /> + points="3078.442,1175.459 3078.442,1151.961 2953.207,1210.36 2953.207,1233.856 " /> + points="3078.442,1255.67 3078.442,1232.173 2953.207,1290.57 2953.207,1314.069 " /> + d="m 2948.953,1139.729 c 0,0 -0.203,-0.057 -0.594,-0.025 -5.529,5.505 -9.66,10.839 -9.66,10.839 0,0 -1.902,-5.913 4.01,-12.718 -0.217,-0.379 -0.506,-0.753 -0.891,-1.106 -4.348,-4.016 -22.746,-7.247 -26.199,14.829 -3.588,22.91 14.617,26.758 23.522,26.758 25.646,0 24.752,-19.959 24.752,-19.959 0,0 -1.67,-18.618 -14.94,-18.618 z" /> + points="2950.405,1102.488 2962.225,1118.766 2947.73,1133.258 2950.74,1136.048 2968.689,1120.213 2957.542,1103.603 2958.209,1097.692 " /> + d="m 2906.588,1177.136 c -0.619,0 -1.232,-0.266 -1.66,-0.77 -2.656,-3.134 -11.211,-13.797 -9.699,-19.475 1.494,-5.587 11.586,-13.261 12.733,-14.115 0.879,-0.66 2.108,-0.56 2.87,0.231 0.764,0.792 0.817,2.025 0.127,2.877 -3.127,3.884 -7.643,10.453 -7.89,12.9 -0.263,2.598 3.034,10.441 5.458,15.18 0.501,0.985 0.189,2.191 -0.73,2.805 -0.369,0.246 -0.791,0.367 -1.209,0.367 l 0,0 z" /> + d="m 2945.779,1182.416 c -0.03,0.627 -0.285,1.236 -0.729,1.65 -2.768,2.563 -12.154,10.785 -16.834,9.005 -4.607,-1.756 -10.518,-12.328 -11.174,-13.529 -0.51,-0.923 -0.357,-2.167 0.346,-2.902 0.703,-0.741 1.736,-0.742 2.416,-0.01 3.092,3.345 8.369,8.209 10.407,8.566 2.163,0.376 8.911,-2.633 13.011,-4.887 0.854,-0.47 1.846,-0.098 2.312,0.862 0.191,0.385 0.267,0.817 0.245,1.243 l 0,0 z" /> + d="m 3078.231,1255.457 c -0.522,-1.086 -1.821,-1.543 -2.904,-1.026 l -122.69,58.63 c -5.301,0.366 -62.704,3.665 -71.304,-24.315 v -108.088 c 12.319,16.724 42.576,19.485 61.124,19.485 6.504,0 10.755,-0.35 10.931,-0.367 0.263,-0.022 0.522,-0.091 0.759,-0.205 l 123.059,-58.807 c 0.042,-0.02 0.078,-0.048 0.119,-0.07 0.054,-0.031 0.109,-0.062 0.159,-0.095 0.065,-0.045 0.125,-0.094 0.186,-0.143 0.04,-0.039 0.087,-0.073 0.126,-0.113 0.059,-0.056 0.11,-0.122 0.165,-0.187 0.03,-0.04 0.065,-0.076 0.095,-0.119 0.048,-0.072 0.092,-0.151 0.131,-0.229 0.024,-0.04 0.047,-0.078 0.064,-0.121 0.053,-0.111 0.09,-0.225 0.123,-0.343 0,-0.014 0.01,-0.026 0.011,-0.039 0.032,-0.131 0.05,-0.265 0.054,-0.401 0,-0.041 0,-0.084 0,-0.123 0,-0.098 0,-0.197 -0.018,-0.293 0,-0.017 0,-0.031 0,-0.043 -0.01,-0.042 -0.023,-0.081 -0.035,-0.122 -0.012,-0.06 -0.02,-0.119 -0.039,-0.175 0,-0.023 -0.018,-0.042 -0.026,-0.066 -0.019,-0.06 -0.044,-0.115 -0.071,-0.172 -0.031,-0.071 -0.062,-0.138 -0.103,-0.205 -0.03,-0.051 -0.062,-0.099 -0.098,-0.148 -0.044,-0.066 -0.093,-0.127 -0.144,-0.185 -0.037,-0.042 -0.074,-0.083 -0.115,-0.123 -0.058,-0.057 -0.116,-0.111 -0.183,-0.158 -0.039,-0.032 -0.082,-0.063 -0.126,-0.094 -0.07,-0.047 -0.139,-0.088 -0.216,-0.125 -0.042,-0.024 -0.089,-0.048 -0.136,-0.068 -0.08,-0.035 -0.158,-0.061 -0.244,-0.084 -0.045,-0.014 -0.094,-0.03 -0.141,-0.044 -0.09,-0.018 -0.183,-0.027 -0.274,-0.036 -0.046,0 -0.089,-0.012 -0.134,-0.014 -0.141,0 -0.279,0 -0.422,0.028 0,0 -96.007,15.909 -98.096,16.26 -2.091,0.349 -5.664,2.41 -5.664,2.41 -0.561,0.294 -0.939,0.85 -1.006,1.481 -0.068,0.629 0.186,1.252 0.668,1.661 3.801,3.201 7.391,6.908 7.965,8.142 -0.965,1.854 -7.327,7.612 -12.944,12.106 -0.776,0.621 -0.944,1.729 -0.39,2.553 0.365,0.541 0.966,0.841 1.581,0.841 0.316,0 0.64,-0.079 0.935,-0.245 21.416,-12.056 21.301,-15.009 21.261,-16.117 -0.085,-2.185 -3.395,-5.153 -9.839,-8.845 l 81.08,-13.437 -108.824,52.005 c -1.18,0.083 -4.965,0.32 -10.178,0.32 -15.629,0 -51.901,-2.259 -60.388,-22.593 0,0 10.776,-1.768 12.06,-2 1.28,-0.23 1.863,-0.966 1.508,-2.199 -0.685,-2.376 -3.139,-1.943 -3.139,-1.943 l -13.703,2.269 c -0.145,0.023 -0.282,0.065 -0.414,0.114 -0.04,0.019 -0.08,0.038 -0.119,0.056 -0.092,0.041 -0.176,0.085 -0.261,0.137 -0.042,0.027 -0.083,0.057 -0.127,0.086 -0.074,0.057 -0.144,0.113 -0.21,0.178 -0.039,0.037 -0.073,0.07 -0.11,0.108 -0.069,0.076 -0.134,0.161 -0.192,0.245 -0.016,0.023 -0.037,0.042 -0.053,0.069 0,0 -0.01,0.014 -0.011,0.022 -0.075,0.121 -0.14,0.251 -0.188,0.385 -0.01,0.018 -0.01,0.031 -0.014,0.047 -0.039,0.119 -0.07,0.24 -0.09,0.365 -0.01,0.047 -0.01,0.093 -0.013,0.143 -0.01,0.063 -0.019,0.129 -0.019,0.193 v 117.597 c 0,0.209 0.031,0.414 0.09,0.613 7.281,24.85 45.53,28.093 64.999,28.093 6.171,0 10.456,-0.328 11.274,-0.394 0.268,-0.017 0.537,-0.083 0.795,-0.204 h 0 c 0,0 0,0 0,0 0,0 0,0 0.01,-10e-4 l 123.059,-58.807 c 0.782,-0.375 1.237,-1.153 1.237,-1.965 0,-0.317 -0.069,-0.639 -0.211,-0.941 z" /> + clip-path="url(#clipPath3853)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-48.33771,973.62125)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + id="gplus-connector" + transform="matrix(0.99795595,0,0,1,750.1022,-452.36218)"> + transform="translate(0,952.36218)" + d="M 0,10 C 25,10 50,0 50,0 c 0,0 25,10 50,10 0,0 1.72669,46.370947 -9,62.214634 C 82.747852,84.403329 50,100 50,100 50,100 17.252148,84.403329 9,72.214634 -1.7266978,56.370947 0,10 0,10 z" /> + d="M 48.03125,959.4375 C 34.495643,964.14891 20.331474,967.26061 6,968.21875 c 0.5221736,18.08466 -0.5896199,37.56115 8.6875,53.68745 9.428796,10.8425 22.946654,17.2515 35.5625,23.5626 10.549116,-5.9047 21.789018,-11.1375 30.9375,-19.0938 9.676867,-8.1515 10.434093,-21.8099 11.935318,-33.46455 0.816364,-8.20318 0.810212,-16.45673 0.908432,-24.6917 -15.189243,-0.82151 -29.932595,-4.75961 -44.375,-9.34375 l -0.944986,0.32711 -0.680014,0.23539 z" /> + d="m 34.544069,976.17097 c -8.407743,0 -16.305822,6.3546 -16.305822,13.71809 0,7.52395 5.723729,13.58574 14.277075,13.58574 0.595351,0 1.178569,0 1.744343,-0.038 -0.555156,1.0603 -0.948012,2.241 -0.948012,3.4815 0,2.0904 1.115615,3.8009 2.540674,5.1845 -1.07619,0 -2.107622,0.019 -3.242204,0.019 -10.412974,0 -18.429371,6.6278 -18.429371,13.491 0,6.7595 8.774049,10.9746 19.187781,10.9746 11.872149,0 18.429371,-6.7118 18.429371,-13.4722 0,-5.4199 -1.586594,-8.6692 -6.541289,-12.1666 -1.695047,-1.1973 -4.948627,-4.1158 -4.948627,-5.8278 0,-2.0056 0.576398,-2.9766 3.602449,-5.33595 3.10114,-2.41809 5.289912,-5.82774 5.289912,-9.78234 0,-4.70767 -2.085628,-9.29046 -6.029362,-10.80418 l 5.934561,0 4.209177,-3.02744 -18.770656,0 z m 36.138223,0 0,12.10977 -12.134566,0 0,3.02744 12.134566,0 0,12.10982 3.033641,0 0,-12.10982 12.134566,0 0,-3.02744 -12.134566,0 0,-12.10977 -3.033641,0 z m -38.470334,2.64901 c 4.830309,0.14456 9.423248,5.21099 10.257499,11.54212 0.821359,6.24334 -2.31695,11.2206 -7.034255,11.2206 -0.0675,0 -0.141071,0 -0.208563,0 -4.831839,-0.1438 -9.424007,-5.4011 -10.2575,-11.73148 -0.833499,-6.33265 2.412503,-11.1758 7.242819,-11.03124 z m 2.370032,35.04262 c 1.679878,0.018 3.242962,0.2982 4.664223,0.7569 3.908089,2.7118 6.717999,4.2316 7.508262,7.3226 0.148649,0.6267 0.227523,1.2716 0.227523,1.93 0,5.4623 -3.531916,9.7445 -13.651385,9.7445 -7.198072,0 -12.381049,-4.5479 -12.381049,-10.0094 0,-5.3532 6.434353,-9.8225 13.632426,-9.7446 z" /> + clip-path="url(#clipPath3853)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-48.33771,973.62125)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + id="threadshot-reticle" + transform="matrix(0.99795595,0,0,1,625.1022,-452.36218)"> + transform="translate(0,952.36218)" + d="M 0,10 C 25,10 50,0 50,0 c 0,0 25,10 50,10 0,0 1.72669,46.370947 -9,62.214634 C 82.747852,84.403329 50,100 50,100 50,100 17.252148,84.403329 9,72.214634 -1.7266978,56.370947 0,10 0,10 z" /> + d="M 48.03125,959.4375 C 34.495643,964.14891 20.331474,967.26061 6,968.21875 c 0.5221736,18.08466 -0.5896199,37.56115 8.6875,53.68745 9.428796,10.8425 22.946654,17.2515 35.5625,23.5626 10.549116,-5.9047 21.789018,-11.1375 30.9375,-19.0938 9.676867,-8.1515 10.434093,-21.8099 11.935318,-33.46455 0.816364,-8.20318 0.810212,-16.45673 0.908432,-24.6917 -15.189243,-0.82151 -29.932595,-4.75961 -44.375,-9.34375 l -0.944986,0.32711 -0.680014,0.23539 z" /> + d="m 78.681247,994.5143 -5.654984,0 c -1.548784,-9.98579 -9.460024,-17.89226 -19.441094,-19.44104 l 0,-5.65499 -7.17031,10e-6 -10e-7,5.65499 c -9.985849,1.54878 -17.89231,9.46002 -19.44111,19.44109 l -5.654979,-2e-5 -7e-6,7.17036 5.655005,-10e-5 c 1.548769,9.9859 9.460034,17.8922 19.441067,19.4412 l -10e-7,5.655 7.170331,-10e-5 -2.5e-5,-5.6549 c 9.985882,-1.5489 17.892317,-9.4601 19.441125,-19.4412 l 5.654984,0 -10e-7,-7.1703 z m -12.949577,0 -5.588061,10e-6 c -1.080328,-3.05455 -3.503888,-5.47811 -6.55844,-6.55841 l -2e-6,-5.58804 c 6.023058,1.37192 10.774583,6.12342 12.146503,12.14644 z m -15.73166,7.1704 c -1.979005,0 -3.585148,-1.6063 -3.585163,-3.58515 -1.3e-5,-1.9789 1.606177,-3.58531 3.585155,-3.58521 1.979009,-10e-6 3.58515,1.60621 3.585151,3.58521 1.2e-5,1.97885 -1.606165,3.58525 -3.585143,3.58515 z m -3.585153,-19.31684 1e-6,5.58806 c -3.054553,1.08029 -5.478108,3.50381 -6.558476,6.55851 l -5.588035,-9e-5 c 1.371926,-6.02305 6.123451,-10.77455 12.14651,-12.14648 z m -12.146518,19.31684 5.588063,0 c 1.080317,3.0546 3.503909,5.478 6.558462,6.5583 l -1.8e-5,5.5881 c -6.023064,-1.3719 -10.77458,-6.1234 -12.146507,-12.1464 z m 19.316812,12.1464 1.8e-5,-5.5881 c 3.054537,-1.0802 5.478092,-3.5037 6.558448,-6.5584 l 5.588036,10e-5 c -1.371924,6.0231 -6.123464,10.7746 -12.146502,12.1464 z" /> + clip-path="url(#clipPath3853)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-48.33771,973.62125)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + id="fb-connector" + transform="matrix(0.99795595,0,0,1,750.1022,-327.36218)"> + transform="translate(0,952.36218)" + d="M 0,10 C 25,10 50,0 50,0 c 0,0 25,10 50,10 0,0 1.72669,46.370947 -9,62.214634 C 82.747852,84.403329 50,100 50,100 50,100 17.252148,84.403329 9,72.214634 -1.7266978,56.370947 0,10 0,10 z" /> + d="M 48.03125,959.4375 C 34.495643,964.14891 20.331474,967.26061 6,968.21875 c 0.5221736,18.08466 -0.5896199,37.56115 8.6875,53.68745 9.428796,10.8425 22.946654,17.2515 35.5625,23.5626 10.549116,-5.9047 21.789018,-11.1375 30.9375,-19.0938 9.676867,-8.1515 10.434093,-21.8099 11.935318,-33.46455 0.816364,-8.20318 0.810212,-16.45673 0.908432,-24.6917 -15.189243,-0.82151 -29.932595,-4.75961 -44.375,-9.34375 l -0.944986,0.32711 -0.680014,0.23539 z" /> + d="m 64.101261,1044.6649 0,-30.2889 10.167014,0 1.522135,-11.8044 -11.689149,0 0,-7.53637 c 0,-3.41768 0.948919,-5.74658 5.850002,-5.74658 l 6.250895,0 0,-10.55771 c -1.081374,-0.14355 -4.791769,-0.46505 -9.108499,-0.46505 -9.012371,0 -15.182089,5.50094 -15.182089,15.60348 l 0,8.70533 -10.192799,0 0,11.8042 10.192799,0 0,30.2888 12.189691,0 z" /> + clip-path="url(#clipPath3853)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-48.33771,973.62125)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + id="twitter-connector" + transform="matrix(0.99795595,0,0,1,750.1022,-202.36218)"> + transform="translate(0,952.36218)" + d="M 0,10 C 25,10 50,0 50,0 c 0,0 25,10 50,10 0,0 1.72669,46.370947 -9,62.214634 C 82.747852,84.403329 50,100 50,100 50,100 17.252148,84.403329 9,72.214634 -1.7266978,56.370947 0,10 0,10 z" /> + d="M 48.03125,959.4375 C 34.495643,964.14891 20.331474,967.26061 6,968.21875 c 0.5221736,18.08466 -0.5896199,37.56115 8.6875,53.68745 9.428796,10.8425 22.946654,17.2515 35.5625,23.5626 10.549116,-5.9047 21.789018,-11.1375 30.9375,-19.0938 9.676867,-8.1515 10.434093,-21.8099 11.935318,-33.46455 0.816364,-8.20318 0.810212,-16.45673 0.908432,-24.6917 -15.189243,-0.82151 -29.932595,-4.75961 -44.375,-9.34375 l -0.944986,0.32711 -0.680014,0.23539 z" /> + d="m 42.440351,1028.5233 c -7.459353,0 -14.402382,-2.1866 -20.247965,-5.9343 1.033336,0.1221 2.084788,0.1844 3.150972,0.1844 6.188419,0 11.883889,-2.1117 16.404498,-5.6544 -5.780095,-0.1065 -10.658107,-3.9253 -12.338952,-9.1732 0.806497,0.1543 1.63394,0.2368 2.485146,0.2368 1.204515,0 2.371521,-0.1613 3.479918,-0.4631 -6.042611,-1.2134 -10.595714,-6.552 -10.595714,-12.95185 0,-0.0555 1.67e-4,-0.11094 9.1e-4,-0.16608 1.781023,0.98936 3.817718,1.58355 5.982892,1.652 -3.544219,-2.36856 -5.876091,-6.41164 -5.876091,-10.99411 0,-2.42092 0.651193,-4.68974 1.788191,-6.64062 6.514924,7.99142 16.247762,13.25007 27.225618,13.80088 -0.225152,-0.96672 -0.342193,-1.97483 -0.342193,-3.01012 0,-7.2945 5.914276,-13.20857 13.209284,-13.20857 3.799036,0 7.231882,1.60418 9.6415,4.17132 3.008703,-0.59241 5.83562,-1.69171 8.387685,-3.20559 -0.986264,3.08456 -3.080536,5.67322 -5.807841,7.30803 2.671957,-0.3194 5.217698,-1.02941 7.586557,-2.0799 -1.77094,2.6488 -4.010521,4.97531 -6.591108,6.83765 0.02541,0.56635 0.03816,1.13602 0.03816,1.70869 0,17.45477 -13.285799,37.58207 -37.581648,37.58207" /> + clip-path="url(#clipPath3853)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-48.33771,973.62125)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + id="awesome-5" + transform="translate(500,-452.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 81.545674,996.66172 c 0,5.32068 -2.292319,10.10508 -5.94636,13.42268 h 0.03155 l -19.716046,19.716 c -1.971605,1.9716 -3.943209,3.9432 -5.914814,3.9432 -1.971605,0 -3.943209,-1.9716 -5.914814,-3.9432 l -19.6845,-19.716 c -3.654041,-3.3176 -5.94636,-8.102 -5.94636,-13.42268 0,-10.0106 8.112496,-18.1231 18.12299,-18.1231 5.320703,0 10.105131,2.29232 13.422684,5.94636 3.317553,-3.65404 8.101981,-5.94636 13.422684,-5.94636 10.010494,0 18.12299,8.1125 18.12299,18.1231 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x5 + y="979.42731" + x="80.873962">x5 + id="awesome-4" + transform="translate(375,-452.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 81.545674,996.66172 c 0,5.32068 -2.292319,10.10508 -5.94636,13.42268 h 0.03155 l -19.716046,19.716 c -1.971605,1.9716 -3.943209,3.9432 -5.914814,3.9432 -1.971605,0 -3.943209,-1.9716 -5.914814,-3.9432 l -19.6845,-19.716 c -3.654041,-3.3176 -5.94636,-8.102 -5.94636,-13.42268 0,-10.0106 8.112496,-18.1231 18.12299,-18.1231 5.320703,0 10.105131,2.29232 13.422684,5.94636 3.317553,-3.65404 8.101981,-5.94636 13.422684,-5.94636 10.010494,0 18.12299,8.1125 18.12299,18.1231 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x4 + y="979.42731" + x="80.873962">x4 + id="awesome-3" + transform="translate(250,-452.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 81.545674,996.66172 c 0,5.32068 -2.292319,10.10508 -5.94636,13.42268 h 0.03155 l -19.716046,19.716 c -1.971605,1.9716 -3.943209,3.9432 -5.914814,3.9432 -1.971605,0 -3.943209,-1.9716 -5.914814,-3.9432 l -19.6845,-19.716 c -3.654041,-3.3176 -5.94636,-8.102 -5.94636,-13.42268 0,-10.0106 8.112496,-18.1231 18.12299,-18.1231 5.320703,0 10.105131,2.29232 13.422684,5.94636 3.317553,-3.65404 8.101981,-5.94636 13.422684,-5.94636 10.010494,0 18.12299,8.1125 18.12299,18.1231 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x3 + y="979.42731" + x="80.873962">x3 + id="awesome-2" + transform="translate(125,-452.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 81.545674,996.66172 c 0,5.32068 -2.292319,10.10508 -5.94636,13.42268 h 0.03155 l -19.716046,19.716 c -1.971605,1.9716 -3.943209,3.9432 -5.914814,3.9432 -1.971605,0 -3.943209,-1.9716 -5.914814,-3.9432 l -19.6845,-19.716 c -3.654041,-3.3176 -5.94636,-8.102 -5.94636,-13.42268 0,-10.0106 8.112496,-18.1231 18.12299,-18.1231 5.320703,0 10.105131,2.29232 13.422684,5.94636 3.317553,-3.65404 8.101981,-5.94636 13.422684,-5.94636 10.010494,0 18.12299,8.1125 18.12299,18.1231 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x2 + y="979.42731" + x="80.873962">x2 + id="awesome-1" + transform="translate(6.366175e-7,-452.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 81.545674,996.66172 c 0,5.32068 -2.292319,10.10508 -5.94636,13.42268 h 0.03155 l -19.716046,19.716 c -1.971605,1.9716 -3.943209,3.9432 -5.914814,3.9432 -1.971605,0 -3.943209,-1.9716 -5.914814,-3.9432 l -19.6845,-19.716 c -3.654041,-3.3176 -5.94636,-8.102 -5.94636,-13.42268 0,-10.0106 8.112496,-18.1231 18.12299,-18.1231 5.320703,0 10.105131,2.29232 13.422684,5.94636 3.317553,-3.65404 8.101981,-5.94636 13.422684,-5.94636 10.010494,0 18.12299,8.1125 18.12299,18.1231 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + y="-1069.0178" + x="51.643356" /> + id="no-reaction" + transform="translate(750,-577.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 24.966102,987.58685 c 0,3.45468 2.803796,6.25847 6.258474,6.25847 3.454678,0 6.258475,-2.80379 6.258475,-6.25847 0,-3.45485 -2.803797,-6.25864 -6.258475,-6.25864 -3.454678,0 -6.258474,2.80379 -6.258474,6.25864 z m 37.550847,0 c 0,3.45468 2.803797,6.25847 6.258475,6.25847 3.454678,0 6.258474,-2.80379 6.258474,-6.25847 0,-3.45485 -2.803796,-6.25864 -6.258474,-6.25864 -3.454678,0 -6.258475,2.80379 -6.258475,6.25864 z m -25.033898,33.55085 25.033898,0 0,6.2585 -25.033898,0 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + y="-1069.0178" + x="51.643356" /> + id="promote-5" + transform="translate(500,-577.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 39.090866,985.38141 v 17.58609 c -4.090147,-1.1348 -5.086797,-1.7086 -9.405612,-1.7086 -3.736358,0 -6.773767,3.0375 -6.773767,6.7738 0,3.7364 3.037409,6.7738 6.773767,6.7738 5.255062,0 7.684126,1.9588 10.402261,5.8202 0.08198,0.1165 0.159637,0.233 0.237298,0.3495 H 35.85499 v 9.7076 h 32.358757 v -9.7076 H 65.33166 c 0.215726,-3.2186 1.121771,-4.1031 2.230597,-5.1817 0.854272,-0.8327 1.915639,-1.8682 2.692249,-3.745 0.815441,-1.9674 1.195117,-4.5345 1.195117,-8.0638 v -3.2834 c 0,-3.13234 -2.593015,-5.67789 -5.777117,-5.67789 -0.530684,0 -1.057053,0.0734 -1.561849,0.21141 -1.061368,-0.99674 -2.476524,-1.56625 -3.986599,-1.56625 -0.530684,0 -1.057053,0.0734 -1.56185,0.21141 -1.061367,-0.99665 -2.476523,-1.56616 -3.986598,-1.56616 -0.91036,0 -1.77326,0.21141 -2.541241,0.58245 v -7.51586 c 0,-3.5724 -2.899345,-6.47175 -6.471752,-6.47175 -3.572407,0 -6.471751,2.89935 -6.471751,6.47175 z M 64.977871,1025.83 c 0,0.8931 -0.724836,1.618 -1.617937,1.618 -0.893102,0 -1.617938,-0.7249 -1.617938,-1.618 0,-0.8931 0.724836,-1.6179 1.617938,-1.6179 0.893101,0 1.617937,0.7248 1.617937,1.6179 z M 48.798493,985.68343 v 12.94359 h 3.235876 v -0.33222 c 0,-1.34612 1.139028,-2.44201 2.541241,-2.44201 0.880158,0 1.682655,0.42714 2.152936,1.14335 l 0.819755,1.2512 1.311608,-0.72484 c 0.383991,-0.21141 0.819755,-0.32358 1.259834,-0.32358 0.880159,0 1.682656,0.42713 2.152936,1.14334 l 0.819755,1.25552 1.311609,-0.72484 c 0.38399,-0.21141 0.819755,-0.32358 1.259834,-0.32358 1.402213,0 2.541241,1.09588 2.541241,2.44204 v 3.2834 c 0,6.3984 -1.932896,7.6884 -3.335109,9.0561 -1.432414,1.3936 -3.033094,2.9554 -3.37394,7.6281 H 44.591854 c -0.418506,-0.7982 -0.871529,-1.5533 -1.367696,-2.2565 -3.430029,-4.8754 -7.054209,-7.4512 -13.543219,-7.4512 -1.617938,0 -2.93386,-1.5187 -2.93386,-3.1366 0,-1.618 1.315922,-3.0331 2.93386,-3.0331 4.331759,0 5.328409,0.6256 9.405612,1.8682 1.151972,0.3106 2.291,0.604 3.20136,0.8025 l 0.03452,-22.08613 c 0,-1.7862 1.449672,-3.23588 3.235876,-3.23588 1.786203,0 3.235875,1.44968 3.235875,3.23588 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x5 + y="979.42731" + x="80.873962">x5 + id="promote-4" + transform="translate(375,-577.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 39.090866,985.38141 v 17.58609 c -4.090147,-1.1348 -5.086797,-1.7086 -9.405612,-1.7086 -3.736358,0 -6.773767,3.0375 -6.773767,6.7738 0,3.7364 3.037409,6.7738 6.773767,6.7738 5.255062,0 7.684126,1.9588 10.402261,5.8202 0.08198,0.1165 0.159637,0.233 0.237298,0.3495 H 35.85499 v 9.7076 h 32.358757 v -9.7076 H 65.33166 c 0.215726,-3.2186 1.121771,-4.1031 2.230597,-5.1817 0.854272,-0.8327 1.915639,-1.8682 2.692249,-3.745 0.815441,-1.9674 1.195117,-4.5345 1.195117,-8.0638 v -3.2834 c 0,-3.13234 -2.593015,-5.67789 -5.777117,-5.67789 -0.530684,0 -1.057053,0.0734 -1.561849,0.21141 -1.061368,-0.99674 -2.476524,-1.56625 -3.986599,-1.56625 -0.530684,0 -1.057053,0.0734 -1.56185,0.21141 -1.061367,-0.99665 -2.476523,-1.56616 -3.986598,-1.56616 -0.91036,0 -1.77326,0.21141 -2.541241,0.58245 v -7.51586 c 0,-3.5724 -2.899345,-6.47175 -6.471752,-6.47175 -3.572407,0 -6.471751,2.89935 -6.471751,6.47175 z M 64.977871,1025.83 c 0,0.8931 -0.724836,1.618 -1.617937,1.618 -0.893102,0 -1.617938,-0.7249 -1.617938,-1.618 0,-0.8931 0.724836,-1.6179 1.617938,-1.6179 0.893101,0 1.617937,0.7248 1.617937,1.6179 z M 48.798493,985.68343 v 12.94359 h 3.235876 v -0.33222 c 0,-1.34612 1.139028,-2.44201 2.541241,-2.44201 0.880158,0 1.682655,0.42714 2.152936,1.14335 l 0.819755,1.2512 1.311608,-0.72484 c 0.383991,-0.21141 0.819755,-0.32358 1.259834,-0.32358 0.880159,0 1.682656,0.42713 2.152936,1.14334 l 0.819755,1.25552 1.311609,-0.72484 c 0.38399,-0.21141 0.819755,-0.32358 1.259834,-0.32358 1.402213,0 2.541241,1.09588 2.541241,2.44204 v 3.2834 c 0,6.3984 -1.932896,7.6884 -3.335109,9.0561 -1.432414,1.3936 -3.033094,2.9554 -3.37394,7.6281 H 44.591854 c -0.418506,-0.7982 -0.871529,-1.5533 -1.367696,-2.2565 -3.430029,-4.8754 -7.054209,-7.4512 -13.543219,-7.4512 -1.617938,0 -2.93386,-1.5187 -2.93386,-3.1366 0,-1.618 1.315922,-3.0331 2.93386,-3.0331 4.331759,0 5.328409,0.6256 9.405612,1.8682 1.151972,0.3106 2.291,0.604 3.20136,0.8025 l 0.03452,-22.08613 c 0,-1.7862 1.449672,-3.23588 3.235876,-3.23588 1.786203,0 3.235875,1.44968 3.235875,3.23588 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x4 + y="979.42731" + x="80.873962">x4 + id="promote-3" + transform="translate(250,-577.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 39.090866,985.38141 v 17.58609 c -4.090147,-1.1348 -5.086797,-1.7086 -9.405612,-1.7086 -3.736358,0 -6.773767,3.0375 -6.773767,6.7738 0,3.7364 3.037409,6.7738 6.773767,6.7738 5.255062,0 7.684126,1.9588 10.402261,5.8202 0.08198,0.1165 0.159637,0.233 0.237298,0.3495 H 35.85499 v 9.7076 h 32.358757 v -9.7076 H 65.33166 c 0.215726,-3.2186 1.121771,-4.1031 2.230597,-5.1817 0.854272,-0.8327 1.915639,-1.8682 2.692249,-3.745 0.815441,-1.9674 1.195117,-4.5345 1.195117,-8.0638 v -3.2834 c 0,-3.13234 -2.593015,-5.67789 -5.777117,-5.67789 -0.530684,0 -1.057053,0.0734 -1.561849,0.21141 -1.061368,-0.99674 -2.476524,-1.56625 -3.986599,-1.56625 -0.530684,0 -1.057053,0.0734 -1.56185,0.21141 -1.061367,-0.99665 -2.476523,-1.56616 -3.986598,-1.56616 -0.91036,0 -1.77326,0.21141 -2.541241,0.58245 v -7.51586 c 0,-3.5724 -2.899345,-6.47175 -6.471752,-6.47175 -3.572407,0 -6.471751,2.89935 -6.471751,6.47175 z M 64.977871,1025.83 c 0,0.8931 -0.724836,1.618 -1.617937,1.618 -0.893102,0 -1.617938,-0.7249 -1.617938,-1.618 0,-0.8931 0.724836,-1.6179 1.617938,-1.6179 0.893101,0 1.617937,0.7248 1.617937,1.6179 z M 48.798493,985.68343 v 12.94359 h 3.235876 v -0.33222 c 0,-1.34612 1.139028,-2.44201 2.541241,-2.44201 0.880158,0 1.682655,0.42714 2.152936,1.14335 l 0.819755,1.2512 1.311608,-0.72484 c 0.383991,-0.21141 0.819755,-0.32358 1.259834,-0.32358 0.880159,0 1.682656,0.42713 2.152936,1.14334 l 0.819755,1.25552 1.311609,-0.72484 c 0.38399,-0.21141 0.819755,-0.32358 1.259834,-0.32358 1.402213,0 2.541241,1.09588 2.541241,2.44204 v 3.2834 c 0,6.3984 -1.932896,7.6884 -3.335109,9.0561 -1.432414,1.3936 -3.033094,2.9554 -3.37394,7.6281 H 44.591854 c -0.418506,-0.7982 -0.871529,-1.5533 -1.367696,-2.2565 -3.430029,-4.8754 -7.054209,-7.4512 -13.543219,-7.4512 -1.617938,0 -2.93386,-1.5187 -2.93386,-3.1366 0,-1.618 1.315922,-3.0331 2.93386,-3.0331 4.331759,0 5.328409,0.6256 9.405612,1.8682 1.151972,0.3106 2.291,0.604 3.20136,0.8025 l 0.03452,-22.08613 c 0,-1.7862 1.449672,-3.23588 3.235876,-3.23588 1.786203,0 3.235875,1.44968 3.235875,3.23588 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x3 + y="979.42731" + x="80.873962">x3 + id="promote-2" + transform="translate(125,-577.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 39.090866,985.38141 v 17.58609 c -4.090147,-1.1348 -5.086797,-1.7086 -9.405612,-1.7086 -3.736358,0 -6.773767,3.0375 -6.773767,6.7738 0,3.7364 3.037409,6.7738 6.773767,6.7738 5.255062,0 7.684126,1.9588 10.402261,5.8202 0.08198,0.1165 0.159637,0.233 0.237298,0.3495 H 35.85499 v 9.7076 h 32.358757 v -9.7076 H 65.33166 c 0.215726,-3.2186 1.121771,-4.1031 2.230597,-5.1817 0.854272,-0.8327 1.915639,-1.8682 2.692249,-3.745 0.815441,-1.9674 1.195117,-4.5345 1.195117,-8.0638 v -3.2834 c 0,-3.13234 -2.593015,-5.67789 -5.777117,-5.67789 -0.530684,0 -1.057053,0.0734 -1.561849,0.21141 -1.061368,-0.99674 -2.476524,-1.56625 -3.986599,-1.56625 -0.530684,0 -1.057053,0.0734 -1.56185,0.21141 -1.061367,-0.99665 -2.476523,-1.56616 -3.986598,-1.56616 -0.91036,0 -1.77326,0.21141 -2.541241,0.58245 v -7.51586 c 0,-3.5724 -2.899345,-6.47175 -6.471752,-6.47175 -3.572407,0 -6.471751,2.89935 -6.471751,6.47175 z M 64.977871,1025.83 c 0,0.8931 -0.724836,1.618 -1.617937,1.618 -0.893102,0 -1.617938,-0.7249 -1.617938,-1.618 0,-0.8931 0.724836,-1.6179 1.617938,-1.6179 0.893101,0 1.617937,0.7248 1.617937,1.6179 z M 48.798493,985.68343 v 12.94359 h 3.235876 v -0.33222 c 0,-1.34612 1.139028,-2.44201 2.541241,-2.44201 0.880158,0 1.682655,0.42714 2.152936,1.14335 l 0.819755,1.2512 1.311608,-0.72484 c 0.383991,-0.21141 0.819755,-0.32358 1.259834,-0.32358 0.880159,0 1.682656,0.42713 2.152936,1.14334 l 0.819755,1.25552 1.311609,-0.72484 c 0.38399,-0.21141 0.819755,-0.32358 1.259834,-0.32358 1.402213,0 2.541241,1.09588 2.541241,2.44204 v 3.2834 c 0,6.3984 -1.932896,7.6884 -3.335109,9.0561 -1.432414,1.3936 -3.033094,2.9554 -3.37394,7.6281 H 44.591854 c -0.418506,-0.7982 -0.871529,-1.5533 -1.367696,-2.2565 -3.430029,-4.8754 -7.054209,-7.4512 -13.543219,-7.4512 -1.617938,0 -2.93386,-1.5187 -2.93386,-3.1366 0,-1.618 1.315922,-3.0331 2.93386,-3.0331 4.331759,0 5.328409,0.6256 9.405612,1.8682 1.151972,0.3106 2.291,0.604 3.20136,0.8025 l 0.03452,-22.08613 c 0,-1.7862 1.449672,-3.23588 3.235876,-3.23588 1.786203,0 3.235875,1.44968 3.235875,3.23588 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x2 + y="979.42731" + x="80.873962">x2 + id="promote-1" + transform="translate(6.366175e-7,-577.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 39.090866,985.38141 v 17.58609 c -4.090147,-1.1348 -5.086797,-1.7086 -9.405612,-1.7086 -3.736358,0 -6.773767,3.0375 -6.773767,6.7738 0,3.7364 3.037409,6.7738 6.773767,6.7738 5.255062,0 7.684126,1.9588 10.402261,5.8202 0.08198,0.1165 0.159637,0.233 0.237298,0.3495 H 35.85499 v 9.7076 h 32.358757 v -9.7076 H 65.33166 c 0.215726,-3.2186 1.121771,-4.1031 2.230597,-5.1817 0.854272,-0.8327 1.915639,-1.8682 2.692249,-3.745 0.815441,-1.9674 1.195117,-4.5345 1.195117,-8.0638 v -3.2834 c 0,-3.13234 -2.593015,-5.67789 -5.777117,-5.67789 -0.530684,0 -1.057053,0.0734 -1.561849,0.21141 -1.061368,-0.99674 -2.476524,-1.56625 -3.986599,-1.56625 -0.530684,0 -1.057053,0.0734 -1.56185,0.21141 -1.061367,-0.99665 -2.476523,-1.56616 -3.986598,-1.56616 -0.91036,0 -1.77326,0.21141 -2.541241,0.58245 v -7.51586 c 0,-3.5724 -2.899345,-6.47175 -6.471752,-6.47175 -3.572407,0 -6.471751,2.89935 -6.471751,6.47175 z M 64.977871,1025.83 c 0,0.8931 -0.724836,1.618 -1.617937,1.618 -0.893102,0 -1.617938,-0.7249 -1.617938,-1.618 0,-0.8931 0.724836,-1.6179 1.617938,-1.6179 0.893101,0 1.617937,0.7248 1.617937,1.6179 z M 48.798493,985.68343 v 12.94359 h 3.235876 v -0.33222 c 0,-1.34612 1.139028,-2.44201 2.541241,-2.44201 0.880158,0 1.682655,0.42714 2.152936,1.14335 l 0.819755,1.2512 1.311608,-0.72484 c 0.383991,-0.21141 0.819755,-0.32358 1.259834,-0.32358 0.880159,0 1.682656,0.42713 2.152936,1.14334 l 0.819755,1.25552 1.311609,-0.72484 c 0.38399,-0.21141 0.819755,-0.32358 1.259834,-0.32358 1.402213,0 2.541241,1.09588 2.541241,2.44204 v 3.2834 c 0,6.3984 -1.932896,7.6884 -3.335109,9.0561 -1.432414,1.3936 -3.033094,2.9554 -3.37394,7.6281 H 44.591854 c -0.418506,-0.7982 -0.871529,-1.5533 -1.367696,-2.2565 -3.430029,-4.8754 -7.054209,-7.4512 -13.543219,-7.4512 -1.617938,0 -2.93386,-1.5187 -2.93386,-3.1366 0,-1.618 1.315922,-3.0331 2.93386,-3.0331 4.331759,0 5.328409,0.6256 9.405612,1.8682 1.151972,0.3106 2.291,0.604 3.20136,0.8025 l 0.03452,-22.08613 c 0,-1.7862 1.449672,-3.23588 3.235876,-3.23588 1.786203,0 3.235875,1.44968 3.235875,3.23588 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + y="-1069.0178" + x="51.643356" /> + id="wink-1" + transform="translate(6.366175e-7,-952.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 53.029492,1021.9866 c 13.834677,-2.7349 24.564127,-9.0295 28.443559,-17.4111 -2.137475,16.5612 -15.930076,29.344 -32.625941,29.344 -11.75611,0 -22.073212,-6.3367 -27.896568,-15.8712 6.942585,5.4278 19.18678,6.4882 32.07895,3.9383 z m 9.593389,-35.40293 c 0,-5.22604 2.827526,-9.46733 6.311441,-9.46733 3.483915,0 6.311441,4.24129 6.311441,9.46733 0,5.22588 -2.827526,9.46716 -6.311441,9.46716 -3.483915,0 -6.311441,-4.24128 -6.311441,-9.46716 z m -28.401483,1.9271 c -4.123474,0 -7.62422,1.53999 -8.928584,3.69429 -0.345026,-0.58065 -0.538577,-3.17255 -0.538577,-3.82052 0,-3.06316 4.241288,-5.54566 9.467161,-5.54566 5.225873,0 9.467161,2.4825 9.467161,5.54566 0,0.64797 -0.193551,3.23987 -0.538576,3.82052 -1.295949,-2.1543 -4.80511,-3.69429 -8.928585,-3.69429 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + y="-1069.0178" + x="51.643356" /> + id="wink-2" + transform="translate(125,-952.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 53.029492,1021.9866 c 13.834677,-2.7349 24.564127,-9.0295 28.443559,-17.4111 -2.137475,16.5612 -15.930076,29.344 -32.625941,29.344 -11.75611,0 -22.073212,-6.3367 -27.896568,-15.8712 6.942585,5.4278 19.18678,6.4882 32.07895,3.9383 z m 9.593389,-35.40293 c 0,-5.22604 2.827526,-9.46733 6.311441,-9.46733 3.483915,0 6.311441,4.24129 6.311441,9.46733 0,5.22588 -2.827526,9.46716 -6.311441,9.46716 -3.483915,0 -6.311441,-4.24128 -6.311441,-9.46716 z m -28.401483,1.9271 c -4.123474,0 -7.62422,1.53999 -8.928584,3.69429 -0.345026,-0.58065 -0.538577,-3.17255 -0.538577,-3.82052 0,-3.06316 4.241288,-5.54566 9.467161,-5.54566 5.225873,0 9.467161,2.4825 9.467161,5.54566 0,0.64797 -0.193551,3.23987 -0.538576,3.82052 -1.295949,-2.1543 -4.80511,-3.69429 -8.928585,-3.69429 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x2 + y="979.42731" + x="80.873962">x2 + id="wink-3" + transform="translate(250,-952.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 53.029492,1021.9866 c 13.834677,-2.7349 24.564127,-9.0295 28.443559,-17.4111 -2.137475,16.5612 -15.930076,29.344 -32.625941,29.344 -11.75611,0 -22.073212,-6.3367 -27.896568,-15.8712 6.942585,5.4278 19.18678,6.4882 32.07895,3.9383 z m 9.593389,-35.40293 c 0,-5.22604 2.827526,-9.46733 6.311441,-9.46733 3.483915,0 6.311441,4.24129 6.311441,9.46733 0,5.22588 -2.827526,9.46716 -6.311441,9.46716 -3.483915,0 -6.311441,-4.24128 -6.311441,-9.46716 z m -28.401483,1.9271 c -4.123474,0 -7.62422,1.53999 -8.928584,3.69429 -0.345026,-0.58065 -0.538577,-3.17255 -0.538577,-3.82052 0,-3.06316 4.241288,-5.54566 9.467161,-5.54566 5.225873,0 9.467161,2.4825 9.467161,5.54566 0,0.64797 -0.193551,3.23987 -0.538576,3.82052 -1.295949,-2.1543 -4.80511,-3.69429 -8.928585,-3.69429 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x3 + y="979.42731" + x="80.873962">x3 + id="wink-4" + transform="translate(375,-952.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 53.029492,1021.9866 c 13.834677,-2.7349 24.564127,-9.0295 28.443559,-17.4111 -2.137475,16.5612 -15.930076,29.344 -32.625941,29.344 -11.75611,0 -22.073212,-6.3367 -27.896568,-15.8712 6.942585,5.4278 19.18678,6.4882 32.07895,3.9383 z m 9.593389,-35.40293 c 0,-5.22604 2.827526,-9.46733 6.311441,-9.46733 3.483915,0 6.311441,4.24129 6.311441,9.46733 0,5.22588 -2.827526,9.46716 -6.311441,9.46716 -3.483915,0 -6.311441,-4.24128 -6.311441,-9.46716 z m -28.401483,1.9271 c -4.123474,0 -7.62422,1.53999 -8.928584,3.69429 -0.345026,-0.58065 -0.538577,-3.17255 -0.538577,-3.82052 0,-3.06316 4.241288,-5.54566 9.467161,-5.54566 5.225873,0 9.467161,2.4825 9.467161,5.54566 0,0.64797 -0.193551,3.23987 -0.538576,3.82052 -1.295949,-2.1543 -4.80511,-3.69429 -8.928585,-3.69429 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x4 + y="979.42731" + x="80.873962">x4 + id="wink-5" + transform="translate(500,-952.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 53.029492,1021.9866 c 13.834677,-2.7349 24.564127,-9.0295 28.443559,-17.4111 -2.137475,16.5612 -15.930076,29.344 -32.625941,29.344 -11.75611,0 -22.073212,-6.3367 -27.896568,-15.8712 6.942585,5.4278 19.18678,6.4882 32.07895,3.9383 z m 9.593389,-35.40293 c 0,-5.22604 2.827526,-9.46733 6.311441,-9.46733 3.483915,0 6.311441,4.24129 6.311441,9.46733 0,5.22588 -2.827526,9.46716 -6.311441,9.46716 -3.483915,0 -6.311441,-4.24128 -6.311441,-9.46716 z m -28.401483,1.9271 c -4.123474,0 -7.62422,1.53999 -8.928584,3.69429 -0.345026,-0.58065 -0.538577,-3.17255 -0.538577,-3.82052 0,-3.06316 4.241288,-5.54566 9.467161,-5.54566 5.225873,0 9.467161,2.4825 9.467161,5.54566 0,0.64797 -0.193551,3.23987 -0.538576,3.82052 -1.295949,-2.1543 -4.80511,-3.69429 -8.928585,-3.69429 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x5 + y="979.42731" + x="80.873962">x5 + id="shock-5" + transform="translate(500,-827.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 37.589001,1020.9788 c 0,-6.8509 5.560128,-12.411 12.410999,-12.411 6.850871,0 12.410999,5.5601 12.410999,12.411 0,6.8508 -5.560128,12.411 -12.410999,12.411 -6.850871,0 -12.410999,-5.5602 -12.410999,-12.411 z m 24.821998,-34.13028 c 0,-5.13831 2.780063,-9.30841 6.205499,-9.30841 3.425436,0 6.2055,4.1701 6.2055,9.30841 0,5.13816 -2.780064,9.30825 -6.2055,9.30825 -3.425436,0 -6.205499,-4.17009 -6.205499,-9.30825 z m -37.232997,0 c 0,-5.13831 2.780064,-9.30841 6.2055,-9.30841 3.425436,0 6.205499,4.1701 6.205499,9.30841 0,5.13816 -2.780063,9.30825 -6.205499,9.30825 -3.425436,0 -6.2055,-4.17009 -6.2055,-9.30825 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x5 + y="979.42731" + x="80.873962">x5 + id="shock-4" + transform="translate(375,-827.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 37.589001,1020.9788 c 0,-6.8509 5.560128,-12.411 12.410999,-12.411 6.850871,0 12.410999,5.5601 12.410999,12.411 0,6.8508 -5.560128,12.411 -12.410999,12.411 -6.850871,0 -12.410999,-5.5602 -12.410999,-12.411 z m 24.821998,-34.13028 c 0,-5.13831 2.780063,-9.30841 6.205499,-9.30841 3.425436,0 6.2055,4.1701 6.2055,9.30841 0,5.13816 -2.780064,9.30825 -6.2055,9.30825 -3.425436,0 -6.205499,-4.17009 -6.205499,-9.30825 z m -37.232997,0 c 0,-5.13831 2.780064,-9.30841 6.2055,-9.30841 3.425436,0 6.205499,4.1701 6.205499,9.30841 0,5.13816 -2.780063,9.30825 -6.205499,9.30825 -3.425436,0 -6.2055,-4.17009 -6.2055,-9.30825 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x4 + y="979.42731" + x="80.873962">x4 + id="shock-3" + transform="translate(250,-827.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 37.589001,1020.9788 c 0,-6.8509 5.560128,-12.411 12.410999,-12.411 6.850871,0 12.410999,5.5601 12.410999,12.411 0,6.8508 -5.560128,12.411 -12.410999,12.411 -6.850871,0 -12.410999,-5.5602 -12.410999,-12.411 z m 24.821998,-34.13028 c 0,-5.13831 2.780063,-9.30841 6.205499,-9.30841 3.425436,0 6.2055,4.1701 6.2055,9.30841 0,5.13816 -2.780064,9.30825 -6.2055,9.30825 -3.425436,0 -6.205499,-4.17009 -6.205499,-9.30825 z m -37.232997,0 c 0,-5.13831 2.780064,-9.30841 6.2055,-9.30841 3.425436,0 6.205499,4.1701 6.205499,9.30841 0,5.13816 -2.780063,9.30825 -6.205499,9.30825 -3.425436,0 -6.2055,-4.17009 -6.2055,-9.30825 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x3 + y="979.42731" + x="80.873962">x3 + id="shock-2" + transform="translate(125,-827.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 37.589001,1020.9788 c 0,-6.8509 5.560128,-12.411 12.410999,-12.411 6.850871,0 12.410999,5.5601 12.410999,12.411 0,6.8508 -5.560128,12.411 -12.410999,12.411 -6.850871,0 -12.410999,-5.5602 -12.410999,-12.411 z m 24.821998,-34.13028 c 0,-5.13831 2.780063,-9.30841 6.205499,-9.30841 3.425436,0 6.2055,4.1701 6.2055,9.30841 0,5.13816 -2.780064,9.30825 -6.2055,9.30825 -3.425436,0 -6.205499,-4.17009 -6.205499,-9.30825 z m -37.232997,0 c 0,-5.13831 2.780064,-9.30841 6.2055,-9.30841 3.425436,0 6.205499,4.1701 6.205499,9.30841 0,5.13816 -2.780063,9.30825 -6.205499,9.30825 -3.425436,0 -6.2055,-4.17009 -6.2055,-9.30825 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x2 + y="979.42731" + x="80.873962">x2 + id="shock-1" + transform="translate(6.366175e-7,-827.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 37.589001,1020.9788 c 0,-6.8509 5.560128,-12.411 12.410999,-12.411 6.850871,0 12.410999,5.5601 12.410999,12.411 0,6.8508 -5.560128,12.411 -12.410999,12.411 -6.850871,0 -12.410999,-5.5602 -12.410999,-12.411 z m 24.821998,-34.13028 c 0,-5.13831 2.780063,-9.30841 6.205499,-9.30841 3.425436,0 6.2055,4.1701 6.2055,9.30841 0,5.13816 -2.780064,9.30825 -6.2055,9.30825 -3.425436,0 -6.205499,-4.17009 -6.205499,-9.30825 z m -37.232997,0 c 0,-5.13831 2.780064,-9.30841 6.2055,-9.30841 3.425436,0 6.205499,4.1701 6.205499,9.30841 0,5.13816 -2.780063,9.30825 -6.205499,9.30825 -3.425436,0 -6.2055,-4.17009 -6.2055,-9.30825 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + y="-1069.0178" + x="51.643356" /> + id="insightful-5" + transform="translate(500,-702.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 50.000026,982.98713 c -13.521176,0 -25.239184,7.8741 -31.000021,19.37507 5.760837,11.501 17.478845,19.3751 31.000021,19.3751 13.521124,0 25.239132,-7.8741 30.999969,-19.3751 C 75.239158,990.86123 63.52115,982.98713 50.000026,982.98713 z m 15.282958,10.27661 c 3.642503,2.325 6.727005,5.43533 9.04684,9.09846 -2.319835,3.6632 -5.404337,6.7787 -9.04684,9.0985 -4.577669,2.9192 -9.863121,4.4641 -15.282958,4.4641 -5.425004,0 -10.710507,-1.5449 -15.28301,-4.4641 -3.642503,-2.325 -6.727005,-5.4353 -9.04684,-9.0985 2.319835,-3.66313 5.404337,-6.77863 9.04684,-9.09846 0.237666,-0.14984 0.475333,-0.29967 0.718167,-0.44434 -0.604501,1.65334 -0.935168,3.441 -0.935168,5.30617 0,8.56113 6.938838,15.50003 15.500011,15.50003 8.561121,0 15.499959,-6.9389 15.499959,-15.50003 0,-1.86517 -0.330667,-3.64767 -0.935168,-5.30617 0.242834,0.14467 0.480501,0.28934 0.718167,0.44434 z m -15.282958,2.92433 c 0,3.2085 -2.604002,5.81253 -5.812504,5.81253 -3.208502,0 -5.812504,-2.60403 -5.812504,-5.81253 0,-3.2085 2.604002,-5.8125 5.812504,-5.8125 3.208502,0 5.812504,2.604 5.812504,5.8125 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x5 + y="979.42731" + x="80.873962">x5 + id="insightful-4" + transform="translate(375,-702.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 50.000026,982.98713 c -13.521176,0 -25.239184,7.8741 -31.000021,19.37507 5.760837,11.501 17.478845,19.3751 31.000021,19.3751 13.521124,0 25.239132,-7.8741 30.999969,-19.3751 C 75.239158,990.86123 63.52115,982.98713 50.000026,982.98713 z m 15.282958,10.27661 c 3.642503,2.325 6.727005,5.43533 9.04684,9.09846 -2.319835,3.6632 -5.404337,6.7787 -9.04684,9.0985 -4.577669,2.9192 -9.863121,4.4641 -15.282958,4.4641 -5.425004,0 -10.710507,-1.5449 -15.28301,-4.4641 -3.642503,-2.325 -6.727005,-5.4353 -9.04684,-9.0985 2.319835,-3.66313 5.404337,-6.77863 9.04684,-9.09846 0.237666,-0.14984 0.475333,-0.29967 0.718167,-0.44434 -0.604501,1.65334 -0.935168,3.441 -0.935168,5.30617 0,8.56113 6.938838,15.50003 15.500011,15.50003 8.561121,0 15.499959,-6.9389 15.499959,-15.50003 0,-1.86517 -0.330667,-3.64767 -0.935168,-5.30617 0.242834,0.14467 0.480501,0.28934 0.718167,0.44434 z m -15.282958,2.92433 c 0,3.2085 -2.604002,5.81253 -5.812504,5.81253 -3.208502,0 -5.812504,-2.60403 -5.812504,-5.81253 0,-3.2085 2.604002,-5.8125 5.812504,-5.8125 3.208502,0 5.812504,2.604 5.812504,5.8125 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x4 + y="979.42731" + x="80.873962">x4 + id="insightful-3" + transform="translate(250,-702.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 50.000026,982.98713 c -13.521176,0 -25.239184,7.8741 -31.000021,19.37507 5.760837,11.501 17.478845,19.3751 31.000021,19.3751 13.521124,0 25.239132,-7.8741 30.999969,-19.3751 C 75.239158,990.86123 63.52115,982.98713 50.000026,982.98713 z m 15.282958,10.27661 c 3.642503,2.325 6.727005,5.43533 9.04684,9.09846 -2.319835,3.6632 -5.404337,6.7787 -9.04684,9.0985 -4.577669,2.9192 -9.863121,4.4641 -15.282958,4.4641 -5.425004,0 -10.710507,-1.5449 -15.28301,-4.4641 -3.642503,-2.325 -6.727005,-5.4353 -9.04684,-9.0985 2.319835,-3.66313 5.404337,-6.77863 9.04684,-9.09846 0.237666,-0.14984 0.475333,-0.29967 0.718167,-0.44434 -0.604501,1.65334 -0.935168,3.441 -0.935168,5.30617 0,8.56113 6.938838,15.50003 15.500011,15.50003 8.561121,0 15.499959,-6.9389 15.499959,-15.50003 0,-1.86517 -0.330667,-3.64767 -0.935168,-5.30617 0.242834,0.14467 0.480501,0.28934 0.718167,0.44434 z m -15.282958,2.92433 c 0,3.2085 -2.604002,5.81253 -5.812504,5.81253 -3.208502,0 -5.812504,-2.60403 -5.812504,-5.81253 0,-3.2085 2.604002,-5.8125 5.812504,-5.8125 3.208502,0 5.812504,2.604 5.812504,5.8125 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x3 + y="979.42731" + x="80.873962">x3 + id="insightful-2" + transform="translate(125,-702.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 50.000026,982.98713 c -13.521176,0 -25.239184,7.8741 -31.000021,19.37507 5.760837,11.501 17.478845,19.3751 31.000021,19.3751 13.521124,0 25.239132,-7.8741 30.999969,-19.3751 C 75.239158,990.86123 63.52115,982.98713 50.000026,982.98713 z m 15.282958,10.27661 c 3.642503,2.325 6.727005,5.43533 9.04684,9.09846 -2.319835,3.6632 -5.404337,6.7787 -9.04684,9.0985 -4.577669,2.9192 -9.863121,4.4641 -15.282958,4.4641 -5.425004,0 -10.710507,-1.5449 -15.28301,-4.4641 -3.642503,-2.325 -6.727005,-5.4353 -9.04684,-9.0985 2.319835,-3.66313 5.404337,-6.77863 9.04684,-9.09846 0.237666,-0.14984 0.475333,-0.29967 0.718167,-0.44434 -0.604501,1.65334 -0.935168,3.441 -0.935168,5.30617 0,8.56113 6.938838,15.50003 15.500011,15.50003 8.561121,0 15.499959,-6.9389 15.499959,-15.50003 0,-1.86517 -0.330667,-3.64767 -0.935168,-5.30617 0.242834,0.14467 0.480501,0.28934 0.718167,0.44434 z m -15.282958,2.92433 c 0,3.2085 -2.604002,5.81253 -5.812504,5.81253 -3.208502,0 -5.812504,-2.60403 -5.812504,-5.81253 0,-3.2085 2.604002,-5.8125 5.812504,-5.8125 3.208502,0 5.812504,2.604 5.812504,5.8125 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.40206575,0,0,0.40206575,173.48479,896.93519)" + d="m -202.22323,217.11685 c 0.49188,-0.48464 -1.72247,8.96207 -1.16663,8.55236 0.55585,-0.40971 -9.12305,-1.08996 -8.51456,-1.41639 0.6085,-0.32644 -4.1776,8.11376 -3.52885,7.87725 0.64876,-0.23652 -8.44643,-3.61607 -7.77061,-3.75785 0.67581,-0.14178 -6.2943,6.60813 -5.60519,6.56398 0.68911,-0.0442 -7.08552,-5.84923 -6.39714,-5.79487 0.68838,0.0544 -7.90106,4.56715 -7.22742,4.71892 0.67364,0.15178 -5.15059,-7.60851 -4.50541,-7.36241 0.64518,0.2461 -8.86773,2.15616 -8.26414,2.49157 0.60359,0.33542 -2.79839,-8.75141 -2.24868,-8.33351 0.54972,0.4179 -9.11598,-0.4295 -8.63134,0.0624 0.48465,0.49188 -0.21947,-9.18531 0.19024,-8.62947 0.40971,0.55584 -8.62572,-2.98038 -8.29929,-2.37188 0.32644,0.60849 2.37722,-8.87508 2.61373,-8.22632 0.23652,0.64876 -7.43664,-5.2898 -7.29486,-4.61398 0.14178,0.67581 4.78131,-7.84584 4.82547,-7.15673 0.0442,0.68911 -5.6451,-7.17066 -5.69946,-6.48228 -0.0544,0.68838 6.79807,-6.18097 6.64629,-5.50733 -0.15178,0.67363 -3.39623,-8.47062 -3.64233,-7.82544 -0.24609,0.64519 8.26408,-4.01536 7.92867,-3.41177 -0.33541,0.6036 -0.87221,-9.08432 -1.29011,-8.5346 -0.4179,0.54971 9.06059,-1.52445 8.56871,-1.03981 -0.49188,0.48465 1.72247,-8.96207 1.16663,-8.55236 -0.55585,0.40971 9.12305,1.08996 8.51456,1.4164 -0.6085,0.32643 4.17761,-8.11377 3.52885,-7.87726 -0.64876,0.23652 8.44643,3.61607 7.77061,3.75785 -0.67581,0.14178 6.2943,-6.60813 5.60519,-6.56397 -0.68911,0.0442 7.08552,5.84923 6.39714,5.79486 -0.68838,-0.0544 7.90106,-4.56715 7.22742,-4.71892 -0.67363,-0.15178 5.1506,7.60852 4.50541,7.36242 -0.64518,-0.2461 8.86773,-2.15617 8.26414,-2.49158 -0.60359,-0.33541 2.79839,8.75141 2.24868,8.33351 -0.54972,-0.4179 9.11598,0.4295 8.63134,-0.0624 -0.48465,-0.49187 0.21947,9.18532 -0.19024,8.62947 -0.40971,-0.55584 8.62572,2.98038 8.29929,2.37188 -0.32644,-0.60849 -2.37722,8.87508 -2.61373,8.22632 -0.23652,-0.64875 7.43664,5.2898 7.29487,4.61399 -0.14178,-0.67582 -4.78132,7.84583 -4.82548,7.15672 -0.0442,-0.68911 5.6451,7.17067 5.69946,6.48228 0.0544,-0.68838 -6.79806,6.18098 -6.64629,5.50734 0.15178,-0.67364 3.39623,8.47061 3.64233,7.82543 0.2461,-0.64518 -8.26408,4.01536 -7.92867,3.41177 0.33541,-0.60359 0.87221,9.08432 1.29011,8.53461 0.4179,-0.54972 -9.06059,1.52445 -8.56871,1.0398 z" /> + transform="matrix(1.0873786,0,0,1.0873786,136.1585,955.13519)" + d="m -38.304677,15.627901 a 13.107581,13.107581 0 1 1 -26.215162,0 13.107581,13.107581 0 1 1 26.215162,0 z" /> + y="-1069.0178" + x="51.643356" /> x2 + y="979.42731" + x="80.873962">x2 + id="insightful-1" + transform="translate(6.366175e-7,-702.36218)"> + transform="translate(0,952.36218)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + transform="matrix(0.8564529,0,0,0.8564529,7.177355,959.53954)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="m 50.000026,982.98713 c -13.521176,0 -25.239184,7.8741 -31.000021,19.37507 5.760837,11.501 17.478845,19.3751 31.000021,19.3751 13.521124,0 25.239132,-7.8741 30.999969,-19.3751 C 75.239158,990.86123 63.52115,982.98713 50.000026,982.98713 z m 15.282958,10.27661 c 3.642503,2.325 6.727005,5.43533 9.04684,9.09846 -2.319835,3.6632 -5.404337,6.7787 -9.04684,9.0985 -4.577669,2.9192 -9.863121,4.4641 -15.282958,4.4641 -5.425004,0 -10.710507,-1.5449 -15.28301,-4.4641 -3.642503,-2.325 -6.727005,-5.4353 -9.04684,-9.0985 2.319835,-3.66313 5.404337,-6.77863 9.04684,-9.09846 0.237666,-0.14984 0.475333,-0.29967 0.718167,-0.44434 -0.604501,1.65334 -0.935168,3.441 -0.935168,5.30617 0,8.56113 6.938838,15.50003 15.500011,15.50003 8.561121,0 15.499959,-6.9389 15.499959,-15.50003 0,-1.86517 -0.330667,-3.64767 -0.935168,-5.30617 0.242834,0.14467 0.480501,0.28934 0.718167,0.44434 z m -15.282958,2.92433 c 0,3.2085 -2.604002,5.81253 -5.812504,5.81253 -3.208502,0 -5.812504,-2.60403 -5.812504,-5.81253 0,-3.2085 2.604002,-5.8125 5.812504,-5.8125 3.208502,0 5.812504,2.604 5.812504,5.8125 z" /> + clip-path="url(#clipPath3933)" + transform="matrix(1.1081022,-0.92329738,0.64013483,0.76826259,-60.723878,972.00095)" + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + y="-1069.0178" + x="51.643356" /> + + + + + + From 171779d6587a9e4ca871303f2228b58bb8786e2e Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Thu, 24 Mar 2016 11:21:49 -0500 Subject: [PATCH 097/111] Rearrange badges to prep for view fragments --- design/images/default_badges.svg | 592 +++++++++++++++---------------- 1 file changed, 296 insertions(+), 296 deletions(-) diff --git a/design/images/default_badges.svg b/design/images/default_badges.svg index 0f02cd693..ae98c0dd8 100644 --- a/design/images/default_badges.svg +++ b/design/images/default_badges.svg @@ -7,8 +7,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="svg2" - height="850" - width="850" + height="1225" + width="600" version="1.1"> @@ -61,7 +61,7 @@ + d="m 30.743876,22.29273 c 13.316177,16.003371 31.070497,24.324116 31.070497,24.324116 0,0 8.878034,23.685997 22.194209,39.689365 0,0 -19.66036,36.730359 -32.405565,42.035949 -9.804999,4.08164 -34.170085,-4.89904 -34.170085,-4.89904 0,0 -10.5210089,-32.945403 -9.5069715,-47.592012 C 9.2440771,56.812453 30.743876,22.29273 30.743876,22.29273 Z" /> @@ -69,7 +69,7 @@ style="fill:#000000;fill-opacity:1;stroke:none" id="path3935" transform="matrix(0.53264707,0.64013484,-0.44381433,0.76826257,41.060363,23.783738)" - d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="m 30.743876,22.29273 c 13.316177,16.003371 31.070497,24.324116 31.070497,24.324116 0,0 8.878034,23.685997 22.194209,39.689365 0,0 -19.66036,36.730359 -32.405565,42.035949 -9.804999,4.08164 -34.170085,-4.89904 -34.170085,-4.89904 0,0 -10.5210089,-32.945403 -9.5069715,-47.592012 C 9.2440771,56.812453 30.743876,22.29273 30.743876,22.29273 Z" /> + transform="matrix(0.99795595,0,0,1,0.10220304,-827.3622)"> + d="M 0,10 C 25,10 50,0 50,0 c 0,0 25,10 50,10 0,0 1.72669,46.370947 -9,62.214634 C 82.747852,84.403329 50,100 50,100 50,100 17.252148,84.403329 9,72.214634 -1.7266978,56.370947 0,10 0,10 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + transform="matrix(0.99795595,0,0,1,0.10220304,-702.3622)"> + d="M 0,10 C 25,10 50,0 50,0 c 0,0 25,10 50,10 0,0 1.72669,46.370947 -9,62.214634 C 82.747852,84.403329 50,100 50,100 50,100 17.252148,84.403329 9,72.214634 -1.7266978,56.370947 0,10 0,10 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + transform="matrix(0.99795595,0,0,1,375.1022,-827.3622)"> + d="M 0,10 C 25,10 50,0 50,0 c 0,0 25,10 50,10 0,0 1.72669,46.370947 -9,62.214634 C 82.747852,84.403329 50,100 50,100 50,100 17.252148,84.403329 9,72.214634 -1.7266978,56.370947 0,10 0,10 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + transform="translate(500,172.6378)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x5 @@ -1242,17 +1242,17 @@ + transform="translate(375,172.6378)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x4 @@ -1284,17 +1284,17 @@ + transform="translate(250,172.6378)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x3 @@ -1326,17 +1326,17 @@ + transform="translate(125,172.6378)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x2 @@ -1368,17 +1368,17 @@ + transform="translate(6.366175e-7,172.6378)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + transform="translate(500,47.63782)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x5 + transform="translate(375,47.63782)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x4 + transform="translate(250,47.63782)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x3 + transform="translate(125,47.63782)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x2 + transform="translate(6.366175e-7,47.63782)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + transform="translate(125.88566,-702.3622)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + transform="matrix(0.99795595,0,0,1,125.1022,-952.3622)"> + d="M 0,10 C 25,10 50,0 50,0 c 0,0 25,10 50,10 0,0 1.72669,46.370947 -9,62.214634 C 82.747852,84.403329 50,100 50,100 50,100 17.252148,84.403329 9,72.214634 -1.7266978,56.370947 0,10 0,10 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + transform="matrix(0.99795595,0,0,1,500.1022,-952.3622)"> + d="M 0,10 C 25,10 50,0 50,0 c 0,0 25,10 50,10 0,0 1.72669,46.370947 -9,62.214634 C 82.747852,84.403329 50,100 50,100 50,100 17.252148,84.403329 9,72.214634 -1.7266978,56.370947 0,10 0,10 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + transform="translate(375,-952.3622)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + transform="matrix(0.99795595,0,0,1,125.1022,-827.3622)"> + d="M 0,10 C 25,10 50,0 50,0 c 0,0 25,10 50,10 0,0 1.72669,46.370947 -9,62.214634 C 82.747852,84.403329 50,100 50,100 50,100 17.252148,84.403329 9,72.214634 -1.7266978,56.370947 0,10 0,10 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + transform="matrix(0.99795595,0,0,1,250.1022,-827.3622)"> + d="M 0,10 C 25,10 50,0 50,0 c 0,0 25,10 50,10 0,0 1.72669,46.370947 -9,62.214634 C 82.747852,84.403329 50,100 50,100 50,100 17.252148,84.403329 9,72.214634 -1.7266978,56.370947 0,10 0,10 Z" /> + points="2957.542,1103.603 2958.209,1097.692 2950.405,1102.488 2962.225,1118.766 2947.73,1133.258 2950.74,1136.048 2968.689,1120.213 " /> + d="m 3078.231,1255.457 c -0.522,-1.086 -1.821,-1.543 -2.904,-1.026 l -122.69,58.63 c -5.301,0.366 -62.704,3.665 -71.304,-24.315 l 0,-108.088 c 12.319,16.724 42.576,19.485 61.124,19.485 6.504,0 10.755,-0.35 10.931,-0.367 0.263,-0.022 0.522,-0.091 0.759,-0.205 l 123.059,-58.807 c 0.042,-0.02 0.078,-0.048 0.119,-0.07 0.054,-0.031 0.109,-0.062 0.159,-0.095 0.065,-0.045 0.125,-0.094 0.186,-0.143 0.04,-0.039 0.087,-0.073 0.126,-0.113 0.059,-0.056 0.11,-0.122 0.165,-0.187 0.03,-0.04 0.065,-0.076 0.095,-0.119 0.048,-0.072 0.092,-0.151 0.131,-0.229 0.024,-0.04 0.047,-0.078 0.064,-0.121 0.053,-0.111 0.09,-0.225 0.123,-0.343 0,-0.014 0.01,-0.026 0.011,-0.039 0.032,-0.131 0.05,-0.265 0.054,-0.401 0,-0.041 0,-0.084 0,-0.123 0,-0.098 0,-0.197 -0.018,-0.293 0,-0.017 0,-0.031 0,-0.043 -0.01,-0.042 -0.023,-0.081 -0.035,-0.122 -0.012,-0.06 -0.02,-0.119 -0.039,-0.175 0,-0.023 -0.018,-0.042 -0.026,-0.066 -0.019,-0.06 -0.044,-0.115 -0.071,-0.172 -0.031,-0.071 -0.062,-0.138 -0.103,-0.205 -0.03,-0.051 -0.062,-0.099 -0.098,-0.148 -0.044,-0.066 -0.093,-0.127 -0.144,-0.185 -0.037,-0.042 -0.074,-0.083 -0.115,-0.123 -0.058,-0.057 -0.116,-0.111 -0.183,-0.158 -0.039,-0.032 -0.082,-0.063 -0.126,-0.094 -0.07,-0.047 -0.139,-0.088 -0.216,-0.125 -0.042,-0.024 -0.089,-0.048 -0.136,-0.068 -0.08,-0.035 -0.158,-0.061 -0.244,-0.084 -0.045,-0.014 -0.094,-0.03 -0.141,-0.044 -0.09,-0.018 -0.183,-0.027 -0.274,-0.036 -0.046,0 -0.089,-0.012 -0.134,-0.014 -0.141,0 -0.279,0 -0.422,0.028 0,0 -96.007,15.909 -98.096,16.26 -2.091,0.349 -5.664,2.41 -5.664,2.41 -0.561,0.294 -0.939,0.85 -1.006,1.481 -0.068,0.629 0.186,1.252 0.668,1.661 3.801,3.201 7.391,6.908 7.965,8.142 -0.965,1.854 -7.327,7.612 -12.944,12.106 -0.776,0.621 -0.944,1.729 -0.39,2.553 0.365,0.541 0.966,0.841 1.581,0.841 0.316,0 0.64,-0.079 0.935,-0.245 21.416,-12.056 21.301,-15.009 21.261,-16.117 -0.085,-2.185 -3.395,-5.153 -9.839,-8.845 l 81.08,-13.437 -108.824,52.005 c -1.18,0.083 -4.965,0.32 -10.178,0.32 -15.629,0 -51.901,-2.259 -60.388,-22.593 0,0 10.776,-1.768 12.06,-2 1.28,-0.23 1.863,-0.966 1.508,-2.199 -0.685,-2.376 -3.139,-1.943 -3.139,-1.943 l -13.703,2.269 c -0.145,0.023 -0.282,0.065 -0.414,0.114 -0.04,0.019 -0.08,0.038 -0.119,0.056 -0.092,0.041 -0.176,0.085 -0.261,0.137 -0.042,0.027 -0.083,0.057 -0.127,0.086 -0.074,0.057 -0.144,0.113 -0.21,0.178 -0.039,0.037 -0.073,0.07 -0.11,0.108 -0.069,0.076 -0.134,0.161 -0.192,0.245 -0.016,0.023 -0.037,0.042 -0.053,0.069 0,0 -0.01,0.014 -0.011,0.022 -0.075,0.121 -0.14,0.251 -0.188,0.385 -0.01,0.018 -0.01,0.031 -0.014,0.047 -0.039,0.119 -0.07,0.24 -0.09,0.365 -0.01,0.047 -0.01,0.093 -0.013,0.143 -0.01,0.063 -0.019,0.129 -0.019,0.193 l 0,117.597 c 0,0.209 0.031,0.414 0.09,0.613 7.281,24.85 45.53,28.093 64.999,28.093 6.171,0 10.456,-0.328 11.274,-0.394 0.268,-0.017 0.537,-0.083 0.795,-0.204 l 0,0 c 0,0 0,0 0,0 0,0 0,0 0.01,-10e-4 l 123.059,-58.807 c 0.782,-0.375 1.237,-1.153 1.237,-1.965 0,-0.317 -0.069,-0.639 -0.211,-0.941 z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + transform="matrix(0.99795595,0,0,1,250.1022,-702.3622)"> + d="M 0,10 C 25,10 50,0 50,0 c 0,0 25,10 50,10 0,0 1.72669,46.370947 -9,62.214634 C 82.747852,84.403329 50,100 50,100 50,100 17.252148,84.403329 9,72.214634 -1.7266978,56.370947 0,10 0,10 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + transform="matrix(0.99795595,0,0,1,500.1022,-827.3622)"> + d="M 0,10 C 25,10 50,0 50,0 c 0,0 25,10 50,10 0,0 1.72669,46.370947 -9,62.214634 C 82.747852,84.403329 50,100 50,100 50,100 17.252148,84.403329 9,72.214634 -1.7266978,56.370947 0,10 0,10 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + transform="matrix(0.99795595,0,0,1,375.1022,-702.3622)"> + d="M 0,10 C 25,10 50,0 50,0 c 0,0 25,10 50,10 0,0 1.72669,46.370947 -9,62.214634 C 82.747852,84.403329 50,100 50,100 50,100 17.252148,84.403329 9,72.214634 -1.7266978,56.370947 0,10 0,10 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + transform="matrix(0.99795595,0,0,1,500.1022,-702.3622)"> + d="M 0,10 C 25,10 50,0 50,0 c 0,0 25,10 50,10 0,0 1.72669,46.370947 -9,62.214634 C 82.747852,84.403329 50,100 50,100 50,100 17.252148,84.403329 9,72.214634 -1.7266978,56.370947 0,10 0,10 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + transform="translate(500,-77.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="m 81.545674,996.66172 c 0,5.32068 -2.292319,10.10508 -5.94636,13.42268 l 0.03155,0 -19.716046,19.716 c -1.971605,1.9716 -3.943209,3.9432 -5.914814,3.9432 -1.971605,0 -3.943209,-1.9716 -5.914814,-3.9432 l -19.6845,-19.716 c -3.654041,-3.3176 -5.94636,-8.102 -5.94636,-13.42268 0,-10.0106 8.112496,-18.1231 18.12299,-18.1231 5.320703,0 10.105131,2.29232 13.422684,5.94636 3.317553,-3.65404 8.101981,-5.94636 13.422684,-5.94636 10.010494,0 18.12299,8.1125 18.12299,18.1231 z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x5 + transform="translate(375,-77.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="m 81.545674,996.66172 c 0,5.32068 -2.292319,10.10508 -5.94636,13.42268 l 0.03155,0 -19.716046,19.716 c -1.971605,1.9716 -3.943209,3.9432 -5.914814,3.9432 -1.971605,0 -3.943209,-1.9716 -5.914814,-3.9432 l -19.6845,-19.716 c -3.654041,-3.3176 -5.94636,-8.102 -5.94636,-13.42268 0,-10.0106 8.112496,-18.1231 18.12299,-18.1231 5.320703,0 10.105131,2.29232 13.422684,5.94636 3.317553,-3.65404 8.101981,-5.94636 13.422684,-5.94636 10.010494,0 18.12299,8.1125 18.12299,18.1231 z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x4 + transform="translate(250,-77.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="m 81.545674,996.66172 c 0,5.32068 -2.292319,10.10508 -5.94636,13.42268 l 0.03155,0 -19.716046,19.716 c -1.971605,1.9716 -3.943209,3.9432 -5.914814,3.9432 -1.971605,0 -3.943209,-1.9716 -5.914814,-3.9432 l -19.6845,-19.716 c -3.654041,-3.3176 -5.94636,-8.102 -5.94636,-13.42268 0,-10.0106 8.112496,-18.1231 18.12299,-18.1231 5.320703,0 10.105131,2.29232 13.422684,5.94636 3.317553,-3.65404 8.101981,-5.94636 13.422684,-5.94636 10.010494,0 18.12299,8.1125 18.12299,18.1231 z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x3 + transform="translate(125,-77.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="m 81.545674,996.66172 c 0,5.32068 -2.292319,10.10508 -5.94636,13.42268 l 0.03155,0 -19.716046,19.716 c -1.971605,1.9716 -3.943209,3.9432 -5.914814,3.9432 -1.971605,0 -3.943209,-1.9716 -5.914814,-3.9432 l -19.6845,-19.716 c -3.654041,-3.3176 -5.94636,-8.102 -5.94636,-13.42268 0,-10.0106 8.112496,-18.1231 18.12299,-18.1231 5.320703,0 10.105131,2.29232 13.422684,5.94636 3.317553,-3.65404 8.101981,-5.94636 13.422684,-5.94636 10.010494,0 18.12299,8.1125 18.12299,18.1231 z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x2 + transform="translate(6.366175e-7,-77.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="m 81.545674,996.66172 c 0,5.32068 -2.292319,10.10508 -5.94636,13.42268 l 0.03155,0 -19.716046,19.716 c -1.971605,1.9716 -3.943209,3.9432 -5.914814,3.9432 -1.971605,0 -3.943209,-1.9716 -5.914814,-3.9432 l -19.6845,-19.716 c -3.654041,-3.3176 -5.94636,-8.102 -5.94636,-13.42268 0,-10.0106 8.112496,-18.1231 18.12299,-18.1231 5.320703,0 10.105131,2.29232 13.422684,5.94636 3.317553,-3.65404 8.101981,-5.94636 13.422684,-5.94636 10.010494,0 18.12299,8.1125 18.12299,18.1231 z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + transform="translate(250,-952.3622)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + transform="translate(500,-202.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="m 39.090866,985.38141 0,17.58609 c -4.090147,-1.1348 -5.086797,-1.7086 -9.405612,-1.7086 -3.736358,0 -6.773767,3.0375 -6.773767,6.7738 0,3.7364 3.037409,6.7738 6.773767,6.7738 5.255062,0 7.684126,1.9588 10.402261,5.8202 0.08198,0.1165 0.159637,0.233 0.237298,0.3495 l -4.469823,0 0,9.7076 32.358757,0 0,-9.7076 -2.882087,0 c 0.215726,-3.2186 1.121771,-4.1031 2.230597,-5.1817 0.854272,-0.8327 1.915639,-1.8682 2.692249,-3.745 0.815441,-1.9674 1.195117,-4.5345 1.195117,-8.0638 l 0,-3.2834 c 0,-3.13234 -2.593015,-5.67789 -5.777117,-5.67789 -0.530684,0 -1.057053,0.0734 -1.561849,0.21141 -1.061368,-0.99674 -2.476524,-1.56625 -3.986599,-1.56625 -0.530684,0 -1.057053,0.0734 -1.56185,0.21141 -1.061367,-0.99665 -2.476523,-1.56616 -3.986598,-1.56616 -0.91036,0 -1.77326,0.21141 -2.541241,0.58245 l 0,-7.51586 c 0,-3.5724 -2.899345,-6.47175 -6.471752,-6.47175 -3.572407,0 -6.471751,2.89935 -6.471751,6.47175 z M 64.977871,1025.83 c 0,0.8931 -0.724836,1.618 -1.617937,1.618 -0.893102,0 -1.617938,-0.7249 -1.617938,-1.618 0,-0.8931 0.724836,-1.6179 1.617938,-1.6179 0.893101,0 1.617937,0.7248 1.617937,1.6179 z m -16.179378,-40.14657 0,12.94359 3.235876,0 0,-0.33222 c 0,-1.34612 1.139028,-2.44201 2.541241,-2.44201 0.880158,0 1.682655,0.42714 2.152936,1.14335 l 0.819755,1.2512 1.311608,-0.72484 c 0.383991,-0.21141 0.819755,-0.32358 1.259834,-0.32358 0.880159,0 1.682656,0.42713 2.152936,1.14334 l 0.819755,1.25552 1.311609,-0.72484 c 0.38399,-0.21141 0.819755,-0.32358 1.259834,-0.32358 1.402213,0 2.541241,1.09588 2.541241,2.44204 l 0,3.2834 c 0,6.3984 -1.932896,7.6884 -3.335109,9.0561 -1.432414,1.3936 -3.033094,2.9554 -3.37394,7.6281 l -16.904215,0 c -0.418506,-0.7982 -0.871529,-1.5533 -1.367696,-2.2565 -3.430029,-4.8754 -7.054209,-7.4512 -13.543219,-7.4512 -1.617938,0 -2.93386,-1.5187 -2.93386,-3.1366 0,-1.618 1.315922,-3.0331 2.93386,-3.0331 4.331759,0 5.328409,0.6256 9.405612,1.8682 1.151972,0.3106 2.291,0.604 3.20136,0.8025 l 0.03452,-22.08613 c 0,-1.7862 1.449672,-3.23588 3.235876,-3.23588 1.786203,0 3.235875,1.44968 3.235875,3.23588 z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x5 + transform="translate(375,-202.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="m 39.090866,985.38141 0,17.58609 c -4.090147,-1.1348 -5.086797,-1.7086 -9.405612,-1.7086 -3.736358,0 -6.773767,3.0375 -6.773767,6.7738 0,3.7364 3.037409,6.7738 6.773767,6.7738 5.255062,0 7.684126,1.9588 10.402261,5.8202 0.08198,0.1165 0.159637,0.233 0.237298,0.3495 l -4.469823,0 0,9.7076 32.358757,0 0,-9.7076 -2.882087,0 c 0.215726,-3.2186 1.121771,-4.1031 2.230597,-5.1817 0.854272,-0.8327 1.915639,-1.8682 2.692249,-3.745 0.815441,-1.9674 1.195117,-4.5345 1.195117,-8.0638 l 0,-3.2834 c 0,-3.13234 -2.593015,-5.67789 -5.777117,-5.67789 -0.530684,0 -1.057053,0.0734 -1.561849,0.21141 -1.061368,-0.99674 -2.476524,-1.56625 -3.986599,-1.56625 -0.530684,0 -1.057053,0.0734 -1.56185,0.21141 -1.061367,-0.99665 -2.476523,-1.56616 -3.986598,-1.56616 -0.91036,0 -1.77326,0.21141 -2.541241,0.58245 l 0,-7.51586 c 0,-3.5724 -2.899345,-6.47175 -6.471752,-6.47175 -3.572407,0 -6.471751,2.89935 -6.471751,6.47175 z M 64.977871,1025.83 c 0,0.8931 -0.724836,1.618 -1.617937,1.618 -0.893102,0 -1.617938,-0.7249 -1.617938,-1.618 0,-0.8931 0.724836,-1.6179 1.617938,-1.6179 0.893101,0 1.617937,0.7248 1.617937,1.6179 z m -16.179378,-40.14657 0,12.94359 3.235876,0 0,-0.33222 c 0,-1.34612 1.139028,-2.44201 2.541241,-2.44201 0.880158,0 1.682655,0.42714 2.152936,1.14335 l 0.819755,1.2512 1.311608,-0.72484 c 0.383991,-0.21141 0.819755,-0.32358 1.259834,-0.32358 0.880159,0 1.682656,0.42713 2.152936,1.14334 l 0.819755,1.25552 1.311609,-0.72484 c 0.38399,-0.21141 0.819755,-0.32358 1.259834,-0.32358 1.402213,0 2.541241,1.09588 2.541241,2.44204 l 0,3.2834 c 0,6.3984 -1.932896,7.6884 -3.335109,9.0561 -1.432414,1.3936 -3.033094,2.9554 -3.37394,7.6281 l -16.904215,0 c -0.418506,-0.7982 -0.871529,-1.5533 -1.367696,-2.2565 -3.430029,-4.8754 -7.054209,-7.4512 -13.543219,-7.4512 -1.617938,0 -2.93386,-1.5187 -2.93386,-3.1366 0,-1.618 1.315922,-3.0331 2.93386,-3.0331 4.331759,0 5.328409,0.6256 9.405612,1.8682 1.151972,0.3106 2.291,0.604 3.20136,0.8025 l 0.03452,-22.08613 c 0,-1.7862 1.449672,-3.23588 3.235876,-3.23588 1.786203,0 3.235875,1.44968 3.235875,3.23588 z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x4 + transform="translate(250,-202.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="m 39.090866,985.38141 0,17.58609 c -4.090147,-1.1348 -5.086797,-1.7086 -9.405612,-1.7086 -3.736358,0 -6.773767,3.0375 -6.773767,6.7738 0,3.7364 3.037409,6.7738 6.773767,6.7738 5.255062,0 7.684126,1.9588 10.402261,5.8202 0.08198,0.1165 0.159637,0.233 0.237298,0.3495 l -4.469823,0 0,9.7076 32.358757,0 0,-9.7076 -2.882087,0 c 0.215726,-3.2186 1.121771,-4.1031 2.230597,-5.1817 0.854272,-0.8327 1.915639,-1.8682 2.692249,-3.745 0.815441,-1.9674 1.195117,-4.5345 1.195117,-8.0638 l 0,-3.2834 c 0,-3.13234 -2.593015,-5.67789 -5.777117,-5.67789 -0.530684,0 -1.057053,0.0734 -1.561849,0.21141 -1.061368,-0.99674 -2.476524,-1.56625 -3.986599,-1.56625 -0.530684,0 -1.057053,0.0734 -1.56185,0.21141 -1.061367,-0.99665 -2.476523,-1.56616 -3.986598,-1.56616 -0.91036,0 -1.77326,0.21141 -2.541241,0.58245 l 0,-7.51586 c 0,-3.5724 -2.899345,-6.47175 -6.471752,-6.47175 -3.572407,0 -6.471751,2.89935 -6.471751,6.47175 z M 64.977871,1025.83 c 0,0.8931 -0.724836,1.618 -1.617937,1.618 -0.893102,0 -1.617938,-0.7249 -1.617938,-1.618 0,-0.8931 0.724836,-1.6179 1.617938,-1.6179 0.893101,0 1.617937,0.7248 1.617937,1.6179 z m -16.179378,-40.14657 0,12.94359 3.235876,0 0,-0.33222 c 0,-1.34612 1.139028,-2.44201 2.541241,-2.44201 0.880158,0 1.682655,0.42714 2.152936,1.14335 l 0.819755,1.2512 1.311608,-0.72484 c 0.383991,-0.21141 0.819755,-0.32358 1.259834,-0.32358 0.880159,0 1.682656,0.42713 2.152936,1.14334 l 0.819755,1.25552 1.311609,-0.72484 c 0.38399,-0.21141 0.819755,-0.32358 1.259834,-0.32358 1.402213,0 2.541241,1.09588 2.541241,2.44204 l 0,3.2834 c 0,6.3984 -1.932896,7.6884 -3.335109,9.0561 -1.432414,1.3936 -3.033094,2.9554 -3.37394,7.6281 l -16.904215,0 c -0.418506,-0.7982 -0.871529,-1.5533 -1.367696,-2.2565 -3.430029,-4.8754 -7.054209,-7.4512 -13.543219,-7.4512 -1.617938,0 -2.93386,-1.5187 -2.93386,-3.1366 0,-1.618 1.315922,-3.0331 2.93386,-3.0331 4.331759,0 5.328409,0.6256 9.405612,1.8682 1.151972,0.3106 2.291,0.604 3.20136,0.8025 l 0.03452,-22.08613 c 0,-1.7862 1.449672,-3.23588 3.235876,-3.23588 1.786203,0 3.235875,1.44968 3.235875,3.23588 z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x3 + transform="translate(125,-202.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="m 39.090866,985.38141 0,17.58609 c -4.090147,-1.1348 -5.086797,-1.7086 -9.405612,-1.7086 -3.736358,0 -6.773767,3.0375 -6.773767,6.7738 0,3.7364 3.037409,6.7738 6.773767,6.7738 5.255062,0 7.684126,1.9588 10.402261,5.8202 0.08198,0.1165 0.159637,0.233 0.237298,0.3495 l -4.469823,0 0,9.7076 32.358757,0 0,-9.7076 -2.882087,0 c 0.215726,-3.2186 1.121771,-4.1031 2.230597,-5.1817 0.854272,-0.8327 1.915639,-1.8682 2.692249,-3.745 0.815441,-1.9674 1.195117,-4.5345 1.195117,-8.0638 l 0,-3.2834 c 0,-3.13234 -2.593015,-5.67789 -5.777117,-5.67789 -0.530684,0 -1.057053,0.0734 -1.561849,0.21141 -1.061368,-0.99674 -2.476524,-1.56625 -3.986599,-1.56625 -0.530684,0 -1.057053,0.0734 -1.56185,0.21141 -1.061367,-0.99665 -2.476523,-1.56616 -3.986598,-1.56616 -0.91036,0 -1.77326,0.21141 -2.541241,0.58245 l 0,-7.51586 c 0,-3.5724 -2.899345,-6.47175 -6.471752,-6.47175 -3.572407,0 -6.471751,2.89935 -6.471751,6.47175 z M 64.977871,1025.83 c 0,0.8931 -0.724836,1.618 -1.617937,1.618 -0.893102,0 -1.617938,-0.7249 -1.617938,-1.618 0,-0.8931 0.724836,-1.6179 1.617938,-1.6179 0.893101,0 1.617937,0.7248 1.617937,1.6179 z m -16.179378,-40.14657 0,12.94359 3.235876,0 0,-0.33222 c 0,-1.34612 1.139028,-2.44201 2.541241,-2.44201 0.880158,0 1.682655,0.42714 2.152936,1.14335 l 0.819755,1.2512 1.311608,-0.72484 c 0.383991,-0.21141 0.819755,-0.32358 1.259834,-0.32358 0.880159,0 1.682656,0.42713 2.152936,1.14334 l 0.819755,1.25552 1.311609,-0.72484 c 0.38399,-0.21141 0.819755,-0.32358 1.259834,-0.32358 1.402213,0 2.541241,1.09588 2.541241,2.44204 l 0,3.2834 c 0,6.3984 -1.932896,7.6884 -3.335109,9.0561 -1.432414,1.3936 -3.033094,2.9554 -3.37394,7.6281 l -16.904215,0 c -0.418506,-0.7982 -0.871529,-1.5533 -1.367696,-2.2565 -3.430029,-4.8754 -7.054209,-7.4512 -13.543219,-7.4512 -1.617938,0 -2.93386,-1.5187 -2.93386,-3.1366 0,-1.618 1.315922,-3.0331 2.93386,-3.0331 4.331759,0 5.328409,0.6256 9.405612,1.8682 1.151972,0.3106 2.291,0.604 3.20136,0.8025 l 0.03452,-22.08613 c 0,-1.7862 1.449672,-3.23588 3.235876,-3.23588 1.786203,0 3.235875,1.44968 3.235875,3.23588 z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x2 + transform="translate(6.366175e-7,-202.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="m 39.090866,985.38141 0,17.58609 c -4.090147,-1.1348 -5.086797,-1.7086 -9.405612,-1.7086 -3.736358,0 -6.773767,3.0375 -6.773767,6.7738 0,3.7364 3.037409,6.7738 6.773767,6.7738 5.255062,0 7.684126,1.9588 10.402261,5.8202 0.08198,0.1165 0.159637,0.233 0.237298,0.3495 l -4.469823,0 0,9.7076 32.358757,0 0,-9.7076 -2.882087,0 c 0.215726,-3.2186 1.121771,-4.1031 2.230597,-5.1817 0.854272,-0.8327 1.915639,-1.8682 2.692249,-3.745 0.815441,-1.9674 1.195117,-4.5345 1.195117,-8.0638 l 0,-3.2834 c 0,-3.13234 -2.593015,-5.67789 -5.777117,-5.67789 -0.530684,0 -1.057053,0.0734 -1.561849,0.21141 -1.061368,-0.99674 -2.476524,-1.56625 -3.986599,-1.56625 -0.530684,0 -1.057053,0.0734 -1.56185,0.21141 -1.061367,-0.99665 -2.476523,-1.56616 -3.986598,-1.56616 -0.91036,0 -1.77326,0.21141 -2.541241,0.58245 l 0,-7.51586 c 0,-3.5724 -2.899345,-6.47175 -6.471752,-6.47175 -3.572407,0 -6.471751,2.89935 -6.471751,6.47175 z M 64.977871,1025.83 c 0,0.8931 -0.724836,1.618 -1.617937,1.618 -0.893102,0 -1.617938,-0.7249 -1.617938,-1.618 0,-0.8931 0.724836,-1.6179 1.617938,-1.6179 0.893101,0 1.617937,0.7248 1.617937,1.6179 z m -16.179378,-40.14657 0,12.94359 3.235876,0 0,-0.33222 c 0,-1.34612 1.139028,-2.44201 2.541241,-2.44201 0.880158,0 1.682655,0.42714 2.152936,1.14335 l 0.819755,1.2512 1.311608,-0.72484 c 0.383991,-0.21141 0.819755,-0.32358 1.259834,-0.32358 0.880159,0 1.682656,0.42713 2.152936,1.14334 l 0.819755,1.25552 1.311609,-0.72484 c 0.38399,-0.21141 0.819755,-0.32358 1.259834,-0.32358 1.402213,0 2.541241,1.09588 2.541241,2.44204 l 0,3.2834 c 0,6.3984 -1.932896,7.6884 -3.335109,9.0561 -1.432414,1.3936 -3.033094,2.9554 -3.37394,7.6281 l -16.904215,0 c -0.418506,-0.7982 -0.871529,-1.5533 -1.367696,-2.2565 -3.430029,-4.8754 -7.054209,-7.4512 -13.543219,-7.4512 -1.617938,0 -2.93386,-1.5187 -2.93386,-3.1366 0,-1.618 1.315922,-3.0331 2.93386,-3.0331 4.331759,0 5.328409,0.6256 9.405612,1.8682 1.151972,0.3106 2.291,0.604 3.20136,0.8025 l 0.03452,-22.08613 c 0,-1.7862 1.449672,-3.23588 3.235876,-3.23588 1.786203,0 3.235875,1.44968 3.235875,3.23588 z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + transform="translate(6.366175e-7,-577.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + transform="translate(125,-577.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x2 + transform="translate(250,-577.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x3 + transform="translate(375,-577.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x4 + transform="translate(500,-577.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x5 + transform="translate(500,-452.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x5 + transform="translate(375,-452.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x4 + transform="translate(250,-452.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x3 + transform="translate(125,-452.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x2 + transform="translate(6.366175e-7,-452.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + transform="translate(500,-327.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="m 50.000026,982.98713 c -13.521176,0 -25.239184,7.8741 -31.000021,19.37507 5.760837,11.501 17.478845,19.3751 31.000021,19.3751 13.521124,0 25.239132,-7.8741 30.999969,-19.3751 C 75.239158,990.86123 63.52115,982.98713 50.000026,982.98713 Z m 15.282958,10.27661 c 3.642503,2.325 6.727005,5.43533 9.04684,9.09846 -2.319835,3.6632 -5.404337,6.7787 -9.04684,9.0985 -4.577669,2.9192 -9.863121,4.4641 -15.282958,4.4641 -5.425004,0 -10.710507,-1.5449 -15.28301,-4.4641 -3.642503,-2.325 -6.727005,-5.4353 -9.04684,-9.0985 2.319835,-3.66313 5.404337,-6.77863 9.04684,-9.09846 0.237666,-0.14984 0.475333,-0.29967 0.718167,-0.44434 -0.604501,1.65334 -0.935168,3.441 -0.935168,5.30617 0,8.56113 6.938838,15.50003 15.500011,15.50003 8.561121,0 15.499959,-6.9389 15.499959,-15.50003 0,-1.86517 -0.330667,-3.64767 -0.935168,-5.30617 0.242834,0.14467 0.480501,0.28934 0.718167,0.44434 z m -15.282958,2.92433 c 0,3.2085 -2.604002,5.81253 -5.812504,5.81253 -3.208502,0 -5.812504,-2.60403 -5.812504,-5.81253 0,-3.2085 2.604002,-5.8125 5.812504,-5.8125 3.208502,0 5.812504,2.604 5.812504,5.8125 z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x5 + transform="translate(375,-327.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="m 50.000026,982.98713 c -13.521176,0 -25.239184,7.8741 -31.000021,19.37507 5.760837,11.501 17.478845,19.3751 31.000021,19.3751 13.521124,0 25.239132,-7.8741 30.999969,-19.3751 C 75.239158,990.86123 63.52115,982.98713 50.000026,982.98713 Z m 15.282958,10.27661 c 3.642503,2.325 6.727005,5.43533 9.04684,9.09846 -2.319835,3.6632 -5.404337,6.7787 -9.04684,9.0985 -4.577669,2.9192 -9.863121,4.4641 -15.282958,4.4641 -5.425004,0 -10.710507,-1.5449 -15.28301,-4.4641 -3.642503,-2.325 -6.727005,-5.4353 -9.04684,-9.0985 2.319835,-3.66313 5.404337,-6.77863 9.04684,-9.09846 0.237666,-0.14984 0.475333,-0.29967 0.718167,-0.44434 -0.604501,1.65334 -0.935168,3.441 -0.935168,5.30617 0,8.56113 6.938838,15.50003 15.500011,15.50003 8.561121,0 15.499959,-6.9389 15.499959,-15.50003 0,-1.86517 -0.330667,-3.64767 -0.935168,-5.30617 0.242834,0.14467 0.480501,0.28934 0.718167,0.44434 z m -15.282958,2.92433 c 0,3.2085 -2.604002,5.81253 -5.812504,5.81253 -3.208502,0 -5.812504,-2.60403 -5.812504,-5.81253 0,-3.2085 2.604002,-5.8125 5.812504,-5.8125 3.208502,0 5.812504,2.604 5.812504,5.8125 z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x4 + transform="translate(250,-327.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="m 50.000026,982.98713 c -13.521176,0 -25.239184,7.8741 -31.000021,19.37507 5.760837,11.501 17.478845,19.3751 31.000021,19.3751 13.521124,0 25.239132,-7.8741 30.999969,-19.3751 C 75.239158,990.86123 63.52115,982.98713 50.000026,982.98713 Z m 15.282958,10.27661 c 3.642503,2.325 6.727005,5.43533 9.04684,9.09846 -2.319835,3.6632 -5.404337,6.7787 -9.04684,9.0985 -4.577669,2.9192 -9.863121,4.4641 -15.282958,4.4641 -5.425004,0 -10.710507,-1.5449 -15.28301,-4.4641 -3.642503,-2.325 -6.727005,-5.4353 -9.04684,-9.0985 2.319835,-3.66313 5.404337,-6.77863 9.04684,-9.09846 0.237666,-0.14984 0.475333,-0.29967 0.718167,-0.44434 -0.604501,1.65334 -0.935168,3.441 -0.935168,5.30617 0,8.56113 6.938838,15.50003 15.500011,15.50003 8.561121,0 15.499959,-6.9389 15.499959,-15.50003 0,-1.86517 -0.330667,-3.64767 -0.935168,-5.30617 0.242834,0.14467 0.480501,0.28934 0.718167,0.44434 z m -15.282958,2.92433 c 0,3.2085 -2.604002,5.81253 -5.812504,5.81253 -3.208502,0 -5.812504,-2.60403 -5.812504,-5.81253 0,-3.2085 2.604002,-5.8125 5.812504,-5.8125 3.208502,0 5.812504,2.604 5.812504,5.8125 z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x3 + transform="translate(125,-327.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="m 50.000026,982.98713 c -13.521176,0 -25.239184,7.8741 -31.000021,19.37507 5.760837,11.501 17.478845,19.3751 31.000021,19.3751 13.521124,0 25.239132,-7.8741 30.999969,-19.3751 C 75.239158,990.86123 63.52115,982.98713 50.000026,982.98713 Z m 15.282958,10.27661 c 3.642503,2.325 6.727005,5.43533 9.04684,9.09846 -2.319835,3.6632 -5.404337,6.7787 -9.04684,9.0985 -4.577669,2.9192 -9.863121,4.4641 -15.282958,4.4641 -5.425004,0 -10.710507,-1.5449 -15.28301,-4.4641 -3.642503,-2.325 -6.727005,-5.4353 -9.04684,-9.0985 2.319835,-3.66313 5.404337,-6.77863 9.04684,-9.09846 0.237666,-0.14984 0.475333,-0.29967 0.718167,-0.44434 -0.604501,1.65334 -0.935168,3.441 -0.935168,5.30617 0,8.56113 6.938838,15.50003 15.500011,15.50003 8.561121,0 15.499959,-6.9389 15.499959,-15.50003 0,-1.86517 -0.330667,-3.64767 -0.935168,-5.30617 0.242834,0.14467 0.480501,0.28934 0.718167,0.44434 z m -15.282958,2.92433 c 0,3.2085 -2.604002,5.81253 -5.812504,5.81253 -3.208502,0 -5.812504,-2.60403 -5.812504,-5.81253 0,-3.2085 2.604002,-5.8125 5.812504,-5.8125 3.208502,0 5.812504,2.604 5.812504,5.8125 z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> x2 + transform="translate(6.366175e-7,-327.36218)"> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> + d="m 50.000026,982.98713 c -13.521176,0 -25.239184,7.8741 -31.000021,19.37507 5.760837,11.501 17.478845,19.3751 31.000021,19.3751 13.521124,0 25.239132,-7.8741 30.999969,-19.3751 C 75.239158,990.86123 63.52115,982.98713 50.000026,982.98713 Z m 15.282958,10.27661 c 3.642503,2.325 6.727005,5.43533 9.04684,9.09846 -2.319835,3.6632 -5.404337,6.7787 -9.04684,9.0985 -4.577669,2.9192 -9.863121,4.4641 -15.282958,4.4641 -5.425004,0 -10.710507,-1.5449 -15.28301,-4.4641 -3.642503,-2.325 -6.727005,-5.4353 -9.04684,-9.0985 2.319835,-3.66313 5.404337,-6.77863 9.04684,-9.09846 0.237666,-0.14984 0.475333,-0.29967 0.718167,-0.44434 -0.604501,1.65334 -0.935168,3.441 -0.935168,5.30617 0,8.56113 6.938838,15.50003 15.500011,15.50003 8.561121,0 15.499959,-6.9389 15.499959,-15.50003 0,-1.86517 -0.330667,-3.64767 -0.935168,-5.30617 0.242834,0.14467 0.480501,0.28934 0.718167,0.44434 z m -15.282958,2.92433 c 0,3.2085 -2.604002,5.81253 -5.812504,5.81253 -3.208502,0 -5.812504,-2.60403 -5.812504,-5.81253 0,-3.2085 2.604002,-5.8125 5.812504,-5.8125 3.208502,0 5.812504,2.604 5.812504,5.8125 z" /> + d="M 100,50 A 50,50 0 1 1 0,50 50,50 0 1 1 100,50 Z" /> Date: Thu, 24 Mar 2016 13:03:21 -0500 Subject: [PATCH 098/111] Add view fragments to default_badges.svg --- design/images/default_badges.svg | 678 ++++++------------------------- 1 file changed, 114 insertions(+), 564 deletions(-) diff --git a/design/images/default_badges.svg b/design/images/default_badges.svg index ae98c0dd8..13102be35 100644 --- a/design/images/default_badges.svg +++ b/design/images/default_badges.svg @@ -7,8 +7,9 @@ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="svg2" - height="1225" - width="600" + height="100" + width="100" + viewBox="0 0 600 1125" version="1.1"> @@ -586,518 +587,6 @@ r="44.015625" cy="1004.014" cx="45.061192" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + x5 x4 x3 x2 x5 x4 x3 x2 x5 x4 x3 x2 x2 x3 x4 x5 x5 x4 x3 x2 x5 x4 x3 x2 + id="default-badge-group"> From d2aedf17bf8b75d4910bfc8560443ab1a90d65de Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Thu, 24 Mar 2016 13:37:28 -0500 Subject: [PATCH 099/111] Add default badges to stub.php --- settings/stub.php | 61 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 51 insertions(+), 10 deletions(-) diff --git a/settings/stub.php b/settings/stub.php index 8783c351c..5ede65032 100644 --- a/settings/stub.php +++ b/settings/stub.php @@ -73,16 +73,57 @@ )); } -// Insert stub badge -$SQL->Insert('Badge', array( - 'Name' => 'What did I just do?', - 'Description' => 'You installed Yaga! Feel free to edit or delete this badge by clicking the buttons on the right.', - 'Photo' => 'applications/yaga/design/images/default_badge.png', - 'RuleClass' => 'ManualAward', - 'RuleCriteria' => 'a:0:{}', - 'AwardValue' => 1, - 'Enabled' => 0 -)); +// Only insert stub content if nothing exists +$Row = $SQL->get('Badge', '', 'asc', 1)->firstRow(DATASET_TYPE_ARRAY); +if (!$Row) { + $SQL->Insert('Badge', array('Name' => 'First Anniversary','Description' => 'Has it been a year already?','Photo' => '/applications/yaga/design/images/default_badges.svg#anniversary-1','RuleClass' => 'LengthOfService','RuleCriteria' => 'a:2:{s:8:"Duration";s:1:"1";s:6:"Period";s:4:"year";}','AwardValue' => 5)); + $SQL->Insert('Badge', array('Name' => 'Second Anniversary','Description' => 'Thanks for sticking with us for 2 years.','Photo' => '/applications/yaga/design/images/default_badges.svg#anniversary-2','RuleClass' => 'LengthOfService','RuleCriteria' => 'a:2:{s:8:"Duration";s:1:"2";s:6:"Period";s:4:"year";}','AwardValue' => 5)); + $SQL->Insert('Badge', array('Name' => 'Third Anniversary','Description' => 'That\'s three years you have been here!','Photo' => '/applications/yaga/design/images/default_badges.svg#anniversary-3','RuleClass' => 'LengthOfService','RuleCriteria' => 'a:2:{s:8:"Duration";s:1:"3";s:6:"Period";s:4:"year";}','AwardValue' => 5)); + $SQL->Insert('Badge', array('Name' => 'Fourth Anniversary','Description' => 'You might have graduated from college considering how long you have been here.','Photo' => '/applications/yaga/design/images/default_badges.svg#anniversary-4','RuleClass' => 'LengthOfService','RuleCriteria' => 'a:2:{s:8:"Duration";s:1:"4";s:6:"Period";s:4:"year";}','AwardValue' => 5)); + $SQL->Insert('Badge', array('Name' => 'Fifth Anniversary','Description' => 'Five years ago, you created your account. Thanks for sticking around!','Photo' => '/applications/yaga/design/images/default_badges.svg#anniversary-5','RuleClass' => 'LengthOfService','RuleCriteria' => 'a:2:{s:8:"Duration";s:1:"5";s:6:"Period";s:4:"year";}','AwardValue' => 5)); + $SQL->Insert('Badge', array('Name' => 'Final Anniversary','Description' => 'You have reached your final form. OK, not really, but you are still awesome in my book!','Photo' => '/applications/yaga/design/images/default_badges.svg#anniversary-longtime','RuleClass' => 'LengthOfService','RuleCriteria' => 'a:2:{s:8:"Duration";s:1:"6";s:6:"Period";s:4:"year";}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => '5 Awesomes','Description' => 'You have received 5 awesomes. Not a bad start!','Photo' => '/applications/yaga/design/images/default_badges.svg#awesome-1','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:1:"5";s:8:"ActionID";s:1:"3";}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => '25 Awesomes','Description' => 'You keep posting great content. Nice!','Photo' => '/applications/yaga/design/images/default_badges.svg#awesome-2','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:2:"25";s:8:"ActionID";s:1:"3";}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => '100 Awesomes','Description' => 'Your posts are what good forums are made of!','Photo' => '/applications/yaga/design/images/default_badges.svg#awesome-3','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:3:"100";s:8:"ActionID";s:1:"3";}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => '250 Awesomes','Description' => 'We definitely want you to keep doing what you are doing.','Photo' => '/applications/yaga/design/images/default_badges.svg#awesome-4','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:3:"250";s:8:"ActionID";s:1:"3";}','AwardValue' => 25)); + $SQL->Insert('Badge', array('Name' => '500 Awesomes','Description' => 'We\'re lucky to have you here. Amazing!','Photo' => '/applications/yaga/design/images/default_badges.svg#awesome-5','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:3:"500";s:8:"ActionID";s:1:"3";}','AwardValue' => 50)); + $SQL->Insert('Badge', array('Name' => 'Have Some Cake','Description' => 'Thanks for posting on your anniversary. It means so much to us that you remembered!','Photo' => '/applications/yaga/design/images/default_badges.svg#cakeday','RuleClass' => 'CakeDayPost','RuleCriteria' => 'a:0:{}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => 'First Post','Description' => 'You are in there and getting involved. Have some free points!','Photo' => '/applications/yaga/design/images/default_badges.svg#comment-1','RuleClass' => 'PostCount','RuleCriteria' => 'a:2:{s:10:"Comparison";s:3:"gte";s:6:"Target";s:1:"1";}','AwardValue' => 2)); + $SQL->Insert('Badge', array('Name' => '10 Posts','Description' => 'This is how you get to places. Keep up your posting.','Photo' => '/applications/yaga/design/images/default_badges.svg#comment-2','RuleClass' => 'PostCount','RuleCriteria' => 'a:2:{s:10:"Comparison";s:3:"gte";s:6:"Target";s:2:"10";}','AwardValue' => 5)); + $SQL->Insert('Badge', array('Name' => '100 Posts','Description' => 'Thanks for driving discussions!','Photo' => '/applications/yaga/design/images/default_badges.svg#comment-3','RuleClass' => 'PostCount','RuleCriteria' => 'a:2:{s:10:"Comparison";s:3:"gte";s:6:"Target";s:3:"100";}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => '500 Posts','Description' => 'You have given the gift of gab to this community.','Photo' => '/applications/yaga/design/images/default_badges.svg#comment-4','RuleClass' => 'PostCount','RuleCriteria' => 'a:2:{s:10:"Comparison";s:3:"gte";s:6:"Target";s:3:"500";}','AwardValue' => 15)); + $SQL->Insert('Badge', array('Name' => '1000 Posts','Description' => 'When you are here, you\'re family!','Photo' => '/applications/yaga/design/images/default_badges.svg#comment-5','RuleClass' => 'PostCount','RuleCriteria' => 'a:2:{s:10:"Comparison";s:3:"gte";s:6:"Target";s:4:"1000";}','AwardValue' => 20)); + $SQL->Insert('Badge', array('Name' => 'Book Connection','Description' => 'See how many likes you get with these shares. Am I doing this right?','Photo' => '/applications/yaga/design/images/default_badges.svg#fb-connector','RuleClass' => 'SocialConnection','RuleCriteria' => 'a:1:{s:13:"SocialNetwork";s:8:"Facebook";}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => '5 Insightfuls','Description' => 'You have received 5 insightfuls. Not a bad start!','Photo' => '/applications/yaga/design/images/default_badges.svg#insightful-1','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:1:"5";s:8:"ActionID";s:1:"2";}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => '25 Insightfuls','Description' => 'You keep posting great content. Nice!','Photo' => '/applications/yaga/design/images/default_badges.svg#insightful-2','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:2:"25";s:8:"ActionID";s:1:"2";}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => '100 Insightfuls','Description' => 'Your posts are what good forums are made of!','Photo' => '/applications/yaga/design/images/default_badges.svg#insightful-3','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:3:"100";s:8:"ActionID";s:1:"2";}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => '250 Insightfuls','Description' => 'We definitely want you to keep doing what you are doing.','Photo' => '/applications/yaga/design/images/default_badges.svg#insightful-4','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:3:"250";s:8:"ActionID";s:1:"2";}','AwardValue' => 25)); + $SQL->Insert('Badge', array('Name' => '500 Insightfuls','Description' => 'We\'re lucky to have you here. Amazing!','Photo' => '/applications/yaga/design/images/default_badges.svg#insightful-5','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:3:"500";s:8:"ActionID";s:1:"2";}','AwardValue' => 50)); + $SQL->Insert('Badge', array('Name' => 'Paging Mr. F','Description' => 'Mentioning someone in a post is a great way to direct comments.','Photo' => '/applications/yaga/design/images/default_badges.svg#mention','RuleClass' => 'HasMentioned','RuleCriteria' => 'a:0:{}','AwardValue' => 5)); + $SQL->Insert('Badge', array('Name' => 'We Have Touchdown','Description' => 'Today is the anniversary of the first human moon-walk. Celebrate!','Photo' => '/applications/yaga/design/images/default_badges.svg#moon-landing','RuleClass' => 'HolidayVisit','RuleCriteria' => 'a:2:{s:5:"Month";s:1:"7";s:3:"Day";s:2:"20";}','AwardValue' => 15)); + $SQL->Insert('Badge', array('Name' => 'You Look Familiar','Description' => 'Thanks for sharing yourself with the community.','Photo' => '/applications/yaga/design/images/default_badges.svg#portrait-upload','RuleClass' => 'PhotoExists','RuleCriteria' => 'a:0:{}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => '1 Promote','Description' => 'You have received your first promote. This is a great start!','Photo' => '/applications/yaga/design/images/default_badges.svg#promote-1','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:1:"1";s:8:"ActionID";s:1:"1";}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => '5 Promotes','Description' => 'You keep posting great content. Nice!','Photo' => '/applications/yaga/design/images/default_badges.svg#promote-2','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:1:"5";s:8:"ActionID";s:1:"1";}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => '25 Promotes','Description' => 'Your posts are what good forums are made of!','Photo' => '/applications/yaga/design/images/default_badges.svg#promote-3','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:2:"25";s:8:"ActionID";s:1:"1";}','AwardValue' => 25)); + $SQL->Insert('Badge', array('Name' => '50 Promotes','Description' => 'We definitely want you to keep doing what you are doing.','Photo' => '/applications/yaga/design/images/default_badges.svg#promote-4','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:2:"50";s:8:"ActionID";s:1:"1";}','AwardValue' => 50)); + $SQL->Insert('Badge', array('Name' => '100 Promotes','Description' => 'We\'re lucky to have you here. Amazing!','Photo' => '/applications/yaga/design/images/default_badges.svg#promote-5','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:3:"100";s:8:"ActionID";s:1:"1";}','AwardValue' => 100)); + $SQL->Insert('Badge', array('Name' => 'c-c-COMBO BREAKER!','Description' => 'You are doing so much stuff today. Have another badge!','Photo' => '/applications/yaga/design/images/default_badges.svg#achievement-combo','RuleClass' => 'AwardCombo','RuleCriteria' => 'a:3:{s:6:"Target";s:1:"5";s:8:"Duration";s:1:"1";s:6:"Period";s:3:"day";}','AwardValue' => 20)); + $SQL->Insert('Badge', array('Name' => 'Post Marathon','Description' => 'I am tired just looking at all the stuff you are doing!','Photo' => '/applications/yaga/design/images/default_badges.svg#running-man','RuleClass' => 'CommentMarathon','RuleCriteria' => 'a:3:{s:6:"Target";s:2:"25";s:8:"Duration";s:1:"1";s:6:"Period";s:3:"day";}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => '5 WTFs','Description' => 'You have received 5 WTFs. Not a bad start!','Photo' => '/applications/yaga/design/images/default_badges.svg#shock-1','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:1:"5";s:8:"ActionID";s:1:"5";}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => '25 WTFs','Description' => 'You keep posting great content. Nice!','Photo' => '/applications/yaga/design/images/default_badges.svg#shock-2','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:2:"25";s:8:"ActionID";s:1:"5";}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => '100 WTFs','Description' => 'Your posts are what good forums are made of!','Photo' => '/applications/yaga/design/images/default_badges.svg#shock-3','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:3:"100";s:8:"ActionID";s:1:"5";}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => '250 WTFs','Description' => 'We definitely want you to keep doing what you are doing.','Photo' => '/applications/yaga/design/images/default_badges.svg#shock-4','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:3:"250";s:8:"ActionID";s:1:"5";}','AwardValue' => 25)); + $SQL->Insert('Badge', array('Name' => '500 WTFs','Description' => 'We\'re lucky to have you here. Amazing!','Photo' => '/applications/yaga/design/images/default_badges.svg#shock-5','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:3:"500";s:8:"ActionID";s:1:"5";}','AwardValue' => 50)); + $SQL->Insert('Badge', array('Name' => 'Threadshot!','Description' => 'You have super fast reflexes to have responded so quickly!','Photo' => '/applications/yaga/design/images/default_badges.svg#threadshot-reticle','RuleClass' => 'ReflexComment','RuleCriteria' => 'a:1:{s:7:"Seconds";s:2:"60";}','AwardValue' => 15)); + $SQL->Insert('Badge', array('Name' => 'Twitterpated','Description' => 'Make way for the retweets, hash tags, and restrictive message length. It is refreshing to see well crafted messages make every character cou','Photo' => '/applications/yaga/design/images/default_badges.svg#twitter-connector','RuleClass' => 'SocialConnection','RuleCriteria' => 'a:1:{s:13:"SocialNetwork";s:7:"Twitter";}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => 'I\'m Not Dead Yet!','Description' => 'You should try bring humans back to life now that you have brought this discussion back from the dead.','Photo' => '/applications/yaga/design/images/default_badges.svg#unimpressed-necropost','RuleClass' => 'NecroPost','RuleCriteria' => 'a:2:{s:8:"Duration";s:2:"26";s:6:"Period";s:4:"week";}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => 'Welcome Committee','Description' => 'Thanks for posting on a new member\'s first discussion. I know you made them feel at home.','Photo' => '/applications/yaga/design/images/default_badges.svg#welcome-committee','RuleClass' => 'NewbieComment','RuleCriteria' => 'a:2:{s:8:"Duration";s:1:"2";s:6:"Period";s:3:"day";}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => '5 LOLs','Description' => 'You have received 5 LOLs. Not a bad start!','Photo' => '/applications/yaga/design/images/default_badges.svg#wink-1','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:1:"5";s:8:"ActionID";s:1:"4";}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => '25 LOLs','Description' => 'You keep posting great content. Nice!','Photo' => '/applications/yaga/design/images/default_badges.svg#wink-2','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:2:"25";s:8:"ActionID";s:1:"4";}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => '100 LOLs','Description' => 'Your posts are what good forums are made of!','Photo' => '/applications/yaga/design/images/default_badges.svg#wink-3','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:3:"100";s:8:"ActionID";s:1:"4";}','AwardValue' => 10)); + $SQL->Insert('Badge', array('Name' => '250 LOLs','Description' => 'We definitely want you to keep doing what you are doing.','Photo' => '/applications/yaga/design/images/default_badges.svg#wink-4','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:3:"250";s:8:"ActionID";s:1:"4";}','AwardValue' => 25)); + $SQL->Insert('Badge', array('Name' => '500 LOLs','Description' => 'We\'re lucky to have you here. Amazing!','Photo' => '/applications/yaga/design/images/default_badges.svg#wink-5','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:3:"500";s:8:"ActionID";s:1:"4";}','AwardValue' => 50)); +} // Insert stub ranks $SQL->Insert('Rank', array( From b55737161992b07b29c500f37d8f8e93d6246ae3 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Thu, 24 Mar 2016 13:43:49 -0500 Subject: [PATCH 100/111] Add default ranks to stub.php --- settings/stub.php | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/settings/stub.php b/settings/stub.php index 5ede65032..37041acd4 100644 --- a/settings/stub.php +++ b/settings/stub.php @@ -125,18 +125,14 @@ $SQL->Insert('Badge', array('Name' => '500 LOLs','Description' => 'We\'re lucky to have you here. Amazing!','Photo' => '/applications/yaga/design/images/default_badges.svg#wink-5','RuleClass' => 'ReactionCount','RuleCriteria' => 'a:2:{s:6:"Target";s:3:"500";s:8:"ActionID";s:1:"4";}','AwardValue' => 50)); } -// Insert stub ranks -$SQL->Insert('Rank', array( - 'Name' => 'Entry Level', - 'Description' => 'You are in the minor leagues. I suggest you work on your content to progress.', - 'PointReq' => 1, - 'Sort' => 1, - 'Enabled' => 0 -)); -$SQL->Insert('Rank', array( - 'Name' => 'Big Time', - 'Description' => 'You have hit the big time! Keep up the good work.', - 'PointReq' => 100, - 'Sort' => 2, - 'Enabled' => 0 -)); \ No newline at end of file +// Only insert default ranks if none exist +$Row = $SQL->get('Rank', '', 'asc', 1)->firstRow(DATASET_TYPE_ARRAY); +if (!$Row) { + $SQL->Insert('Rank', array('RankID' => '2','Name' => 'Level 2','Description' => 'Level up!','Sort' => '2','PointReq' => '0','PostReq' => '5','AgeReq' => '86400','Perks' => 'a:4:{s:29:"ConfGarden.EditContentTimeout";s:1:"0";s:26:"PermGarden.Curation.Manage";s:6:"revoke";s:27:"PermPlugins.Signatures.Edit";s:6:"revoke";s:23:"PermPlugins.Tagging.Add";s:6:"revoke";}','Enabled' => '1')); + $SQL->Insert('Rank', array('RankID' => '1','Name' => 'Level 1','Description' => 'You are at the lowest level. Build up your points to unlock new features!','Sort' => '1','PointReq' => '0','PostReq' => '0','AgeReq' => '0','Perks' => 'a:6:{s:29:"ConfGarden.EditContentTimeout";s:1:"0";s:26:"PermGarden.Curation.Manage";s:6:"revoke";s:27:"PermPlugins.Signatures.Edit";s:6:"revoke";s:23:"PermPlugins.Tagging.Add";s:6:"revoke";s:35:"ConfPlugins.Emotify.FormatEmoticons";s:1:"0";s:27:"ConfGarden.Format.MeActions";s:1:"0";}','Enabled' => '1')); + $SQL->Insert('Rank', array('RankID' => '3','Name' => 'Level 3','Description' => 'Building your reputation has unlocked emoticons!','Sort' => '3','PointReq' => '15','PostReq' => '50','AgeReq' => '604800','Perks' => 'a:3:{s:29:"ConfGarden.EditContentTimeout";s:1:"0";s:35:"ConfPlugins.Emotify.FormatEmoticons";s:1:"1";s:27:"ConfGarden.Format.MeActions";s:1:"1";}','Enabled' => '1')); + $SQL->Insert('Rank', array('RankID' => '4','Name' => 'Level 4','Description' => 'Your pen now has an eraser! You can edit your posts for up to a week after making them.','Sort' => '4','PointReq' => '75','PostReq' => '200','AgeReq' => '2678400','Perks' => 'a:4:{s:29:"ConfGarden.EditContentTimeout";s:6:"604800";s:27:"PermPlugins.Signatures.Edit";s:5:"grant";s:35:"ConfPlugins.Emotify.FormatEmoticons";s:1:"1";s:27:"ConfGarden.Format.MeActions";s:1:"1";}','Enabled' => '1')); + $SQL->Insert('Rank', array('RankID' => '5','Name' => 'Level 5','Description' => 'Holy batman, you are awesome. Have some more reactions!','Sort' => '5','PointReq' => '250','PostReq' => '400','AgeReq' => '7776000','Perks' => 'a:6:{s:29:"ConfGarden.EditContentTimeout";s:7:"2592000";s:26:"PermGarden.Curation.Manage";s:5:"grant";s:27:"PermPlugins.Signatures.Edit";s:5:"grant";s:23:"PermPlugins.Tagging.Add";s:5:"grant";s:35:"ConfPlugins.Emotify.FormatEmoticons";s:1:"1";s:27:"ConfGarden.Format.MeActions";s:1:"1";}','Enabled' => '1')); + $SQL->Insert('Rank', array('RankID' => '6','Name' => 'Moderator','Description' => 'You can now moderate content. Welcome aboard!','Sort' => '6','PointReq' => '1000','PostReq' => '1000','AgeReq' => '31536000','Perks' => 'a:2:{s:4:"Role";s:2:"32";s:26:"PermGarden.Curation.Manage";s:5:"grant";}','Enabled' => '1')); + $SQL->Insert('Rank', array('RankID' => '7','Name' => 'Administrator','Description' => 'With great power comes great responsibility.','Sort' => '7','PointReq' => '10000','PostReq' => '10000','AgeReq' => '157766400','Perks' => 'a:7:{s:4:"Role";s:2:"16";s:29:"ConfGarden.EditContentTimeout";s:2:"-1";s:26:"PermGarden.Curation.Manage";s:5:"grant";s:27:"PermPlugins.Signatures.Edit";s:5:"grant";s:23:"PermPlugins.Tagging.Add";s:5:"grant";s:35:"ConfPlugins.Emotify.FormatEmoticons";s:1:"1";s:27:"ConfGarden.Format.MeActions";s:1:"1";}','Enabled' => '0')); +} \ No newline at end of file From fed9bdeb88fdd8cb22929cf71dd61e083323ba40 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Thu, 24 Mar 2016 13:48:57 -0500 Subject: [PATCH 101/111] Clean up stub.php --- settings/stub.php | 75 +++++------------------------------------------ 1 file changed, 8 insertions(+), 67 deletions(-) diff --git a/settings/stub.php b/settings/stub.php index 37041acd4..f03f72195 100644 --- a/settings/stub.php +++ b/settings/stub.php @@ -3,77 +3,18 @@ $SQL = Gdn::Database()->SQL(); -// Only insert stub content if nothing exists +// Only insert default actions if none exist $Row = $SQL->get('Action', '', 'asc', 1)->firstRow(DATASET_TYPE_ARRAY); if (!$Row) { - $SQL->Insert('Action', array( - 'ActionID' => 1, - 'Name' => 'Promote', - 'Description' => 'This post deserves to be featured on the best of page!', - 'Tooltip' => 'Click me if this content should be featured.', - 'CssClass' => 'ReactPointUp', - 'AwardValue' => 5, - 'Permission' => 'Garden.Curation.Manage', - 'Sort' => 0 - )); - - $SQL->Insert('Action', array( - 'ActionID' => 2, - 'Name' => 'Insightful', - 'Description' => 'This post brings new meaning to the discussion.', - 'Tooltip' => 'Insightful', - 'CssClass' => 'ReactEye2', - 'AwardValue' => 1, - 'Permission' => 'Yaga.Reactions.Add', - 'Sort' => 1 - )); - - $SQL->Insert('Action', array( - 'ActionID' => 3, - 'Name' => 'Awesome', - 'Description' => 'This post is made of pure win.', - 'Tooltip' => 'Awesome', - 'CssClass' => 'ReactHeart', - 'AwardValue' => 1, - 'Permission' => 'Yaga.Reactions.Add', - 'Sort' => 2 - )); - - $SQL->Insert('Action', array( - 'ActionID' => 4, - 'Name' => 'LOL', - 'Description' => 'This post is funny.', - 'Tooltip' => 'LOL', - 'CssClass' => 'ReactWink', - 'AwardValue' => 1, - 'Permission' => 'Yaga.Reactions.Add', - 'Sort' => 3 - )); - - $SQL->Insert('Action', array( - 'ActionID' => 5, - 'Name' => 'WTF', - 'Description' => 'This post is all sorts of shocking.', - 'Tooltip' => 'WTF', - 'CssClass' => 'ReactShocked', - 'AwardValue' => 1, - 'Permission' => 'Yaga.Reactions.Add', - 'Sort' => 4 - )); - - $SQL->Insert('Action', array( - 'ActionID' => 6, - 'Name' => 'Spam', - 'Description' => 'This post is spam.', - 'Tooltip' => 'Spam', - 'CssClass' => 'ReactWarning', - 'AwardValue' => -5, - 'Permission' => 'Garden.Curation.Manage', - 'Sort' => 5 - )); + $SQL->Insert('Action', array('ActionID' => 1,'Name' => 'Promote','Description' => 'This post deserves to be featured on the best of page!','Tooltip' => 'Click me if this content should be featured.','CssClass' => 'ReactPointUp','AwardValue' => 5,'Permission' => 'Garden.Curation.Manage','Sort' => 0)); + $SQL->Insert('Action', array('ActionID' => 2,'Name' => 'Insightful','Description' => 'This post brings new meaning to the discussion.','Tooltip' => 'Insightful','CssClass' => 'ReactEye2','AwardValue' => 1,'Permission' => 'Yaga.Reactions.Add','Sort' => 1)); + $SQL->Insert('Action', array('ActionID' => 3,'Name' => 'Awesome','Description' => 'This post is made of pure win.','Tooltip' => 'Awesome','CssClass' => 'ReactHeart','AwardValue' => 1,'Permission' => 'Yaga.Reactions.Add','Sort' => 2)); + $SQL->Insert('Action', array('ActionID' => 4,'Name' => 'LOL','Description' => 'This post is funny.','Tooltip' => 'LOL','CssClass' => 'ReactWink','AwardValue' => 1,'Permission' => 'Yaga.Reactions.Add','Sort' => 3)); + $SQL->Insert('Action', array('ActionID' => 5,'Name' => 'WTF','Description' => 'This post is all sorts of shocking.','Tooltip' => 'WTF','CssClass' => 'ReactShocked','AwardValue' => 1,'Permission' => 'Yaga.Reactions.Add','Sort' => 4)); + $SQL->Insert('Action', array('ActionID' => 6,'Name' => 'Spam','Description' => 'This post is spam.','Tooltip' => 'Spam','CssClass' => 'ReactWarning','AwardValue' => -5,'Permission' => 'Garden.Curation.Manage','Sort' => 5)); } -// Only insert stub content if nothing exists +// Only insert default badges if none exist $Row = $SQL->get('Badge', '', 'asc', 1)->firstRow(DATASET_TYPE_ARRAY); if (!$Row) { $SQL->Insert('Badge', array('Name' => 'First Anniversary','Description' => 'Has it been a year already?','Photo' => '/applications/yaga/design/images/default_badges.svg#anniversary-1','RuleClass' => 'LengthOfService','RuleCriteria' => 'a:2:{s:8:"Duration";s:1:"1";s:6:"Period";s:4:"year";}','AwardValue' => 5)); From edb987c8d009b94abb9d077fab7c980543e7eec6 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Thu, 24 Mar 2016 14:23:19 -0500 Subject: [PATCH 102/111] get rid of return --- settings/class.hooks.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/settings/class.hooks.php b/settings/class.hooks.php index f57d507d0..735d601da 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -123,11 +123,10 @@ public function ProfileController_AfterUserInfo_Handler($Sender) { * @param UserInfoModule $Sender */ public function UserInfoModule_OnBasicInfo_Handler($Sender) { - if(!C('Yaga.Badges.Enabled')) { - return; + if(C('Yaga.Badges.Enabled')) { + echo '
      ' . $Sender->User->CountBadges . '
      '; + echo '
      ' . T('Yaga.Badges', 'Badges') . '
      '; } - echo '
      ' . T('Yaga.Badges', 'Badges') . '
      '; - echo '
      ' . $Sender->User->CountBadges . '
      '; } /** From e79acc5f18a4de1c01201ae1c6288cf40b6bff0b Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Thu, 24 Mar 2016 14:39:56 -0500 Subject: [PATCH 103/111] Remove negative actions from the best content filter module --- modules/class.bestfiltermodule.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/class.bestfiltermodule.php b/modules/class.bestfiltermodule.php index 03e42a006..2823ea1e0 100644 --- a/modules/class.bestfiltermodule.php +++ b/modules/class.bestfiltermodule.php @@ -18,7 +18,15 @@ public function __construct($Sender = '') { parent::__construct($Sender); $ActionModel = Yaga::ActionModel(); - $this->Data = $ActionModel->Get(); + $actions = $ActionModel->Get(); + + foreach($actions as $index => $action) { + if($action->AwardValue < 0) { + unset($actions[$index]); + } + } + + $this->Data = $actions; } /** From a7d6a3bba015beb224af3f4ae772b6b529c9e7dc Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Thu, 24 Mar 2016 15:03:41 -0500 Subject: [PATCH 104/111] cleanup stub.php --- settings/stub.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/settings/stub.php b/settings/stub.php index f03f72195..c50d24c84 100644 --- a/settings/stub.php +++ b/settings/stub.php @@ -69,11 +69,11 @@ // Only insert default ranks if none exist $Row = $SQL->get('Rank', '', 'asc', 1)->firstRow(DATASET_TYPE_ARRAY); if (!$Row) { - $SQL->Insert('Rank', array('RankID' => '2','Name' => 'Level 2','Description' => 'Level up!','Sort' => '2','PointReq' => '0','PostReq' => '5','AgeReq' => '86400','Perks' => 'a:4:{s:29:"ConfGarden.EditContentTimeout";s:1:"0";s:26:"PermGarden.Curation.Manage";s:6:"revoke";s:27:"PermPlugins.Signatures.Edit";s:6:"revoke";s:23:"PermPlugins.Tagging.Add";s:6:"revoke";}','Enabled' => '1')); - $SQL->Insert('Rank', array('RankID' => '1','Name' => 'Level 1','Description' => 'You are at the lowest level. Build up your points to unlock new features!','Sort' => '1','PointReq' => '0','PostReq' => '0','AgeReq' => '0','Perks' => 'a:6:{s:29:"ConfGarden.EditContentTimeout";s:1:"0";s:26:"PermGarden.Curation.Manage";s:6:"revoke";s:27:"PermPlugins.Signatures.Edit";s:6:"revoke";s:23:"PermPlugins.Tagging.Add";s:6:"revoke";s:35:"ConfPlugins.Emotify.FormatEmoticons";s:1:"0";s:27:"ConfGarden.Format.MeActions";s:1:"0";}','Enabled' => '1')); - $SQL->Insert('Rank', array('RankID' => '3','Name' => 'Level 3','Description' => 'Building your reputation has unlocked emoticons!','Sort' => '3','PointReq' => '15','PostReq' => '50','AgeReq' => '604800','Perks' => 'a:3:{s:29:"ConfGarden.EditContentTimeout";s:1:"0";s:35:"ConfPlugins.Emotify.FormatEmoticons";s:1:"1";s:27:"ConfGarden.Format.MeActions";s:1:"1";}','Enabled' => '1')); - $SQL->Insert('Rank', array('RankID' => '4','Name' => 'Level 4','Description' => 'Your pen now has an eraser! You can edit your posts for up to a week after making them.','Sort' => '4','PointReq' => '75','PostReq' => '200','AgeReq' => '2678400','Perks' => 'a:4:{s:29:"ConfGarden.EditContentTimeout";s:6:"604800";s:27:"PermPlugins.Signatures.Edit";s:5:"grant";s:35:"ConfPlugins.Emotify.FormatEmoticons";s:1:"1";s:27:"ConfGarden.Format.MeActions";s:1:"1";}','Enabled' => '1')); - $SQL->Insert('Rank', array('RankID' => '5','Name' => 'Level 5','Description' => 'Holy batman, you are awesome. Have some more reactions!','Sort' => '5','PointReq' => '250','PostReq' => '400','AgeReq' => '7776000','Perks' => 'a:6:{s:29:"ConfGarden.EditContentTimeout";s:7:"2592000";s:26:"PermGarden.Curation.Manage";s:5:"grant";s:27:"PermPlugins.Signatures.Edit";s:5:"grant";s:23:"PermPlugins.Tagging.Add";s:5:"grant";s:35:"ConfPlugins.Emotify.FormatEmoticons";s:1:"1";s:27:"ConfGarden.Format.MeActions";s:1:"1";}','Enabled' => '1')); - $SQL->Insert('Rank', array('RankID' => '6','Name' => 'Moderator','Description' => 'You can now moderate content. Welcome aboard!','Sort' => '6','PointReq' => '1000','PostReq' => '1000','AgeReq' => '31536000','Perks' => 'a:2:{s:4:"Role";s:2:"32";s:26:"PermGarden.Curation.Manage";s:5:"grant";}','Enabled' => '1')); - $SQL->Insert('Rank', array('RankID' => '7','Name' => 'Administrator','Description' => 'With great power comes great responsibility.','Sort' => '7','PointReq' => '10000','PostReq' => '10000','AgeReq' => '157766400','Perks' => 'a:7:{s:4:"Role";s:2:"16";s:29:"ConfGarden.EditContentTimeout";s:2:"-1";s:26:"PermGarden.Curation.Manage";s:5:"grant";s:27:"PermPlugins.Signatures.Edit";s:5:"grant";s:23:"PermPlugins.Tagging.Add";s:5:"grant";s:35:"ConfPlugins.Emotify.FormatEmoticons";s:1:"1";s:27:"ConfGarden.Format.MeActions";s:1:"1";}','Enabled' => '0')); + $SQL->Insert('Rank', array('RankID' => 1,'Name' => 'Level 1','Description' => 'You are at the lowest level. Build up your points to unlock new features!','Sort' => 1,'PointReq' => 0,'PostReq' => 0,'AgeReq' => 0,'Perks' => 'a:6:{s:29:"ConfGarden.EditContentTimeout";s:1:"0";s:26:"PermGarden.Curation.Manage";s:6:"revoke";s:27:"PermPlugins.Signatures.Edit";s:6:"revoke";s:23:"PermPlugins.Tagging.Add";s:6:"revoke";s:35:"ConfPlugins.Emotify.FormatEmoticons";s:1:"0";s:27:"ConfGarden.Format.MeActions";s:1:"0";}')); + $SQL->Insert('Rank', array('RankID' => 2,'Name' => 'Level 2','Description' => 'Level up!','Sort' => 2,'PointReq' => 0,'PostReq' => 5,'AgeReq' => 86400,'Perks' => 'a:4:{s:29:"ConfGarden.EditContentTimeout";s:1:"0";s:26:"PermGarden.Curation.Manage";s:6:"revoke";s:27:"PermPlugins.Signatures.Edit";s:6:"revoke";s:23:"PermPlugins.Tagging.Add";s:6:"revoke";}')); + $SQL->Insert('Rank', array('RankID' => 3,'Name' => 'Level 3','Description' => 'Building your reputation has unlocked emoticons!','Sort' => 3,'PointReq' => 15,'PostReq' => 50,'AgeReq' => 604800,'Perks' => 'a:3:{s:29:"ConfGarden.EditContentTimeout";s:1:"0";s:35:"ConfPlugins.Emotify.FormatEmoticons";s:1:"1";s:27:"ConfGarden.Format.MeActions";s:1:"1";}')); + $SQL->Insert('Rank', array('RankID' => 4,'Name' => 'Level 4','Description' => 'Your pen now has an eraser! You can edit your posts for up to a week after making them.','Sort' => 4,'PointReq' => 75,'PostReq' => 200,'AgeReq' => 2678400,'Perks' => 'a:4:{s:29:"ConfGarden.EditContentTimeout";s:6:"604800";s:27:"PermPlugins.Signatures.Edit";s:5:"grant";s:35:"ConfPlugins.Emotify.FormatEmoticons";s:1:"1";s:27:"ConfGarden.Format.MeActions";s:1:"1";}')); + $SQL->Insert('Rank', array('RankID' => 5,'Name' => 'Level 5','Description' => 'Holy batman, you are awesome. Have some more reactions!','Sort' => 5,'PointReq' => 250,'PostReq' => 400,'AgeReq' => 7776000,'Perks' => 'a:6:{s:29:"ConfGarden.EditContentTimeout";s:7:"2592000";s:26:"PermGarden.Curation.Manage";s:5:"grant";s:27:"PermPlugins.Signatures.Edit";s:5:"grant";s:23:"PermPlugins.Tagging.Add";s:5:"grant";s:35:"ConfPlugins.Emotify.FormatEmoticons";s:1:"1";s:27:"ConfGarden.Format.MeActions";s:1:"1";}')); + $SQL->Insert('Rank', array('RankID' => 6,'Name' => 'Moderator','Description' => 'You can now moderate content. Welcome aboard!','Sort' => 6,'PointReq' => 1000,'PostReq' => 1000,'AgeReq' => 31536000,'Perks' => 'a:2:{s:4:"Role";s:2:"32";s:26:"PermGarden.Curation.Manage";s:5:"grant";}')); + $SQL->Insert('Rank', array('RankID' => 7,'Name' => 'Administrator','Description' => 'With great power comes great responsibility.','Sort' => 7,'PointReq' => 10000,'PostReq' => 10000,'AgeReq' => 157766400,'Perks' => 'a:7:{s:4:"Role";s:2:"16";s:29:"ConfGarden.EditContentTimeout";s:2:"-1";s:26:"PermGarden.Curation.Manage";s:5:"grant";s:27:"PermPlugins.Signatures.Edit";s:5:"grant";s:23:"PermPlugins.Tagging.Add";s:5:"grant";s:35:"ConfPlugins.Emotify.FormatEmoticons";s:1:"1";s:27:"ConfGarden.Format.MeActions";s:1:"1";}','Enabled' => 0)); } \ No newline at end of file From e12ea58706ceed0131e2ccae4950388f5bfa0cb5 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Thu, 24 Mar 2016 17:15:34 -0500 Subject: [PATCH 105/111] default to the default badge --- design/images/default_badges.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/design/images/default_badges.svg b/design/images/default_badges.svg index 13102be35..6e9a389e2 100644 --- a/design/images/default_badges.svg +++ b/design/images/default_badges.svg @@ -9,7 +9,7 @@ id="svg2" height="100" width="100" - viewBox="0 0 600 1125" + viewBox="0 0 100 100" version="1.1"> From 2bd781d250e77ffc637fe41fa8fc257fee966b9a Mon Sep 17 00:00:00 2001 From: bleistivt Date: Fri, 25 Mar 2016 08:01:27 +0100 Subject: [PATCH 106/111] Move ksort out of the inner loop This was the culprit for the timeout reported in #116. --- models/class.actedmodel.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/models/class.actedmodel.php b/models/class.actedmodel.php index 33d16e1c8..d2a868b6d 100644 --- a/models/class.actedmodel.php +++ b/models/class.actedmodel.php @@ -368,11 +368,10 @@ protected function Union($Field, $Sections) { foreach($Section as $Item) { $ItemField = GetValue($Field, $Item); $Interleaved[$ItemField] = array_merge($Item, array('ItemType' => $SectionType)); - - ksort($Interleaved); } } + ksort($Interleaved); $Interleaved = array_reverse($Interleaved); return $Interleaved; } From 32fdf640c1f62a5d32fe0f2943b861bb7f2de353 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Fri, 25 Mar 2016 09:57:42 -0500 Subject: [PATCH 107/111] Check for strict upgrades before progressing rank --- settings/class.hooks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/class.hooks.php b/settings/class.hooks.php index 735d601da..a21996916 100755 --- a/settings/class.hooks.php +++ b/settings/class.hooks.php @@ -304,7 +304,7 @@ protected function RankProgression($UserID) { if($Rank && $Rank->RankID != $User->RankID) { // Only promote automatically $OldRank = $RankModel->GetByID($User->RankID); - if($OldRank->Sort <= $Rank->Sort) { + if($OldRank->Sort < $Rank->Sort) { $RankModel->Set($Rank->RankID, $UserID, TRUE); } } From 29d1c3b8293e17cd2a0bda3483cb97057c4a07ee Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Fri, 25 Mar 2016 09:59:58 -0500 Subject: [PATCH 108/111] Fix readme typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 06cbbd0b6..a63a6218f 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ It is released under the GPLv2 and may be released under a different license _** Yaga requires: -* Vanilla 2.2.x (Garden is the actual requirement +* Vanilla 2.2.x (Garden is the actual requirement) * Pretty URLs enabled ## Documentation From 88de8c375750e5d007aa05fb01552619de807bc8 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Fri, 25 Mar 2016 10:11:18 -0500 Subject: [PATCH 109/111] Add a year check to the cakedaypost rule --- library/rules/class.cakedaypost.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/library/rules/class.cakedaypost.php b/library/rules/class.cakedaypost.php index c68c11657..a5ab3a4ec 100644 --- a/library/rules/class.cakedaypost.php +++ b/library/rules/class.cakedaypost.php @@ -14,13 +14,16 @@ public function Award($Sender, $User, $Criteria) { // Determine if today is the target day $CakeDate = strtotime($User->DateInserted); + $CakeYear = date('Y', $CakeDate); $CakeMonth = date('n', $CakeDate); $CakeDay = date('j', $CakeDate); + $TodaysYear = date('Y'); $TodaysMonth = date('n'); $TodaysDay = date('j'); if($CakeMonth == $TodaysMonth - && $CakeDay == $TodaysDay) { + && $CakeDay == $TodaysDay + && $CakeYear != $TodaysYear) { return TRUE; } else { From 7698b1ffd052ad4a6203165435ba4c8e00a3ae95 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Fri, 25 Mar 2016 10:15:25 -0500 Subject: [PATCH 110/111] Do not add the key if we are just running the structure scan --- settings/structure.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/structure.php b/settings/structure.php index 44eb46ab3..f60449135 100755 --- a/settings/structure.php +++ b/settings/structure.php @@ -26,7 +26,7 @@ ->Set($Explicit, $Drop); $result = $SQL->query("SHOW INDEX FROM ${Px}Reaction WHERE Key_name = 'IX_ParentID_ParentType'")->result(); -if(!$result) { +if(!$result && !$Construct->CaptureOnly) { $SQL->query("ALTER TABLE ${Px}Reaction ADD INDEX IX_ParentID_ParentType (ParentID, ParentType)"); } From ee7c7aeda15acb373db93270cfee3e97468bbf46 Mon Sep 17 00:00:00 2001 From: Zachary Doll Date: Fri, 25 Mar 2016 14:26:35 -0500 Subject: [PATCH 111/111] bump version --- settings/about.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings/about.php b/settings/about.php index 7bbc7fa4c..29ccdb9aa 100755 --- a/settings/about.php +++ b/settings/about.php @@ -1,9 +1,9 @@ 'Yet Another Gamification Application', 'Description' => 'Yaga provides customizable reactions, badges, and ranks for your Vanilla forum software. Increase user activity by letting users react to content with emotions. Give users badges based on statistics and engagement in your community. Create and award custom badges for special events and recognition. Award Ranks which can confer different (configurable) permissions based on community perception and participation.', - 'Version' => '1.0.0-alpha', + 'Version' => '1.1', 'Url' => 'http://github.com/hgtonight/application-yaga', 'Author' => 'Zachary Doll', 'AuthorEmail' => 'hgtonight@daklutz.com',