From 785c78c95175e69d8efe1f9e476c0babe5b30386 Mon Sep 17 00:00:00 2001
From: Cooldude2606 <cooldude260607@gmail.com>
Date: Sat, 6 Jan 2018 17:58:03 +0000
Subject: [PATCH] Fixed Annoncements

---
 Addons/Guis/announcements.lua | 30 ++++++++++++++++++++----------
 Addons/playerRanks.lua        |  6 ++++--
 locale/en/announcements.cfg   |  3 ++-
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/Addons/Guis/announcements.lua b/Addons/Guis/announcements.lua
index 8fd8c9b5..894867d0 100644
--- a/Addons/Guis/announcements.lua
+++ b/Addons/Guis/announcements.lua
@@ -34,14 +34,13 @@ local send_popup = Gui.inputs.add{
     local default = Ranking.get_rank(meta_data.default)
     local player = Game.get_player(event)
     local rank = Ranking.get_rank(player)
-    local _rank = Ranking.get_rank(event.element.parent.rank.caption)
-    if not _rank then return end
+    local _rank = Ranking.get_rank(event.element.parent.rank.caption); if not _rank then return end
     local sent_by = {'announcements.sent-by',player.name,rank.name}
     local rank_name = _rank.name; if rank_name == default.name then rank_name = 'Everyone' end
     local sent_to = {'announcements.sent-to',rank_name}
     local message = event.element.parent.parent.message.text
     for power,__rank in pairs(Ranking._ranks()) do
-        if power >= _rank.power then
+        if power <= _rank.power then
             Gui.popup.open('announcements',{sent_by=sent_by,sent_to=sent_to,message=message},__rank:get_players(true))
         end
     end
@@ -51,8 +50,10 @@ Gui.popup.add{
     name='announcements',
     caption={'announcements.name'},
     draw=function(frame,data)
-        frame.add{type='label',caption=data.sent_by}
-        frame.add{type='label',caption=data.sent_to}
+        frame.style.right_padding = 5
+        frame.style.bottom_padding = 5
+        frame.add{type='label',caption=data.sent_by,style='caption_label'}
+        frame.add{type='label',caption=data.sent_to,style='caption_label'}
         local text_box = frame.add{type='text-box'}
         text_box.text = data.message
         text_box.style.width = 400
@@ -61,24 +62,33 @@ Gui.popup.add{
 		text_box.selectable = true
     end
 }:add_left{
-    caption='Gui Left w/ Popup',
-    tooltip='Send a message',
+    caption='item/programmable-speaker',
+    tooltip={'announcements.tooltip'},
     draw=function(frame)
+        frame.caption = {'announcements.name'}
         local frame = frame.add{
             type='flow',
-            directions='vertical'
+            direction='vertical'
         }
-        frame.add{
+        local text_box = frame.add{
             type='text-box',
             name='message'
         }
+        text_box.style.width = 400
+        text_box.style.minimal_height = 100
+        text_box.read_only = false
+		text_box.word_wrap = true
+		text_box.selectable = true
         local flow = frame.add{type='flow'}
         flow.add{
             type='label',
             caption={'announcements.select-rank'}
         }
         rank_drop_down:draw(flow)
-        send_popup:draw(flow).style.visible = false
+        local btn = send_popup:draw(flow)
+        btn.style.visible = false
+        btn.style.height = 25
+        btn.style.width = 25
         flow.add{
             type='label',
             name='rank',
diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua
index 892bbf1a..cb19f22d 100644
--- a/Addons/playerRanks.lua
+++ b/Addons/playerRanks.lua
@@ -50,7 +50,8 @@ groups['Root']:edit('allow',false,{
     ['temp-ban']=true,
     ['clear-warings']=true,
     ['clear-reports']=true,
-    ['clear-player']=true
+    ['clear-player']=true,
+    ['announcements']=true
 })
 groups['Admin']:edit('allow',false,{
     ['player-list']=true,
@@ -64,7 +65,8 @@ groups['Admin']:edit('allow',false,{
     ['temp-ban']=true,
     ['clear-warings']=true,
     ['clear-reports']=true,
-    ['clear-player']=true
+    ['clear-player']=true,
+    ['announcements']=true
 })
 groups['User']:edit('allow',false,{
     ['player-list']=true,
diff --git a/locale/en/announcements.cfg b/locale/en/announcements.cfg
index 75a71670..c4e55a6a 100644
--- a/locale/en/announcements.cfg
+++ b/locale/en/announcements.cfg
@@ -1,5 +1,6 @@
-[anouncements]
+[announcements]
 name=Announcement
+tooltip=Sent an announcement to players
 sent-to=This is sent to __1__
 sent-by=This was sent by __1__ of rank __2__
 select-rank=This message will be sent to: 
\ No newline at end of file