Skip to content

Commit

Permalink
adding new reference section
Browse files Browse the repository at this point in the history
new reference section to include SRD contents
  • Loading branch information
dangeratio committed May 1, 2017
1 parent 562828e commit 7bde16b
Show file tree
Hide file tree
Showing 29 changed files with 595 additions and 59 deletions.
5 changes: 3 additions & 2 deletions .gitignore
@@ -1,5 +1,6 @@
debug.html
/old/*
/web/*
changelog.html
.DS_Store
/old/*
/web/*
/offline/*
44 changes: 34 additions & 10 deletions css/defaults.css
Expand Up @@ -20,6 +20,12 @@ body
color: rgba(0,0,0,.6);
}

#page, #menu {
/*margin-left: 15px;*/
padding-left: 15px;
/*margin-right: 15px;*/
}

.bgimage {
margin: -10em;
position: fixed;
Expand Down Expand Up @@ -59,6 +65,16 @@ body
filter: alpha(opacity=65);
}

.link-menu-style {
background-color: #5A6668;
float: right !important;
color: white;
}

.link-menu-style:hover {
background-color: grey;
}

.hover-icon-clickarea {
margin-right: 3px;
margin-left: -1px !important;
Expand Down Expand Up @@ -103,7 +119,7 @@ body
font-size: 18px;
line-height: 20px;
height: 40px;
text-color: white;
color: white;
}

.logo-nopad {
Expand All @@ -126,7 +142,17 @@ body
overflow-y: scroll;
color: #2b3e50;
}


.rightview-srd {
height: 479px;
width: auto;
opacity: 0.65 !important;
filter: alpha(opacity=65);
background-color:white;
overflow-y: scroll;
color: #2b3e50;
}

.rightview-current-display {
padding: 10px 10px;
}
Expand All @@ -139,18 +165,23 @@ body
@media screen and (-webkit-min-device-pixel-ratio:0)
and (min-resolution:.001dpcm) {
.rightview {height: 436px !important;}
.rightview-srd {height: 456px !important;}
}

/* Chrome 22-28 */
@media screen and(-webkit-min-device-pixel-ratio:0) {
.rightview {-chrome-:only(;
height: 436px !important;
);}
.rightview-srd {-chrome-:only(;
height: 456px !important;
);}
}

/* saf3+, chrome1+ */
@media screen and (-webkit-min-device-pixel-ratio:0) {
.rightview {height: 436px !important;}
.rightview {height: 436px !important;}
.rightview {height: 456px !important;}
}

.text-less-muted {
Expand All @@ -173,13 +204,6 @@ body
color: #DF691A;
}

#page, #menu {
/*margin-left: 15px;*/
padding-left: 15px;
/*margin-right: 15px;*/
}


/* Roll Classes */

.roll-title {
Expand Down
53 changes: 42 additions & 11 deletions index.html
Expand Up @@ -12,15 +12,23 @@
<meta name="viewport" content="width=device-width, initial-scale=1">

<link rel="stylesheet" href="css/defaults.css" type="text/css" media="all" />
<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu:regular,bold&subset=Latin">


<!-- Online -->
<link rel="stylesheet" href="https://bootswatch.com/superhero/bootstrap.min.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap-theme.min.css" integrity="sha384-fLW2N01lMqjakBkx3l/M9EahuwpSfeNvV63J5ezn3uZzapT0u7EYsXMjQV+0En5r" crossorigin="anonymous">

<!-- Offline -->
<!-- <link rel="stylesheet" href="offline/bootstrap.min.css"> -->
<!-- <link rel="stylesheet" href="offline/bootstrap-theme.min.css" integrity="sha384-fLW2N01lMqjakBkx3l/M9EahuwpSfeNvV63J5ezn3uZzapT0u7EYsXMjQV+0En5r" crossorigin="anonymous"> -->


<!-- <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu:regular,bold&subset=Latin"> -->
<!-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">-->
<!-- <link rel="stylesheet" href="web/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous"> -->
<!-- <link rel="stylesheet" href="web/bootstrap-theme.min.css" integrity="sha384-fLW2N01lMqjakBkx3l/M9EahuwpSfeNvV63J5ezn3uZzapT0u7EYsXMjQV+0En5r" crossorigin="anonymous"> -->

<script src="js/menu.js"></script>
<!-- <script src="js/menu.js"></script>
<script src="js/dungeons.js"></script>
<script src="js/factions.js"></script>
<script src="js/food.js"></script>
Expand All @@ -32,7 +40,22 @@
<script src="js/settlements.js"></script>
<script src="js/vehicles.js"></script>
<script src="js/wilderness.js"></script>
<script src="js/subrolls.js"></script>
<script src="js/subrolls.js"></script> -->
<script src="js/roll_menu.js"></script>
<script src="js/roll_dungeons.js"></script>
<script src="js/roll_factions.js"></script>
<script src="js/roll_food.js"></script>
<script src="js/roll_magic.js"></script>
<script src="js/roll_monsters.js"></script>
<script src="js/roll_npcs.js"></script>
<script src="js/roll_objects.js"></script>
<script src="js/roll_plots.js"></script>
<script src="js/roll_settlements.js"></script>
<script src="js/roll_vehicles.js"></script>
<script src="js/roll_wilderness.js"></script>
<script src="js/roll_subrolls.js"></script>
<script src="js/roll_accordion.js"></script>


</head>
<body>
Expand All @@ -47,9 +70,12 @@
</div>
<div id="menu-container" class="row">

<div id="menu" class="col-md-12 btn-group">
<div id="menu" class="col-md-11 btn-group">
<a href="#" class='menuitem-style btn hover-icon-clickarea' aria-hidden='true'><span class="glyphicon glyphicon-hand-up hover-icon"></span></a>
</div>

<div id="menu" class="col-md-1 btn-group">
<a href="#" class='link-menu-style btn srd-button' aria-hidden='true'>Reference</a>
</div>

</div>
Expand Down Expand Up @@ -101,13 +127,12 @@
<button class="btn bottom-btn" type="button" id="filter-button"><span class='glyphicon glyphicon-search'></span></button>
</span>
</div>
<a class="button btn bottom-btn" id="roll" value="Roll" style="width:100%; display:none;"><span class='glyphicon glyphicon-retweet'></span> Re-Roll</a>
</div>
<div id="rightbuttons" class="col-md-4">
<a class="bottom-nav current-copy-button btn bottom-btn" id="copy-current-button" value="Copy To Clipboard" style="width:100%;"><span class='glyphicon glyphicon-duplicate'></span> Copy Current Roll</a>
</div>
<div id="rightbuttons" class="col-md-4">
<a class="bottom-nav history-copy-button btn bottom-btn" id="copy-history-button" value="Copy To Clipboard" style="width:100%;"><span class='glyphicon glyphicon-duplicate'></span> Copy History</a>
<a class="bottom-nav history-copy-button btn bottom-btn" id="copy-history-button" value="Copy To Clipboard" style="width:100%;"><span class='glyphicon glyphicon-duplicate'></span> Copy Item</a>
</div>
</div>

Expand All @@ -125,11 +150,17 @@

</body>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
<!-- <script src="web/jquery.min.js"></script> -->
<script type="text/javascript" src="js/autorolltables.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>
<!-- <script src="web/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script> -->

<!-- Online -->
<!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> -->
<!-- <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script> -->

<!-- Offline -->
<script src="offline/jquery.min.js"></script>
<script src="offline/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>


<script type="text/javascript" src="js/rolltables.js"></script>

<!-- Start of StatCounter Code for Default Guide -->
<script type="text/javascript">
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
66 changes: 30 additions & 36 deletions js/autorolltables.js → js/rolltables.js
Expand Up @@ -5,12 +5,7 @@



//// TODO

//// Need to make copy history work...currently broken.



// initial variables

var current;
var side_obj;
Expand All @@ -19,6 +14,30 @@ var obj_history_display;
var mouseover_on = true;
var delete_enabled = false;


function init() {

// load the menu
loadmenu();

// default to dungeons table
loadleftdisplay("All");

// check querystring for menuhover
menuhovercheck();

//hide initially hidden
$('#rightview-history').hide();
$('#rightview-current').hide();
$('#rightview-history-display').hide();
$("#success-alert").hide();
$("#fail-alert").hide();
$("#collapse-history-tab").hide();
$("#expand-history-tab").hide();
$("#clear-history-roll-tab").hide();

}

function log(obj) {
console.log(obj);
}
Expand Down Expand Up @@ -249,39 +268,11 @@ function menuhovercheck(){
function loadmenu() {
menu = top.menu;
for(i=0;i<menu.length;i++){
addmenuitem(menu[i].title);
var item = menu[i].title;
$("#menu").append("<a href='#' class='menuitem btn' id='" + item + "'>" + item + "</a>")
}
}

function addmenuitem(item) {
$("#menu").append("<a href='#' class='menuitem btn' id='" + item + "'>" + item + "</a>")
}

// initial load of select list
function init() {

// load the menu
loadmenu();

// default to dungeons table
loadleftdisplay("All");

// check querystring for menuhover
menuhovercheck();

//hide initially hidden
$('#rightview-history').hide();
$('#rightview-current').hide();
$('#rightview-history-display').hide();
$("#success-alert").hide();
$("#fail-alert").hide();
$("#collapse-history-tab").hide();
$("#expand-history-tab").hide();
$("#clear-history-roll-tab").hide();

}


// regex for identifying sub-rolls
var inline_roll_match = /\([dD][\d]{1,3}\) ?:/;
var indicator_match = /\<\*>.? ? ?([^\d]*)/;
Expand Down Expand Up @@ -852,6 +843,7 @@ function showalert(alert){


// events

$('body').on('mouseenter', '.delete-history-item', function() { delete_enabled = true; });
$('body').on('mouseleave', '.delete-history-item', function() { delete_enabled = false; });
$('body').on('click', '.list-item', function() { selectitem($(this)); perform_roll(); });
Expand All @@ -870,6 +862,8 @@ $('body').on('change', '#filter', function() { filter(); });
$('body').on('click', '#filter-button', function() { filter(); });
$('body').on('click', '#filter-clear', function() { $('#filter').val(""); filter(); });

$('body').on('click', '.srd-button', function() { window.location.replace("reference.html"); } );

$('body').on('click', '.delete-history-item', function() {
$(this).parent().parent().next().remove();
$(this).parent().parent().remove();
Expand Down

0 comments on commit 7bde16b

Please sign in to comment.