Browse Source

Get rid of JS and old links; Cleanup and fixes

pull/14/head
falkTX 5 years ago
parent
commit
96d8a4355b
5 changed files with 111 additions and 187 deletions
  1. +39
    -74
      News/themes/stardust/layouts/default.twig
  2. +2
    -2
      css/base.css
  3. +13
    -11
      css/style.css
  4. BIN
      images/ico_rocketchat.png
  5. +57
    -100
      includes/header.php

+ 39
- 74
News/themes/stardust/layouts/default.twig View File

@@ -8,7 +8,7 @@

<title>KXStudio News</title>

<link rel="copyright" href="http://creativecommons.org/licenses/publicdomain/" />
<link rel="copyright" href="https://creativecommons.org/publicdomain/zero/1.0/" />
<link rel="stylesheet" href="../css/style.fluid.css" type="text/css" media="screen" />
<link rel="stylesheet" href="../css/style.css" type="text/css" media="screen" />
<link rel="icon" type="image/png" href="../images/ico_kxstudio.png" />
@@ -18,76 +18,8 @@
$theme.stylesheets
$theme.javascripts
${ trigger.call("head") }
<script type="text/javascript">
function closeAllMenus(){
var objSoftwareMenu = document.getElementById("div_menuSoftware");
var objRepositoriesMenu = document.getElementById("div_menuRepositories");
var objCommunityMenu = document.getElementById("div_menuCommunity");

if (objSoftwareMenu.style.visibility == "visible")
objSoftwareMenu.style.visibility = "hidden";

if (objRepositoriesMenu.style.visibility == "visible")
objRepositoriesMenu.style.visibility = "hidden";

if (objCommunityMenu.style.visibility == "visible")
objCommunityMenu.style.visibility = "hidden";
};

function menuItemClicked(event, menu, itemName){
event.stopPropagation();

closeAllMenus();

//if (menu.style.visibility != "visible")
{
var leftPos = document.getElementById(itemName).getBoundingClientRect().left - 1;
menu.style.left = "" + leftPos + "px";
menu.style.visibility = "visible";
}
//else
//{
// menu.style.visibility = "hidden";
//}

return false;
};

function bodyClicked(){
closeAllMenus();
return true;
};

function itemSoftwareClicked(event) { return menuItemClicked(event, document.getElementById("div_menuSoftware"), "item-soft"); };
function itemRepositoriesClicked(event){ return menuItemClicked(event, document.getElementById("div_menuRepositories"), "item-repos"); };
function itemCommunityClicked(event) { return menuItemClicked(event, document.getElementById("div_menuCommunity"), "item-community"); };

</script>
</head>
<body class="mediawiki ltr ns-0 ns-subject skin-bentofluid" onClick="return bodyClicked();">
<!-- Software sub menu -->
<div id="div_menuSoftware" class="div_menuDropdown">
<p><a href="/Applications"><img src="/images/ico_cadence.png" alt=""/> &nbsp; Applications</a></p>
<p><a href="/Plugins"><img src="/images/ico_distrho.png" alt=""/> &nbsp; Plugins</a></p>
</div>
<!-- Repositories sub menu -->
<div id="div_menuRepositories" class="div_menuDropdown">
<p><a href="/Repositories">About</a></p>
<p><a href="/Repositories:Applications">Applications (in Repo)</a></p>
<p><a href="/Repositories:Plugins">Plugins (in Repo)</a></p>
</div>
<!-- Support sub menu -->
<div id="div_menuSupport" class="div_menuDropdown">
<p><a href="/Documentation">Documentation</a></p>
</div>
<!-- Community sub menu -->
<div id="div_menuCommunity" class="div_menuDropdown">
<p><a href="https://discord.gg/GHuycpX" class="external" rel="nofollow" target="_blank"><img src="/images/ico_discord.png" alt=""/> &nbsp; Discord Server</a></p>
<p><a href="http://webchat.freenode.net/?channels=#kxstudio,#opensourcemusicians" class="external" rel="nofollow" target="_blank"><img src="/images/ico_chat.png" alt=""/> &nbsp; IRC Channel</a></p>
<p><a href="http://linuxmusicians.com/viewforum.php?f=47" class="external" rel="nofollow" target="_blank"><img src="/images/ico_forum.png" alt=""/> &nbsp; Web Forums</a></p>
<p><a href="https://soundcloud.com/search/sounds?q=kxstudio" class="external" rel="nofollow" target="_blank"><img src="/images/ico_soundcloud.png" alt=""/> &nbsp; Songs</a></p>
</div>

<body class="mediawiki ltr ns-0 ns-subject skin-bentofluid">
<!-- Top link -->
<a name="Top" id="Top"></a>

@@ -97,12 +29,45 @@ ${ trigger.call("head") }
<a id="header-logo" href="/">
<img src="../images/header-logo_mod.png" width="46" height="26" alt="Header Logo"/>
</a>
<a id="header-home" href="/" style="font-size:1.2em">Home</a>
<a id="header-home" href="/">Home</a>
<ul id="global-navigation">
<li id="item-news"><a href="/News">News</a></li>
<li id="item-soft"><a href="/Applications" onClick="return itemSoftwareClicked(event);">Software &#9660;</a></li>
<li id="item-repos"><a href="/Repositories" onClick="return itemRepositoriesClicked(event);">Repositories &#9660;</a></li>
<li id="item-community"><a href="/Documentation" onClick="return itemCommunityClicked(event);">Community &#9660;</a></li>
<li id="item-soft" class="item-menu">
<a href="/Applications">Software &#9660;</a>
<div class="item-menu-children">
<p><a href="/Applications"><img src="/images/ico_cadence.png" alt=""/> &nbsp; Applications</a></p>
<p><a href="/Plugins"><img src="/images/ico_distrho.png" alt=""/> &nbsp; Plugins</a></p>
</div>
</li>
<li id="item-repos" class="item-menu">
<a href="/Repositories">Repositories &#9660;</a>
<div class="item-menu-children">
<p><a href="/Repositories">About / How-to</a></p>
<p><a href="/Repositories:Applications">Applications (in Repo)</a></p>
<p><a href="/Repositories:Plugins">Plugins (in Repo)</a></p>
<p><a href="/Repositories:FAQ">FAQ</a></p>
</div>
</li>
<li id="item-community" class="item-menu">
<a href="/Documentation">Community &#9660;</a>
<div class="item-menu-children">
<p>
<a href="https://webchat.freenode.net/?channels=#kxstudio,#opensourcemusicians" class="external" rel="nofollow" target="_blank">
<img src="/images/ico_chat.png" width="16px" height="16px" alt=""/> &nbsp; IRC Channel
</a>
</p>
<p>
<a href="https://chat.kx.studio/" class="external" rel="nofollow" target="_blank">
<img src="/images/ico_rocketchat.png" width="16px" height="16px" alt=""/> &nbsp; Rocket Chat
</a>
</p>
<p>
<a href="https://soundcloud.com/search/sounds?q=kxstudio" class="external" rel="nofollow" target="_blank">
<img src="/images/ico_soundcloud.png" width="16px" height="16px" alt=""/> &nbsp; Songs
</a>
</p>
</div>
</li>
<li id="item-documentation"><a href="/Documentation">Documentation</a></li>
<li id="item-donate"><a href="/Donations">Donations</a></li>
<li id="item-downloads"><a href="/Downloads">Downloads</a></li>


+ 2
- 2
css/base.css View File

@@ -80,11 +80,11 @@ blockquote{border-left:5px solid #690;color:#ddd;padding:10px;}
#header ul#global-navigation, #global-navigation li{border-color:#222222;border-style:solid;margin:0;}
#global-navigation li:first-child{border-left-width:1px;}
#global-navigation li{float:left;border-right-width:1px;}
#global-navigation li a{color:#F0F0F0;display:block;height:100%;margin:0 15px;padding-top:7px;text-decoration:none;width:100%;font-size:1.2em;font-weight:800;}
#global-navigation li a{color:#F0F0F0;display:block;height:100%;margin:0 15px;line-height:2em;text-decoration:none;width:100%;font-size:1.2em;font-weight:800;}
#global-navigation li a:hover, #global-navigation li a:focus{color:#6464E6;}
#global-favorites{float:right !important;border-left-width:1px;}
#header-logo{float:left;margin-top:2px;margin-right:25px;}
#header-home{float:left;margin:0 0px;color:#F0F0F0;padding-top:7px;text-decoration:none;}
#header-home{float:left;margin:0 0px;color:#F0F0F0;line-height:2em;font-size:1.2em;text-decoration:none;}
#header-home:hover, #header-home:focus{color:#6464E6;}
#header #global-search-form{color:#F0F0F0;float:right;margin-top:4px;position:relative;}
.lable-overley label{position:absolute;top:4px;left:5px;}


+ 13
- 11
css/style.css View File

@@ -432,35 +432,37 @@ fieldset table {
background:none repeat scroll 0 0 transparent;
}

.div_menuDropdown {
.item-menu:hover > .item-menu-children {
display: block;
}

.item-menu-children {
position: absolute;
display: none;
margin: 0;
padding: 0;
z-index: 99;
top: 30px;
left: 0px;
background-color: #111111;
border-top: 1px solid #222222;
padding: 0px;
visibility: hidden;
text-decoration: none;
z-index: 99;
}

.div_menuDropdown p {
.item-menu-children p {
margin: 0;
color: #F0F0F0;
margin: 0 0 0 0;
padding-top: 4px;
padding-bottom: 4px;
padding-left: 16px;
padding-right: 16px;
border: 1px solid #222222;
border-top: 0px;
}

.div_menuDropdown a {
.item-menu-children a {
color: #F0F0F0;
text-decoration: none;
}

.div_menuDropdown a:hover, .div_menuDropdown a:focus {
.item-menu-children a:hover, .div_menuDropdown a:focus {
color: #6464E6;
}



BIN
images/ico_rocketchat.png View File

Before After
Width: 32  |  Height: 32  |  Size: 1.1KB

+ 57
- 100
includes/header.php View File

@@ -1,6 +1,6 @@
<?php
$SHOW_NOTE = FALSE;
$ROOT = FALSE;
$ROOT = "";

if (file_exists("/home/falktx/.jackdrc") || file_exists("/home/daeavelwyn/public_html/kxstudio/"))
{
@@ -43,68 +43,11 @@ if (false && $PAGE_TYPE != "PASTE" && $PAGE_TYPE != "DONATIONS" && $PAGE_TYPE !=

<title><?php echo $PAGE_TITLE; ?></title>

<link rel="copyright" href="http://creativecommons.org/licenses/publicdomain/" />
<link rel="stylesheet" href="<?php echo $ROOT; ?>/css/style.fluid.css" type="text/css" media="screen" />
<link rel="stylesheet" href="<?php echo $ROOT; ?>/css/style.css" type="text/css" media="screen" />
<link rel="icon" type="image/png" href="<?php echo $ROOT; ?>/images/ico_kxstudio.png" />
<link rel="shortcut icon" href="<?php echo $ROOT; ?>/favicon.ico" />
<script type="text/javascript">
<?php if ($PAGE_TYPE == "HOME") { ?>
$(window).load(function(){
$(".rslides").responsiveSlides({
auto: true,
nav: true,
pager: false,
speed: 1000,
timeout: 7500,
namespace: "large-btns"
});
});
<?php } ?>
function closeAllMenus(){
var objSoftwareMenu = document.getElementById("div_menuSoftware");
var objRepositoriesMenu = document.getElementById("div_menuRepositories");
var objCommunityMenu = document.getElementById("div_menuCommunity");

if (objSoftwareMenu.style.visibility == "visible")
objSoftwareMenu.style.visibility = "hidden";

if (objRepositoriesMenu.style.visibility == "visible")
objRepositoriesMenu.style.visibility = "hidden";

if (objCommunityMenu.style.visibility == "visible")
objCommunityMenu.style.visibility = "hidden";
};

function menuItemClicked(event, menu, itemName){
event.stopPropagation();

closeAllMenus();

//if (menu.style.visibility != "visible")
{
var leftPos = document.getElementById(itemName).getBoundingClientRect().left - 1;
menu.style.left = "" + leftPos + "px";
menu.style.visibility = "visible";
}
//else
//{
// menu.style.visibility = "hidden";
//}

return false;
};

function bodyClicked(){
closeAllMenus();
return true;
};

function itemSoftwareClicked(event) { return menuItemClicked(event, document.getElementById("div_menuSoftware"), "item-soft"); };
function itemRepositoriesClicked(event){ return menuItemClicked(event, document.getElementById("div_menuRepositories"), "item-repos"); };
function itemCommunityClicked(event) { return menuItemClicked(event, document.getElementById("div_menuCommunity"), "item-community"); };

</script>
<link rel="copyright" href="https://creativecommons.org/publicdomain/zero/1.0/" />
<link rel="stylesheet" href="/css/style.fluid.css" type="text/css" media="screen" />
<link rel="stylesheet" href="/css/style.css" type="text/css" media="screen" />
<link rel="icon" type="image/png" href="/images/ico_kxstudio.png" />
<link rel="shortcut icon" href="/favicon.ico" />
<?php if (false && $PAGE_TYPE == "DONATIONS") { ?>
<style type="text/css">
html > body .liberapay-btn {
@@ -134,7 +77,7 @@ if (false && $PAGE_TYPE != "PASTE" && $PAGE_TYPE != "DONATIONS" && $PAGE_TYPE !=
}
</style>
<?php } else if ($PAGE_TYPE == "PASTE") { ?>
<link rel="stylesheet" href="<?php echo $ROOT; ?>/paste/kxstudio.css" type="text/css" media="screen" />
<link rel="stylesheet" href="/paste/kxstudio.css" type="text/css" media="screen" />
<!-- Special Paste CSS -->
<style type="text/css">
html, body {
@@ -195,45 +138,59 @@ if (false && $PAGE_TYPE != "PASTE" && $PAGE_TYPE != "DONATIONS" && $PAGE_TYPE !=
<?php } ?>
</head>

<body class="mediawiki ltr ns-0 ns-subject skin-bentofluid" onClick="return bodyClicked();">
<!-- Software sub menu -->
<div id="div_menuSoftware" class="div_menuDropdown">
<p><a href="<?php echo $ROOT; ?>/Applications"><img src="<?php echo $ROOT; ?>/images/ico_cadence.png" alt=""/> &nbsp; Applications</a></p>
<p><a href="<?php echo $ROOT; ?>/Plugins"><img src="<?php echo $ROOT; ?>/images/ico_distrho.png" alt=""/> &nbsp; Plugins</a></p>
</div>
<!-- Repositories sub menu -->
<div id="div_menuRepositories" class="div_menuDropdown">
<p><a href="<?php echo $ROOT; ?>/Repositories">About</a></p>
<p><a href="<?php echo $ROOT; ?>/Repositories:Applications">Applications (in Repo)</a></p>
<p><a href="<?php echo $ROOT; ?>/Repositories:Plugins">Plugins (in Repo)</a></p>
</div>
<!-- Community sub menu -->
<div id="div_menuCommunity" class="div_menuDropdown">
<p><a href="https://discord.gg/GHuycpX" class="external" rel="nofollow" target="_blank"><img src="<?php echo $ROOT; ?>/images/ico_discord.png" alt=""/> &nbsp; Discord Server</a></p>
<p><a href="http://webchat.freenode.net/?channels=#kxstudio,#opensourcemusicians" class="external" rel="nofollow" target="_blank"><img src="<?php echo $ROOT; ?>/images/ico_chat.png" alt=""/> &nbsp; IRC Channel</a></p>
<p><a href="http://linuxmusicians.com/viewforum.php?f=47" class="external" rel="nofollow" target="_blank"><img src="<?php echo $ROOT; ?>/images/ico_forum.png" alt=""/> &nbsp; Web Forums</a></p>
<p><a href="https://soundcloud.com/search/sounds?q=kxstudio" class="external" rel="nofollow" target="_blank"><img src="<?php echo $ROOT; ?>/images/ico_soundcloud.png" alt=""/> &nbsp; Songs</a></p>
</div>

<body class="mediawiki ltr ns-0 ns-subject skin-bentofluid">
<!-- Top link -->
<a name="Top" id="Top"></a>

<!-- Start: Header -->
<div id="header">
<div id="header-content" class="container_12">
<a id="header-logo" href="<?php echo $ROOT; ?>/">
<img src="<?php echo $ROOT; ?>/images/header-logo_mod.png" width="46" height="26" alt="Header Logo"/>
<a id="header-logo" href="/">
<img src="/images/header-logo_mod.png" width="46" height="26" alt="Header Logo"/>
</a>
<a id="header-home" href="<?php echo $ROOT; ?>/" style="font-size:1.2em">Home</a>
<a id="header-home" href="/">Home</a>
<ul id="global-navigation">
<li id="item-news"><a href="<?php echo $ROOT; ?>/News">News</a></li>
<li id="item-soft"><a href="<?php echo $ROOT; ?>/Applications" onClick="return itemSoftwareClicked(event);">Software &#9660;</a></li>
<li id="item-repos"><a href="<?php echo $ROOT; ?>/Repositories" onClick="return itemRepositoriesClicked(event);">Repositories &#9660;</a></li>
<li id="item-community"><a href="<?php echo $ROOT; ?>/Documentation" onClick="return itemCommunityClicked(event);">Community &#9660;</a></li>
<li id="item-documentation"><a href="<?php echo $ROOT; ?>/Documentation">Documentation</a></li>
<li id="item-donate"><a href="<?php echo $ROOT; ?>/Donations">Donations</a></li>
<li id="item-downloads"><a href="<?php echo $ROOT; ?>/Downloads">Downloads</a></li>
<li id="item-paste"><a href="<?php echo $ROOT; ?>/Paste">Paste</a></li>
<li id="item-news"><a href="/News">News</a></li>
<li id="item-soft" class="item-menu">
<a href="/Applications">Software &#9660;</a>
<div class="item-menu-children">
<p><a href="/Applications"><img src="/images/ico_cadence.png" alt=""/> &nbsp; Applications</a></p>
<p><a href="/Plugins"><img src="/images/ico_distrho.png" alt=""/> &nbsp; Plugins</a></p>
</div>
</li>
<li id="item-repos" class="item-menu">
<a href="/Repositories">Repositories &#9660;</a>
<div class="item-menu-children">
<p><a href="/Repositories">About / How-to</a></p>
<p><a href="/Repositories:Applications">Applications (in Repo)</a></p>
<p><a href="/Repositories:Plugins">Plugins (in Repo)</a></p>
<p><a href="/Repositories:FAQ">FAQ</a></p>
</div>
</li>
<li id="item-community" class="item-menu">
<a href="/Documentation">Community &#9660;</a>
<div class="item-menu-children">
<p>
<a href="https://webchat.freenode.net/?channels=#kxstudio,#opensourcemusicians" class="external" rel="nofollow" target="_blank">
<img src="/images/ico_chat.png" width="16px" height="16px" alt=""/> &nbsp; IRC Channel
</a>
</p>
<p>
<a href="https://chat.kx.studio/" class="external" rel="nofollow" target="_blank">
<img src="/images/ico_rocketchat.png" width="16px" height="16px" alt=""/> &nbsp; Rocket Chat
</a>
</p>
<p>
<a href="https://soundcloud.com/search/sounds?q=kxstudio" class="external" rel="nofollow" target="_blank">
<img src="/images/ico_soundcloud.png" width="16px" height="16px" alt=""/> &nbsp; Songs
</a>
</p>
</div>
</li>
<li id="item-documentation"><a href="/Documentation">Documentation</a></li>
<li id="item-donate"><a href="/Donations">Donations</a></li>
<li id="item-downloads"><a href="/Downloads">Downloads</a></li>
<li id="item-paste"><a href="/Paste">Paste</a></li>
</ul>
</div>
</div>
@@ -250,7 +207,7 @@ if (false && $PAGE_TYPE != "PASTE" && $PAGE_TYPE != "DONATIONS" && $PAGE_TYPE !=

<div id="subheader" class="container_16">
<div id="breadcrump" class="grid_12 alpha">
<a href="<?php echo $ROOT; ?>/" title="Home"><img src="<?php echo $ROOT; ?>/images/home_grey.png" width="16" height="16" alt="Home" /> KXStudio </a>
<a href="/" title="Home"><img src="/images/home_grey.png" width="16" height="16" alt="Home" /> KXStudio </a>
<?php for ($i = 0; $i < count($PAGE_SOURCE_1); $i++) { ?>
&gt; <a href="<?php echo $ROOT . $PAGE_SOURCE_1[$i]; ?>"><?php echo $PAGE_SOURCE_2[$i]; ?></a>
<?php } ?>
@@ -276,10 +233,10 @@ if (false && $PAGE_TYPE != "PASTE" && $PAGE_TYPE != "DONATIONS" && $PAGE_TYPE !=
<li><a href="#SourceCode">Source Code</a></li>
<li><a href="#Artwork">Artwork</a></li>
<?php } else if ($PAGE_TYPE == "PASTE") { ?>
<li><a href="<?php echo $ROOT; ?>/Paste" title="Create new paste">New Paste</a></li>
<li><a href="/Paste" title="Create new paste">New Paste</a></li>
<?php if ($show_paste && ! $is_error) { ?>
<li><a href="<?php echo $ROOT; ?>/Paste/raw/<?php echo $paste_id; ?>" target="blank" title="View RAW">View RAW</a></li>
<li><a href="<?php echo $ROOT; ?>/Paste/download.php?id=<?php echo $paste_id; ?>" title="Download">Download</a></li>
<li><a href="/Paste/raw/<?php echo $paste_id; ?>" target="blank" title="View RAW">View RAW</a></li>
<li><a href="/Paste/download.php?id=<?php echo $paste_id; ?>" title="Download">Download</a></li>
<?php } ?>
<?php } ?>
</ul>
@@ -291,7 +248,7 @@ if (false && $PAGE_TYPE != "PASTE" && $PAGE_TYPE != "DONATIONS" && $PAGE_TYPE !=
<h1><span class="mw-headline"> About KXStudio </span></h1>
<?php } else if ($PAGE_TYPE == "NEWS") { ?>
<div style="float: right; padding-right: 16px;">
<a href="<?php echo $ROOT; ?>/News/?action=feed"><img src="images/rss.png" alt="RSS"/></a>
<a href="/News/?action=feed"><img src="images/rss.png" alt="RSS"/></a>
</div>
<h1 style="margin-top: 0px"><span class="mw-headline"> KXStudio&nbsp;: News </span></h1>
<?php } else if ($PAGE_TYPE != "PASTE") { ?>


Loading…
Cancel
Save