Skip to content

Commit

Permalink
Merge pull request #82 from mainIine/beta
Browse files Browse the repository at this point in the history 
Beta
  • Loading branch information
Th3OnlyC0D3R authored Apr 9, 2021
2 parents e4665db + f745c64 commit e08ac6d
Show file tree
Hide file tree
Showing 21 changed files with 2,215 additions and 1,939 deletions.
5 changes: 2 additions & 3 deletions css/web/_menu_box.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
height: 60px;
min-width: 95px !important;
min-height: 50px !important;
border-image-source: url(../images/hud/window-menu.png);
border-image-source: url('../images/hud/window-menu.png');
border-radius: 15px;
border-width: 30px 7px 7px 7px;
border-image-outset: 0.3;
}

#menu_box.closed {
border-image-source: url(../images/hud/window-menu-closed.png);
border-image-source: url('../images/hud/window-menu-closed.png');
min-height: 0 !important;
}

Expand All @@ -52,7 +52,6 @@

#menu_box #menu_boxBody {
overflow: auto;
overflow-y: auto;
}

.hud-btn {
Expand Down
56 changes: 28 additions & 28 deletions css/web/boxes.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,107 +364,107 @@ p {

/* MENU ICONS */

#market-Btn span {
[id$=market-Btn] span {
background-image: url('../images/menu/market.png');
}

#moppelhelper-Btn span {
[id$=moppelhelper-Btn] span {
background-image: url('../images/menu/polivation.png');
}

#fpCollector-Btn span {
[id$=fpCollector-Btn] span {
background-image: url('../images/menu/forgepoints.png');
}

#greatbuildings-Btn span {
[id$=greatbuildings-Btn] span {
background-image: url('../images/menu/greatbuildings.png');
}

#productions-Btn span {
[id$=productions-Btn] span {
background-image: url('../images/menu/productions.png');
}

#calculator-Btn span {
[id$=calculator-Btn] span {
background-image: url('../images/menu/calculator.png');
}

#outpost-Btn span {
[id$=outpost-Btn] span {
background-image: url('../images/menu/vikings_ship.png');
}

#partCalc-Btn span {
[id$=partCalc-Btn] span {
background-image: url('../images/menu/part-calc.png');
}

#technologies-Btn span {
[id$=technologies-Btn] span {
background-image: url('../images/menu/technologies.png');
}

#hiddenRewards-Btn span:first-child {
[id$=hiddenRewards-Btn] span:first-child {
background-image: url('../images/menu/incident_crates.png');
}

#campagneMap-Btn span {
[id$=campagneMap-Btn] span {
background-image: url('../images/menu/map.png');
}

#citymap-Btn span {
[id$=citymap-Btn] span {
background-image: url('../images/menu/citymap.png');
}

#chat-Btn span {
[id$=chat-Btn] span {
background-image: url('../images/menu/chat.png');
}

#settings-Btn span {
[id$=settings-Btn] span {
background-image: url('../images/menu/settings.png');
}

#stats-Btn span {
[id$=stats-Btn] span {
background-image: url('../images/menu/stats.png');
}

#infobox-Btn span {
[id$=infobox-Btn] span {
background-image: url('../images/menu/info.png');
}

#unit-Btn span {
[id$=unit-Btn] span {
background-image: url('../images/menu/units.png');
}

#negotiation-Btn span {
[id$=negotiation-Btn] span {
background-image: url('../images/menu/negotation.png');
}

#kits-Btn span {
[id$=kits-Btn] span {
background-image: url('../images/menu/kits.png');
}

#alerts-Btn span {
[id$=alerts-Btn] span {
background-image: url('../images/menu/alerts.png');
}

#notice-Btn span {
[id$=notice-Btn] span {
background-image: url('../images/menu/notices.png');
}

#bluegalaxy-Btn span {
[id$=bluegalaxy-Btn] span {
background-image: url('../images/menu/BlueGalaxy.png');
}

#unitsGex-Btn span {
[id$=unitsGex-Btn] span {
background-image: url('../images/menu/gex.png');
}

#gildfight-Btn span {
[id$=gildfight-Btn] span {
background-image: url('../images/menu/gbg.png');
}

#investment-Btn span {
[id$=investment-Btn] span {
background-image: url('../images/menu/investhistory.png');
}

#guildmemberstat-Btn span {
[id$=guildmemberstat-Btn] span {
background-image: url('../images/menu/guildmemberstat.png');
}

Expand Down Expand Up @@ -1221,8 +1221,8 @@ FP-Bar */
.jq-toast-single h2 { font-family: arial, sans-serif; font-size: 14px; margin: 0 0 7px; background: none; color: inherit; line-height: inherit; letter-spacing: normal; }
.jq-toast-single a { color: #eee; text-decoration: none; font-weight: bold; border-bottom: 1px solid white; padding-bottom: 3px; font-size: 12px; }

.jq-toast-single ul { margin: 0 0 0 15px; background: none; padding:0; }
.jq-toast-single ul li { list-style-type: disc !important; line-height: 17px; background: none; margin: 0; padding: 0; letter-spacing: normal; }
.jq-toast-single ul { margin: 0; background: none; padding:0;list-style: none }
.jq-toast-single ul li { line-height: 17px; background: none; margin: 0; padding: 0; letter-spacing: normal; }

.close-jq-toast-single { position: absolute; top: 3px; right: 7px; font-size: 14px; cursor: pointer; }

Expand Down
13 changes: 10 additions & 3 deletions js/web/_i18n/de.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,10 @@
"Boxes.CityMap.HighlightOldBuildings": "Alte Gebäude hervorheben",
"Boxes.CityMap.NormalPerspecitve": "Normal",
"Boxes.CityMap.ShowSubmitBox": "zeige Übermittlungs Box",
"Boxes.CityMap.SubmitError": "Deine Stadtdaten konnten nicht an den Server gesendet werden. Bitte melden Sie diesen Fehler direkt an ",
"Boxes.CityMap.SubmitErrorHeader": "Ein Fehler ist aufgetreten",
"Boxes.CityMap.SubmitSuccess": "Die Daten wurden übermittelt... Geh nun zu ",
"Boxes.CityMap.SubmitSuccessHeader": "Übermittelt",
"Boxes.CityMap.TitleSend": "Daten übermitteln",
"Boxes.CityMap.ToastBodyCopyData": "CityMap Daten wurden in die Zwischenablage kopiert",
"Boxes.CityMap.ToastHeadCopyData": "Kopiert",
Expand Down Expand Up @@ -251,6 +254,7 @@
"Boxes.GuildMemberStat.GuildSupportBuildings": "Gilden untestützende Gebäude",
"Boxes.GuildMemberStat.GuildTreasuryNotification": "Rufe in der Gildenübersicht den Tab Kasse auf, um die Gildengüter zu aktualisieren.",
"Boxes.GuildMemberStat.Inactivity": "Inaktivität",
"Boxes.GuildMemberStat.Instantly": "sofort",
"Boxes.GuildMemberStat.LastUpdate": "letzte Aktualisierung",
"Boxes.GuildMemberStat.Level": "Stufe",
"Boxes.GuildMemberStat.Member": "Mitglied",
Expand Down Expand Up @@ -795,11 +799,12 @@
"Settings.Entry.GlobalSend": "Übermittlungen",
"Settings.Entry.Help": "Hilfe",
"Settings.Entry.InfoboxEntryCount": "Infobox Nachrichtenanzahl",
"Settings.Entry.MenuContent": "Menü Inhalt",
"Settings.Entry.MenuLength": "Menü Länge",
"Settings.Entry.NotificationsPosition": "Benachrichtiguns- position",
"Settings.Entry.NotificationsStack": "???",
"Settings.Entry.ResetBoxPositions": "Boxen Koordinaten",
"Settings.Entry.SelectedMenu": "Menü wechseln",
"Settings.Entry.SelectedMenu": "Menü Position",
"Settings.Entry.SendGEXInfo": "GEX Stände",
"Settings.Entry.SendGildMemberLGInfo": "LG-Info der Gildenmitglieder",
"Settings.Entry.ShowBlueGalaxyHelper": "Blaue Galaxie",
Expand Down Expand Up @@ -831,7 +836,9 @@
"Settings.Help.Website": "Website: Informationen zum Helfer und seinen Funktionen, sowie weitere Features.",
"Settings.InfoboxEntryCount.Desc": "Wie viele Nachrichten soll die Infobox anzeigen und speichern?<br>Leer oder \"0\" bedeutet unendlich.",
"Settings.InfoboxEntryCount.Title": "Infobox Anzahl an Nachrichten",
"Settings.MenuLength.Desc": "Wie viele Elemente soll das Menü hoch sein?<br> Leer oder \"0\" ist automatische Höhe.",
"Settings.MenuContent.Desc": "Welche Buttons willst du im Menü haben?<br>Grün: Button wird angezeigt. Rot: Button wird nicht angezeigt.",
"Settings.MenuContent.Title": "Menü Inhalt",
"Settings.MenuLength.Desc": "Wie viele Elemente soll das Menü hoch oder breit sein?<br> Leer oder \"0\" ist automatische Höhe.<br>Gilt nicht für die \"Menü Box\".",
"Settings.MenuLength.Title": "Menü Länge",
"Settings.NotificationPosition.ToastTestBody": "Ab sofort erscheinen deine Benachrichtigungen an dieser Position.<br>Bevor du die nächste Position testest, warte bis diese Meldung verschwunden ist.",
"Settings.NotificationPosition.ToastTestHeader": "Benachrichtigungs Vorschau",
Expand All @@ -843,7 +850,7 @@
"Settings.ResetBoxPositions.Desc": "Sollen alle Box Koordinaten zurückgesetzt werden?",
"Settings.ResetBoxPositions.Title": "Box Koordinaten",
"Settings.SelectedMenu.Desc": "Wähle dein bevorzugtes Menü aus der Drop-Down-Liste (das Spiel wird automatisch neu geladen)",
"Settings.SelectedMenu.Title": "Menü wechseln",
"Settings.SelectedMenu.Title": "Menü Position wählen",
"Settings.SendGEXInfo.Desc": "Übermittelt beim Klicken in der GEX auf Platzierungen oder Rangliste die Daten",
"Settings.SendGEXInfo.Title": "GEX Auswertungen",
"Settings.SendGildMemberLGInfo.Desc": "Beim Besuchen von anderen Gildenmitgliedern werden sämtliche LG Daten an foe-rechner.de geschickt, wenn Global aktiviert.",
Expand Down
11 changes: 9 additions & 2 deletions js/web/_i18n/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,10 @@
"Boxes.CityMap.HighlightOldBuildings": "Highlight lower Era buildings",
"Boxes.CityMap.NormalPerspecitve": "Top View",
"Boxes.CityMap.ShowSubmitBox": "Show Submit box",
"Boxes.CityMap.SubmitSuccess": "Data was successfully UPLOADED… Now visit ",
"Boxes.CityMap.SubmitError": "Your city data could not be sent to the server. Please report this error directly to ",
"Boxes.CityMap.SubmitErrorHeader": "Error occurred",
"Boxes.CityMap.SubmitSuccess": "Data was successfully Uploaded... Now visit ",
"Boxes.CityMap.SubmitSuccessHeader": "Transmitted",
"Boxes.CityMap.TitleSend": "Submit Data",
"Boxes.CityMap.ToastBodyCopyData": "Your city data is now on the clipboard",
"Boxes.CityMap.ToastHeadCopyData": "Copied!",
Expand Down Expand Up @@ -251,6 +254,7 @@
"Boxes.GuildMemberStat.GuildSupportBuildings": "Guild supporting buildings",
"Boxes.GuildMemberStat.GuildTreasuryNotification": "Visit tab Treasury in the guild profile to update treasury goods of your guild.",
"Boxes.GuildMemberStat.Inactivity": "Inactivity",
"Boxes.GuildMemberStat.Instantly": "instantly",
"Boxes.GuildMemberStat.LastUpdate": "last update",
"Boxes.GuildMemberStat.Level": "Level",
"Boxes.GuildMemberStat.Member": "Member",
Expand Down Expand Up @@ -795,11 +799,12 @@
"Settings.Entry.GlobalSend": "Upload",
"Settings.Entry.Help": "Help",
"Settings.Entry.InfoboxEntryCount": "Infobox Entry Count",
"Settings.Entry.MenuContent": "Menu Content",
"Settings.Entry.MenuLength": "Menu Length",
"Settings.Entry.NotificationsPosition": "Notify position",
"Settings.Entry.NotificationsStack": "Notify stacks",
"Settings.Entry.ResetBoxPositions": "Box Coordinates",
"Settings.Entry.SelectedMenu": "Change Menu",
"Settings.Entry.SelectedMenu": "Menu position",
"Settings.Entry.SendGEXInfo": "Upload GE info",
"Settings.Entry.SendGildMemberLGInfo": "Upload Guild member's GB info",
"Settings.Entry.ShowBlueGalaxyHelper": "Blue Galaxy",
Expand Down Expand Up @@ -831,6 +836,8 @@
"Settings.Help.Website": "Website: information and documentation on the extension and it's features.",
"Settings.InfoboxEntryCount.Desc": "How many elements should the Infobox display and save?<br>Empty or \"0\" means infinite.",
"Settings.InfoboxEntryCount.Title": "Infobox Entry Count",
"Settings.MenuContent.Desc": "Which buttons do you want in the menu?<br>Green: show button. Red: don't show button.",
"Settings.MenuContent.Title": "Menu Content",
"Settings.MenuLength.Desc": "How many elements high should the menu be?<br>Empty or \"0\" means automatic height.",
"Settings.MenuLength.Title": "Menu Length",
"Settings.NotificationPosition.ToastTestBody": "This is the position you have chosen.<br>Before you test the next position, wait until this message disappears.",
Expand Down
12 changes: 9 additions & 3 deletions js/web/_i18n/fr.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"API.GEXChampionship": "Le classement de l'EG a été mis à jour",
"API.GEXPlayer": "Le classement des contributions en Expédition de Guilde (EG) a été mis à jour",
"API.LGGildMember": "Les informations à propos des GM de __player__ ont été mises à jour",
"API.LGGildMember": "Les informations des GM de __player__ ont été mises à jour",
"API.UpdateSuccess": "Mise à jour effectuée avec succès !",
"Boxes.Alerts.Form.Antiques.Auction": "Enchère",
"Boxes.Alerts.Form.Antiques.Cooldown": "Délai de l'enchère",
Expand Down Expand Up @@ -122,7 +122,10 @@
"Boxes.CityMap.HighlightOldBuildings": "Montrer les bâtiments des anciennes ères",
"Boxes.CityMap.NormalPerspecitve": "Standard",
"Boxes.CityMap.ShowSubmitBox": "Montrer la fenêtre d'envoi",
"Boxes.CityMap.SubmitSuccess": "Données transférées avec succès… Maintenant visitez ",
"Boxes.CityMap.SubmitError": "Les données de votre ville n'ont pas pu être envoyées au serveur. Veuillez signaler cette erreur directement à ",
"Boxes.CityMap.SubmitErrorHeader": "Une erreur est survenue",
"Boxes.CityMap.SubmitSuccess": "Données envoyées avec succès… Maintenant visitez ",
"Boxes.CityMap.SubmitSuccessHeader": "Transmis",
"Boxes.CityMap.TitleSend": "Envoyer les données",
"Boxes.CityMap.ToastBodyCopyData": "Les données de votre cité sont maintenant dans le presse-papier",
"Boxes.CityMap.ToastHeadCopyData": "Copié !",
Expand Down Expand Up @@ -795,11 +798,12 @@
"Settings.Entry.GlobalSend": "Transferts",
"Settings.Entry.Help": "Aide",
"Settings.Entry.InfoboxEntryCount": "Nombre d'entrées d'infos techniques",
"Settings.Entry.MenuContent": "Contenu du menu",
"Settings.Entry.MenuLength": "Menu",
"Settings.Entry.NotificationsPosition": "Emplacement de la notification",
"Settings.Entry.NotificationsStack": "Notifications multiples",
"Settings.Entry.ResetBoxPositions": "Fenêtres",
"Settings.Entry.SelectedMenu": "Modifier le menu",
"Settings.Entry.SelectedMenu": "Position du menu",
"Settings.Entry.SendGEXInfo": "Envoi des infos de l'EG",
"Settings.Entry.SendGildMemberLGInfo": "Envoi des infos des GM de la guilde",
"Settings.Entry.ShowBlueGalaxyHelper": "Galaxie Bleue",
Expand Down Expand Up @@ -831,6 +835,8 @@
"Settings.Help.Website": "Site Web : informations sur l'extension et documentation de ses fonctionnalités.",
"Settings.InfoboxEntryCount.Desc": "Combien d'éléments la fenêtre d'info techniques doit-elle afficher et enregistrer ? <br> Vide ou \"0\" signifie infini.",
"Settings.InfoboxEntryCount.Title": "Nb d'infos techniques",
"Settings.MenuContent.Desc": "Quels boutons voulez-vous dans le menu ?<br>Vert : afficher le bouton. Rouge : masquer le bouton.",
"Settings.MenuContent.Title": "Contenu du menu",
"Settings.MenuLength.Desc": "Combien d'éléments le menu devrait-il avoir ?<br> Vide ou \"0\" pour une hauteur automatique.",
"Settings.MenuLength.Title": "Hauteur du menu",
"Settings.NotificationPosition.ToastTestBody": "C'est la position que vous avez choisie. <br> Avant de tester la position suivante, attendez que ce message disparaisse.",
Expand Down
Loading

0 comments on commit e08ac6d

Please sign in to comment.