diff options
| author | Julie Lala <jules@okfoc.us> | 2014-06-24 18:52:07 -0400 |
|---|---|---|
| committer | Julie Lala <jules@okfoc.us> | 2014-06-24 18:52:07 -0400 |
| commit | 948926970571793e774ebf34c16e14ef8e694062 (patch) | |
| tree | 90250502c299fc130efbd4c54a62e3c158cb7acd /template | |
| parent | 0e9eb8b4fc0ef43f91b69749f276cadf2d3bb3ad (diff) | |
| parent | c14e6d4356a2c4d9981a6808ef19edb66fc96e51 (diff) | |
Merge branch 'master' of dumpfm:/pichat/repo
Diffstat (limited to 'template')
| -rw-r--r-- | template/banner.st | 5 | ||||
| -rw-r--r-- | template/fullscreen.st | 7 | ||||
| -rw-r--r-- | template/log.st | 3 | ||||
| -rw-r--r-- | template/rooms/VIP.st | 3 | ||||
| -rw-r--r-- | template/rooms/chat.st | 1 |
5 files changed, 16 insertions, 3 deletions
diff --git a/template/banner.st b/template/banner.st index 0ab1a7b..5cca522 100644 --- a/template/banner.st +++ b/template/banner.st @@ -19,7 +19,7 @@ <a href="$domain$/directory" onclick="pageTracker._trackEvent('button', 'banner-directory'); return true;"> <img src="$domain$/static/img/thumbs/directorybaricon.png"/> Directory </a> - <a href="$domain$/hall" onclick="pageTracker._trackEvent('button', 'banner-hall'); return true;"> + <a href="$domain$/" onclick="pageTracker._trackEvent('button', 'banner-hall'); return true;" id="hall-link"> <img src="$domain$/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame </a> </div> @@ -35,6 +35,8 @@ <select class="toolsmenu" name="menu" onChange="if (document.Tools.menu.selectedIndex != 0) { location=document.Tools.menu.options[document.Tools.menu.selectedIndex].value; } "> <option>Tools</option> <option value="http://bon.gs/tile/" target="_blank">Tile Tool</option> + <option value="http://asdf.us/im/">Photoblaster</option> + <option value="http://csh.bz/gifmelter/">Gifmelter</option> <option value="http://dump.fm/m/oie">Online Image Editor</option> <option value="http://dump.fm/m/3frames">3fram.es</option> <option value="http://dump.fm/m/dwi">Deal With It Maker</option> @@ -74,6 +76,7 @@ $if(user_nick)$ <a href="http://dump.fm/fullscreen">checkout dump.fm in full-screen </a> - <a href="http://abcdef4.dump.fm/">MYSTERY ROOM!!!!!!!! </a> + - <a href="http://www.zazzle.com/ppshoppe/gifts">CHECK OUT THE PP SHOPPE!!!!!</a> $else$ <style>#dumplist{z-index:-1!important;}</style> $endif$ $if(isadmin)$ - <a href="http://vip.dump.fm/">NAUGHTY GIRLS/AND-OR/BOYS DELIGHT </a> $endif$ diff --git a/template/fullscreen.st b/template/fullscreen.st index 79c3934..08cf74d 100644 --- a/template/fullscreen.st +++ b/template/fullscreen.st @@ -184,6 +184,12 @@ <div id="registerbox" class="box"> <a href="/"><img src="/static/img/dumppixellarge3.png"></a> <p> + registration is closed ;-( + </p> + <p> + maybe ask a friend? + </p> + <!-- <label style="text-align:left;margin-bottom:-8px;">username</label> <input type="text" class="field" id="regNickInput" tabindex="5" /> </p><p> @@ -198,6 +204,7 @@ </p><p> <input type="submit" class="submit" id="submit" value="Register!" tabindex="9" /> </p> + --> </div> $endif$ diff --git a/template/log.st b/template/log.st index ab4eb53..c235ae8 100644 --- a/template/log.st +++ b/template/log.st @@ -14,7 +14,7 @@ <div id="content"> <div id="messagePanep"> <div id="userListp"> - <h2> $roomkey$ log </h2><br><h3></h3> + <h2> $roomkey$ log </h2><br><h3></h3> </div> <div id="messageList"> @@ -57,5 +57,6 @@ </div> </div></div></div> +<script type="text/javascript">load_favs()</script> </body> </html> diff --git a/template/rooms/VIP.st b/template/rooms/VIP.st index 59e7406..0779549 100644 --- a/template/rooms/VIP.st +++ b/template/rooms/VIP.st @@ -143,8 +143,9 @@ <li><a href="$domain$/roomlist">Rooms</a></li> <li><a href="$domain$/users">New Users</a></li> <li><a href="$domain$/mutes">Mutes</a></li> - <li><a href="http://dump.fm/static/super/">Registration</a></li> + <li><a href="http://dump.fm/static/shinobi/">Registration</a></li> <li><a href="http://temp.dump.fm/">Temp</a></li> + <li><a href="https://docs.google.com/document/d/1w4P__Qs9PB2setcgoDW9XlCnf_-e0xO4OLt6bHw5yJk/edit?usp=drive_web">Mod Hax</a></li> </ul> </div> </body> diff --git a/template/rooms/chat.st b/template/rooms/chat.st index 63c8d11..796a8fe 100644 --- a/template/rooms/chat.st +++ b/template/rooms/chat.st @@ -71,6 +71,7 @@ $else$ $banner()$ $if(!user_nick)$ + <script>window.location.href = "http://dump.fm/"</script> <div id="dis_welcome"> <center> <img src="$domain$/static/img/dumppixellarge3.png"> |