Merge pull request #32 from AresMUSH/dev

Beta 32

.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.2.7
+  - 2.5.1
 before_install:
   - gem install bundler
   - cp -r install/game.distr game

Gemfile

@@ -17,17 +17,14 @@ gem 'dentaku', '~>3.1'
 gem 'json', '~> 2.1.0'
 gem 'redcarpet', '~> 3.4.0'
 gem 'html2markdown', '0.0.3'
-gem 'sinatra', '~> 2.0.1'
+gem 'sinatra', '~> 2.0.4'
 gem 'thin', '~> 1.7.2'
-gem 'sinatra-reloader', '~> 1.0'
-gem 'sinatra-flash', '~> 0.3.0'
 gem 'sinatra-cross_origin', '~>0.4.0'
 gem 'aws-sdk-s3', '~> 1.8.2'
-gem 'redis-rack', '~> 2.0.4'
 gem 'rubyzip',  '~> 1.2.2'
 gem 'diff-lcs', '~> 1.3'
 gem 'diffy', '~> 3.2.0'
 gem 'nokogiri', '~> 1.8.2'
-gem 'sass', '~>3.5.5'
+gem 'sassc', '~> 2.0.0'
 gem 'htmlentities', '~>4.3.4'
 gem 'handlebars', '~>0.8.0'

Gemfile.lock

@@ -20,7 +20,6 @@ GEM
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.0.2)
-    backports (3.11.1)
     bcrypt (3.1.11)
     concurrent-ruby (1.0.5)
     daemons (1.2.6)
@@ -32,7 +31,7 @@ GEM
       http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
     eventmachine (1.2.5)
-    ffi (1.9.23)
+    ffi (1.9.25)
     handlebars (0.8.0)
       handlebars-source (~> 4.0.5)
       therubyracer (~> 0.12.1)
@@ -50,8 +49,7 @@ GEM
     log4r (1.1.10)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    multi_json (1.13.1)
-    mustermann (1.0.2)
+    mustermann (1.0.3)
     nest (3.1.1)
       redic
     nokogiri (1.8.2)
@@ -60,22 +58,13 @@ GEM
       nest (~> 3)
       redic (~> 1.5.0)
       stal
-    rack (2.0.4)
-    rack-protection (2.0.1)
+    rack (2.0.6)
+    rack-protection (2.0.4)
       rack
     rake (12.3.0)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
     redcarpet (3.4.0)
     redic (1.5.0)
       hiredis
-    redis (4.0.1)
-    redis-rack (2.0.4)
-      rack (>= 1.5, < 3)
-      redis-store (>= 1.2, < 2)
-    redis-store (1.4.1)
-      redis (>= 2.2, < 5)
     ref (2.0.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -91,28 +80,15 @@ GEM
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
     rubyzip (1.2.2)
-    sass (3.5.5)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sinatra (2.0.1)
+    sassc (2.0.0)
+      ffi (~> 1.9.6)
+      rake
+    sinatra (2.0.4)
       mustermann (~> 1.0)
       rack (~> 2.0)
-      rack-protection (= 2.0.1)
+      rack-protection (= 2.0.4)
       tilt (~> 2.0)
-    sinatra-contrib (2.0.1)
-      backports (>= 2.0)
-      multi_json
-      mustermann (~> 1.0)
-      rack-protection (= 2.0.1)
-      sinatra (= 2.0.1)
-      tilt (>= 1.3, < 3)
     sinatra-cross_origin (0.4.0)
-    sinatra-flash (0.3.0)
-      sinatra (>= 1.0.0)
-    sinatra-reloader (1.0)
-      sinatra-contrib
     stal (0.3.0)
       redic (~> 1.5)
     therubyracer (0.12.3)
@@ -152,16 +128,13 @@ DEPENDENCIES
   ohm (~> 3.1.1)
   rake (~> 12.3)
   redcarpet (~> 3.4.0)
-  redis-rack (~> 2.0.4)
   rspec (~> 3.7.0)
   rubyzip (~> 1.2.2)
-  sass (~> 3.5.5)
-  sinatra (~> 2.0.1)
+  sassc (~> 2.0.0)
+  sinatra (~> 2.0.4)
   sinatra-cross_origin (~> 0.4.0)
-  sinatra-flash (~> 0.3.0)
-  sinatra-reloader (~> 1.0)
   thin (~> 1.7.2)
   timezone (~> 1.2.10)
 
 BUNDLED WITH
-   1.16.1
+   1.16.3

bin/setup_server

@@ -118,7 +118,7 @@ if [ -e /etc/rc.local ]
 then
     sed -i -e '$i \/root/onboot.sh &\n' /etc/rc.local
 else
-    printf '%s\n' '#!/bin/bash' '/root/onboot.sh' 'exit 0' | sudo tee -a /etc/rc.local
+    printf '%s\n' '#!/bin/bash' '/root/onboot.sh &\n' 'exit 0' | sudo tee -a /etc/rc.local
 fi
 
 sudo chmod +x /etc/rc.local

engine/aresmush.rb

@@ -28,11 +28,10 @@
 
 require 'sinatra/base'
 require 'sinatra/cross_origin'
-require 'sinatra/reloader'
 require 'thin'
 require 'rubygems'
 require 'zip'
-require 'sass'
+require 'sassc'
 
 module AresMUSH
 

engine/styles/ares.scss

@@ -144,7 +144,7 @@ a:focus{
 }
 
 .navbar {
-  z-index: 9999;
+  z-index: 2000;
 }
 
 .navbar-collapse.in {
@@ -354,6 +354,10 @@ mark {
     padding: 10px;
 }
 
+.modal {
+  z-index: 3000;
+}
+
 /* -------------------------
 GOOGLE SEARCH OVERRIDES
 ------------------------- */
@@ -487,6 +491,9 @@ SIDEBAR
     text-align: center;
     font-size: 1.5em;
     color: $faded-text-color;
+    padding: 0px;
+    margin-top: 20px;
+    margin-bottom: 10px;
 }
 
 .search-bar {
@@ -956,7 +963,7 @@ input[type='file'] {
 
 /*.char-scene-list li:before { content: "\2666  "; }*/
 
-@media (max-width:800px)  { 
+@media (max-width:992px)  { 
 
 .profile-wrap { 
     padding: 10px; 
@@ -981,6 +988,31 @@ input[type='file'] {
     padding-right: 0px;
 }
 
+
+.body-row 
+{
+  display: flex;
+  flex-direction: column;
+
+}
+
+.left-sidebar {
+  order: 2;
+}
+
+.right-sidebar {
+  order: 2;
+}
+
+.left-body {
+  order: 1;
+}
+
+.right-body {
+  order: 1;
+}
+
+
 }
 
 @import "custom_style";

install/game.distr/config/demographics.yml

@@ -107,3 +107,4 @@ demographics:
     width: 20
     title: Position
     value: Position
+  private_properties: []

install/game.distr/config/website.yml

@@ -1,20 +1,127 @@
 ---
 website:
+  allow_html_in_markdown: true
+  character_gallery_group: Faction
+  character_gallery_subgroup: Position
+  left_sidebar: false
+  max_upload_size_kb: 5000
+  portal_requires_registration: false
+  restricted_pages:
+  - home
   sitemap_update_cron:
     hour:
     - 2
     minute:
     - 17
-  allow_html_in_markdown: true
-  max_upload_size_kb: 5000
-  character_gallery_group: Faction
-  character_gallery_subgroup: Position
-  portal_requires_registration: false
+  top_navbar:
+  - menu:
+    - page: chargen
+      title: Create a Character
+    - page: roster
+      title: Pre-Made Characters
+    - page: who
+      title: Who's Online
+    - divider: true
+    - page: scenes-live
+      title: Active Scenes
+    - page: scene-create
+      title: Start New Scene
+    - divider: true
+    - page: play
+      title: Play via Web Client
+    title: Play
+  - title: Story
+    menu:
+    - page: characters
+      title: Characters
+    - page: scenes
+      title: Scenes
+    - page: plots
+      title: Plots
+  - title: Community
+    menu:
+    - page: chat
+      title: Chat
+    - page: forum
+      title: Forum
+    - page: events
+      title: Events
+    - page: players
+      title: Players
+  - title: Directory
+    menu:
+    - page: characters
+      title: Characters
+    - page: census
+      title: Census
+    - page: actors
+      title: Actors
+    - page: roster
+      title: Roster
+    - divider: true
+    - page: scenes
+      title: Scenes
+    - page: plots
+      title: Plots
+    - page: locations
+      title: Locations
+    - page: combats
+      title: Combats
+    - divider: true
+    - page: files
+      title: Files
+  - title: FS3
+    menu:
+    - page: fs3skills-abilities
+      title: Abilities List
+    - page: fs3combat-gear
+      title: Gear List
+    - divider: true
+    - target: blank
+      title: Player's Guide <i class="fa fa-external-link-alt" aria-hidden="true">
+      url: http://aresmush.com/fs3/fs3-3
+    - target: blank
+      title: Combat Quick Reference <i class="fa fa-external-link-alt" aria-hidden="true">
+      url: http://aresmush.com/fs3/fs3-3/combat-quickref
+    - target: blank
+      title: Interactive Combat Walkthrough <i class="fa fa-external-link-alt" aria-hidden="true">
+      url: http://aresmush.com/fs3/fs3-3/combat-walkthrough
+  - title: Wiki
+    menu:
+    - page: wiki
+      title: Home
+    - divider: true
+    - page: wiki-create
+      title: Create New Page
+    - page: wiki-all
+      title: All Pages
+    - page: search-wiki
+      title: Search Wiki
+    - page: wiki-tags
+      title: Tags
+    - page: recent-changes
+      title: Recent Changes
+    - divider: true
+    - page: files
+      title: Files
+    - page: help-topic
+      id: markdown
+      title: Markdown Reference
+  - title: Help
+    menu:
+    - page: help
+      title: Game Help
+    - page: search-wiki
+      title: Search
+    - page: help-topic
+      id: markdown
+      title: Markdown Reference
+    - divider: true
+    - target: blank
+      title: MUSH 101 Tutorial <i class="fa fa-external-link-alt" aria-hidden="true">
+      url: https://aresmush.com/mush-101/
+    - page: jobs
+      title: Requests
   website_code_path: "/home/ares/ares-webportal"
-  left_sidebar: false
-  wiki_nav:
-  - Home
   wiki_aliases:
     main: home
-  restricted_pages:
-  - home