Browse Source

minor cleanups

pull/1/head
parent
commit
c2e9132a1b
14 changed files with 67 additions and 34 deletions
  1. +21
    -3
      chapters/chapters.json
  2. +0
    -2
      donate/.htaccess
  3. BIN
      donate/img/arm-w.png
  4. BIN
      donate/img/arm.png
  5. BIN
      donate/img/camaraderie.png
  6. BIN
      donate/img/dollar.png
  7. BIN
      donate/img/footer-test.png
  8. BIN
      donate/img/footer-test2.png
  9. BIN
      donate/img/give-w.png
  10. BIN
      donate/img/give.png
  11. +45
    -0
      edu/content.json
  12. +1
    -1
      maintenance.php
  13. +0
    -3
      news/story.php
  14. +0
    -25
      res/php/top.php

+ 21
- 3
chapters/chapters.json View File

@ -211,10 +211,18 @@
],
"KS": [
{
"name": "Witchita",
"name": "Kansas City",
"logo": "kcsra-color.png",
"social": {
"twitter": "KansasCitySRA",
"email": "[email protected]"
}
},
{
"name": "Wichita",
"logo": "default",
"social": {
"twitter": "WitchitaSRA",
"twitter": "WichitaSRA",
"email": "[email protected]"
}
}
@ -287,6 +295,14 @@
}
],
"MO": [
{
"name": "Kansas City",
"logo": "kcsra-color.png",
"social": {
"twitter": "KansasCitySRA",
"email": "[email protected]"
}
},
{
"name": "St. Louis",
"logo": "stlouis.jpg",
@ -310,6 +326,8 @@
"name": "New Hampshire",
"logo": "default",
"social": {
"twitter": "newhampshireSRA",
"facebook": "newhampshireSRA",
"email": "[email protected]"
}
}
@ -596,4 +614,4 @@
}
}
]
}
}

+ 0
- 2
donate/.htaccess View File

@ -1,2 +0,0 @@
RewriteCond %{REQUEST_FILENAME}.php -f
RewriteRule !.*\.php$ %{REQUEST_FILENAME}.php [QSA,L]

BIN
donate/img/arm-w.png View File

Before After
Width: 512  |  Height: 512  |  Size: 23 KiB

BIN
donate/img/arm.png View File

Before After
Width: 512  |  Height: 512  |  Size: 8.6 KiB

BIN
donate/img/camaraderie.png View File

Before After
Width: 512  |  Height: 512  |  Size: 8.6 KiB

BIN
donate/img/dollar.png View File

Before After
Width: 512  |  Height: 512  |  Size: 11 KiB

BIN
donate/img/footer-test.png View File

Before After
Width: 768  |  Height: 300  |  Size: 79 KiB

BIN
donate/img/footer-test2.png View File

Before After
Width: 768  |  Height: 300  |  Size: 71 KiB

BIN
donate/img/give-w.png View File

Before After
Width: 512  |  Height: 512  |  Size: 32 KiB

BIN
donate/img/give.png View File

Before After
Width: 512  |  Height: 512  |  Size: 10 KiB

+ 45
- 0
edu/content.json View File

@ -48,5 +48,50 @@
"filename": "jacobin-abcs.pdf"
}
]
},
{
"name": "Pamphlets",
"content": [
{
"name": "AR15 Components",
"type": "book",
"filename": "AR15_Components_Pamphlet.pdf"
},
{
"name": "Bolt Rifle Components",
"type": "book",
"filename": "Bolt_Rifle_Components_Pamphlet.pdf"
},
{
"name": "Break Shotgun Components",
"type": "book",
"filename": "Break_Shotgun_Components_Pamphlet.pdf"
},
{
"name": "A Guide To IFAKs",
"type": "book",
"filename": "IFAK_Pamphlet.pdf"
},
{
"name": "Lever Action Rifle Components",
"type": "book",
"filename": "Lever_Rifle_Components.pdf"
},
{
"name": "Pistol Components",
"type": "book",
"filename": "Pistol_Components_Pamphlet.pdf"
},
{
"name": "Pump Shotgun Components",
"type": "book",
"filename": "Pump_Shotgun_Components_Pamphlet.pdf"
},
{
"name": "Revolver Components",
"type": "book",
"filename": "Revolver_Components_Pamphlet.pdf"
}
]
}
]

+ 1
- 1
maintenance.php View File

@ -8,7 +8,7 @@
<?php include("res/php/top.php") ?>
<div id="section-title">Down For Maintenance</div>
<hr>
<p>We appreciate your interest, but unfortunately our site is currently down for maintenance. You can expect a return within 48-72 hours.</p>
<p>We appreciate your interest, but unfortunately our site is currently down for maintenance.</p>
<p>For additional questions, contact Aayla Fetzer, our Web and Script Developer, at <a href="mailto:[email protected]">aayla@socialistra.org</a>.</p>
<!-- Content Goes Here -->
<?php include("res/php/bottom.php") ?>


+ 0
- 3
news/story.php View File

@ -6,9 +6,6 @@
</head>
<body>
<?php
ini_set('display_errors', 1);
ini_set('display_startup_errors', 1);
error_reporting(E_ALL);
include("../res/php/top.php");
date_default_timezone_set('America/New_York');
$file = $_GET['id'];


+ 0
- 25
res/php/top.php View File

@ -3,31 +3,6 @@
<div id="logo"><a href="/"><img class="page-logo" src="https://srastatic.nyc3.cdn.digitaloceanspaces.com/web/img/theme/header.png"></a></div>
<div id="ham-toggle"><i class="fa fa-bars" aria-hidden="true"></i></div>
<div id="cart-icon"><a href="https://shop.socialistra.org"><i class="fas fa-store" aria-hidden="true" style="font-size: 0.85em;"></i></a></div>
<?php
$actual_link = "$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
if (strpos($actual_link, "store") != false) { // Display cart if in store
$cookie = $_COOKIE['srac'];
$items = preg_split('@\[email protected]', $cookie, NULL, PREG_SPLIT_NO_EMPTY);
if (empty($items[0])) {
$cartNum = 0;
} else {
$cartNum = count($items);
}
$product = $_GET['p'];
$inCart = 0;
foreach ($items as $item) {
$pair = preg_split('@:@', $item, NULL, PREG_SPLIT_NO_EMPTY);
if ($product == $pair[0]) {
$inCart = 1;
$quantity = $pair[1];
}
}
echo("
<div id=\"cart-icon\"><a href=\"/store/cart.php\"><div id=\"shop-num\">$cartNum</div>
<i class=\"fas fa-shopping-cart\" aria-hidden=\"true\" style=\"font-size: 0.85em;vertical-align: text-bottom;\"></i></a></div>
");
}
?>
</div>
<div id="menu">
<div class="section section-menu group">


Loading…
Cancel
Save