From 34e41a6553b3afdf4ec01fd51f3e52becf90758e Mon Sep 17 00:00:00 2001 From: exodus4d Date: Wed, 20 May 2015 20:32:15 +0200 Subject: [PATCH] alliance/corp maps. build process optimization, new/edit map dialog fixes --- .htaccess | 33 +- .idea/dataSources.xml | 4 +- .idea/jsLibraryMappings.xml | 6 +- .idea/libraries/compass_library.xml | 5 +- .idea/pathfinder.iml | 26 +- .idea/watcherTasks.xml | 19 +- .idea/workspace.xml | 1982 ++++++++++++----- app/config.cfg | 2 +- app/main/controller/CcpApiController.php | 35 +- app/main/controller/MapController.php | 2 +- app/main/controller/api/Map.php | 27 +- app/main/controller/api/User.php | 273 ++- app/main/controller/appcontroller.php | 2 +- app/main/exception/BaseException.php | 3 +- app/main/model/AllianceMapModel.php | 27 + app/main/model/AllianceModel.php | 57 + app/main/model/CharacterModel.php | 73 +- app/main/model/CorporationMapModel.php | 27 + app/main/model/CorporationModel.php | 57 + app/main/model/MapModel.php | 79 +- app/main/model/UserCharacterModel.php | 35 +- app/main/model/UserModel.php | 46 +- app/routes.cfg | 4 +- config.rb | 13 +- js/app.js | 23 +- js/app/client.js | 32 - js/app/landingpage.js | 5 +- js/app/main.js | 6 +- js/app/map/map.js | 4 - js/app/module_map.js | 30 +- js/app/notification.js | 3 +- js/app/page.js | 22 +- js/app/ui/dialog/manual.js | 10 +- js/app/ui/dialog/map.js | 144 -- js/app/ui/dialog/map_settings.js | 196 ++ js/app/ui/dialog/settings.js | 346 ++- js/app/ui/dialog/shutdown.js | 80 +- js/app/ui/system_killboard.js | 1 - js/app/util.js | 165 +- js/lib/bootbox.min.js | 2 +- js/lib/bootstrap-confirmation.js | 249 +++ js/lib/datatables/dataTables.bootstrap.js | 4 +- js/lib/datatables/jquery.dataTables.min.js | 298 +-- js/lib/jquery-1.11.2.min.js | 1 + js/lib/jquery-1.11.3.min.js | 5 + js/lib/jquery.min.map | 1 + js/lib/pnotify/pnotify.buttons.js | 132 -- js/lib/pnotify/pnotify.confirm.js | 152 -- js/lib/pnotify/pnotify.history.js | 189 -- js/lib/pnotify/pnotify.reference.js | 132 -- node_modules/.bin/build.js | 191 +- public/css/pathfinder.css | 8 +- public/fonts/fontawesome-webfont.woff2 | Bin 0 -> 56780 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes public/fonts/oxygen-bold-webfont.woff2 | Bin 0 -> 20040 bytes public/fonts/oxygen-light-webfont.woff2 | Bin 0 -> 18508 bytes public/fonts/oxygen-regular-webfont.woff2 | Bin 0 -> 19772 bytes public/templates/dialog/map.html | 71 +- public/templates/dialog/map_manual.html | 43 +- public/templates/dialog/settings.html | 97 +- public/templates/form/character_panel.html | 13 + public/templates/form/map_settings.html | 56 + public/templates/form/message.html | 2 +- public/templates/view/index.html | 42 +- public/templates/view/parts/landingpage.html | 20 +- sass/_colors.scss | 5 + sass/_variables.scss | 24 +- sass/bootstrap/_forms.scss | 4 +- sass/bootstrap/_glyphicons.scss | 7 +- sass/bootstrap/_modals.scss | 2 +- sass/bootstrap/_navbar.scss | 7 +- sass/layout/_dialogs.scss | 16 +- sass/layout/_forms.scss | 13 + sass/layout/_landing.scss | 4 +- sass/layout/_main.scss | 66 +- sass/layout/_map.scss | 2 +- .../_bootstrap-image-gallery.scss | 2 +- sass/library/fontawesome/_path.scss | 1 + sass/pathfinder.scss | 2 + sass/smartadmin/_main.scss | 107 +- 80 files changed, 3692 insertions(+), 2182 deletions(-) create mode 100644 app/main/model/AllianceMapModel.php create mode 100644 app/main/model/AllianceModel.php create mode 100644 app/main/model/CorporationMapModel.php create mode 100644 app/main/model/CorporationModel.php delete mode 100644 js/app/client.js delete mode 100644 js/app/ui/dialog/map.js create mode 100644 js/app/ui/dialog/map_settings.js create mode 100644 js/lib/bootstrap-confirmation.js create mode 100644 js/lib/jquery-1.11.3.min.js create mode 100644 js/lib/jquery.min.map delete mode 100644 js/lib/pnotify/pnotify.buttons.js delete mode 100644 js/lib/pnotify/pnotify.confirm.js delete mode 100644 js/lib/pnotify/pnotify.history.js delete mode 100644 js/lib/pnotify/pnotify.reference.js create mode 100644 public/fonts/fontawesome-webfont.woff2 create mode 100644 public/fonts/glyphicons-halflings-regular.woff2 create mode 100644 public/fonts/oxygen-bold-webfont.woff2 create mode 100644 public/fonts/oxygen-light-webfont.woff2 create mode 100644 public/fonts/oxygen-regular-webfont.woff2 create mode 100644 public/templates/form/map_settings.html diff --git a/.htaccess b/.htaccess index d17a812d..c0adc257 100644 --- a/.htaccess +++ b/.htaccess @@ -24,4 +24,35 @@ php_value suhosin.request.max_vars 5000 # PHP error logs php_flag log_errors on -php_value error_log "/www/htdocs/w0128162/pathfinder.exodus4d.de/php_errors.html" \ No newline at end of file +php_value error_log "/www/htdocs/w0128162/pathfinder.exodus4d.de/php_errors.html" + +# cache images/pdf docs + + # fonts + + ExpiresActive on + ExpiresDefault "access plus 1 year" + Header append Cache-Control "public" + + + # images/vector graphics + + ExpiresActive on + ExpiresDefault "access plus 1 year" + Header append Cache-Control "public" + FileETag None + Header unset ETag + + + # js/css/source maps + + ExpiresActive on + ExpiresDefault "access plus 1 month" + + + # html templates + + ExpiresActive on + ExpiresDefault "access plus 1 week" + + diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 7e688c30..0bd12d01 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -6,7 +6,6 @@ true com.mysql.jdbc.Driver jdbc:mysql://localhost:3306/pathfinder - root @@ -14,5 +13,4 @@ - - + \ No newline at end of file diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml index c3cecf0a..b38f8e97 100644 --- a/.idea/jsLibraryMappings.xml +++ b/.idea/jsLibraryMappings.xml @@ -1,8 +1,6 @@ - - + - - + \ No newline at end of file diff --git a/.idea/libraries/compass_library.xml b/.idea/libraries/compass_library.xml index a7ea0981..b2add081 100644 --- a/.idea/libraries/compass_library.xml +++ b/.idea/libraries/compass_library.xml @@ -1,6 +1,9 @@ - + + + + \ No newline at end of file diff --git a/.idea/pathfinder.iml b/.idea/pathfinder.iml index 5167a48b..3a4ba981 100644 --- a/.idea/pathfinder.iml +++ b/.idea/pathfinder.iml @@ -1,18 +1,32 @@ - - + + + + + + + + + - + + - - + \ No newline at end of file diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml index 1efaeb8f..746abdc9 100644 --- a/.idea/watcherTasks.xml +++ b/.idea/watcherTasks.xml @@ -2,25 +2,24 @@ - - - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 58aff1e9..0215ef1b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,11 +6,229 @@ + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +