[SUCS Devel] [Git][sucssite/sucs-site][beta] 12 commits: Removed old text readme in favour of markdown one.
Imran Hussain
imranh at sucs.org
Thu Sep 24 13:46:12 BST 2015
Imran Hussain pushed to branch beta at sucssite / sucs-site
Commits:
8f4d62b6 by Peter Jenkins at 2015-09-22T22:13:29Z
Removed old text readme in favour of markdown one.
- - - - -
8027de2c by Peter Jenkins at 2015-09-22T22:14:34Z
Added markdown readme file.
- - - - -
55e0b224 by Imran Hussain at 2015-09-22T22:17:37Z
Merge branch 'master' into 'master'
Changed README file to markdown
Changed the README file to use markdown instead of just plain text, as nice documentation is rather useful.
See merge request !7
- - - - -
54276e79 by Justin Mitchell at 2015-09-23T12:47:43Z
Fix the typos that can generate extra errors
- - - - -
29cb5ed3 by Justin Mitchell at 2015-09-23T12:48:24Z
Merge branch 'master' of https://projects.sucs.org/sucssite/sucs-site
Fix a typo that makes it inherit an earlier error state and produce
erroneous error reports
- - - - -
442c04fe by unreturnable at 2015-09-23T18:14:13Z
Removed google search bar
- - - - -
73906dde by Andy Pover at 2015-09-23T18:21:45Z
Merge branch 'master' into 'master'
Removed google search bar closes #16
Removed the google search bar as I suggested in issue #16
See merge request !8
- - - - -
6213a3c9 by Peter Jenkins at 2015-09-23T19:03:37Z
Fixed issue of none members bananas links
- - - - -
a5a1f385 by Laurence Sebastian Bowes at 2015-09-23T19:07:11Z
Merge branch 'master' into 'master'
Merge fixes #17
Fixed issue with bananas page links for none members
See merge request !9
- - - - -
9275ea92 by Callum Massey at 2015-09-24T12:02:22Z
Add link to nmap log parser
- - - - -
ede173b6 by Imran Hussain at 2015-09-24T12:07:29Z
Merge branch 'nmap' into 'master'
Add link to nmap log parser
Add link to new IP/MAC tracker
See merge request !10
- - - - -
6d4a65e5 by Imran Hussain at 2015-09-24T13:46:06Z
Merge branch 'master' into 'beta'
Deploy bugfixes into beta
We've had a few bug fixes that are ready to be tested on beta.
See merge request !11
- - - - -
6 changed files:
- − README
- + README.md
- components/signup.php
- static/stats.txt
- templates/banana-awardlist.tpl
- templates/foot.tpl
Changes:
=====================================
README deleted
=====================================
--- a/README
+++ /dev/null
@@ -1,34 +0,0 @@
-What's in these 'ere folders:
-
-components/
- PHP components of the site, each drives a separate element - e.g.
- static content, the library, the help system, etc.
-htdocs/
- Where all served content is to be found:
- css/
- Cascading StyleSheets
- files/
- Files for download (e.g. Help examples)
- images/
- Images used by the site skin
- js/
- JavaScript
- tinymce/
- Placeholder dir for TinyMCE, which should not itself
- be stored in SVN
- pictures/
- Images used in the content (e.g. /Help)
-lib/
- Custom libraries used by the site - e.g. session library
-plugins/
- Custom Smarty plugins used by the site - e.g. banana drawing
- function
-static/
- Static content for the static content components (includes help)
- fragments/
- Any HTML fragments used to make up parts of pages (e.g.
- secondary bars)
-templates/
- Smarty templates
-templates_c/
- Compiled Smarty templates - do not use this dir
=====================================
README.md
=====================================
--- /dev/null
+++ b/README.md
@@ -0,0 +1,20 @@
+# SUCS Site
+---
+## Project Structure
+<br>
+
+| Directory | Description |
+| --------- | ----------- |
+| components | PHP components of the site, each drives a separate element - e.g. static content, the library, the help system, etc. |
+| htdocs/css | Cascading StyleSheets |
+| htdocs/files | Files for download (e.g. Help examples) |
+| htdocs/images | Images used by the site skin |
+| htdocs/js | JavaScript |
+| htdocs/js/tinymce | Placeholder dir for TinyMCE, which should not itself be stored in SVN |
+| htdocs/pictures | Images used in the content (e.g. /Help) |
+| lib | Custom libraries used by the site - e.g. session library |
+| plugins | Custom Smarty plugins used by the site - e.g. banana drawing function |
+| static | Static content for the static content components (includes help) |
+| static/fragments | Any HTML fragments used to make up parts of pages (e.g. secondary bars) |
+| templates | Smarty templates |
+| templates_c | Compiled Smarty templates - do not use this dir |
\ No newline at end of file
=====================================
components/signup.php
=====================================
--- a/components/signup.php
+++ b/components/signup.php
@@ -325,7 +325,7 @@ if(isset($_REQUEST['signupid'])&&isset($_REQUEST['signuppw'])){
escapeshellarg($row[type]).
' 2>&1',
$execoutputarr,
- $ececreturn
+ $execreturn
);
if($execreturn!=0){
$execoutputstr=implode("\n",$execoutputarr);
@@ -333,7 +333,7 @@ if(isset($_REQUEST['signupid'])&&isset($_REQUEST['signuppw'])){
mail(
$error_email,
"Error adding user to mailing lists from signup id: ".$signupid,
- $execoutputstr.$ececreturn,
+ $execoutputstr.$execreturn,
"From: \"SUCS Admin\" <admin at sucs.org>"
);
$failed=true;
=====================================
static/stats.txt
=====================================
--- a/static/stats.txt
+++ b/static/stats.txt
@@ -4,4 +4,5 @@
<p><a href="https://sucs.org/stats/cacti/" title="Cacti" target="_blank">Cacti</a> (Bypass login <a href="https://sucs.org/stats/cacti/graph_view.php?action=tree&tree_id=1&leaf_id=8&select_first=true" target="_blank">here</a>)</p>
<p><a href="https://sucs.org/stats/nut/upsstats.cgi" target="_self">Nut</a></p>
<p><a href="https://sucs.org/stats/ganglia/" title="Ganglia" target="_blank">Ganglia</a></p>
-<p> </p>
\ No newline at end of file
+<p><a href="https://sucs.org/stats/nmap/" title="Nmap Log Parser" target="_blank">Nmap Log Parser</a></p>
+<p> </p>
=====================================
templates/banana-awardlist.tpl
=====================================
--- a/templates/banana-awardlist.tpl
+++ b/templates/banana-awardlist.tpl
@@ -3,7 +3,7 @@
<li class="{award_image_class number=$award.score}">
{if !isset($singlemember)}
<strong>{if $award.score >0}+{/if}{$award.score}</strong> awarded to
- <a href="{$baseurl}{if $award.real == TRUE}/Community/Members/{else}/Community/Bananas{/if}{$award.username}">{$award.username}</a>
+ <a href="{$baseurl}{if $award.real == TRUE}/Community/Members/{else}/Community/Bananas/{/if}{$award.username}">{$award.username}</a>
<small>(from {$award.who}, {$award.whn|date_format:"%d %b %Y"})</small><br /> {/if}
<q>{$award.why}</q> <br />
{if isset($singlemember)} <small>
@@ -11,4 +11,4 @@
</small>{/if}
</li>
{/foreach}
-</ul>
+</ul>
\ No newline at end of file
=====================================
templates/foot.tpl
=====================================
--- a/templates/foot.tpl
+++ b/templates/foot.tpl
@@ -3,9 +3,6 @@
<div id="navigation">
{include file="menu.tpl"}
-
-{include file="search.tpl"}
-
{if $session->loggedin}
<div style="resize: both;">
{include file="feedback.tpl"}
@@ -29,7 +26,7 @@
</div>
{if $action=="edit"}
- <!--
+ <!--
<script language="javascript" type="text/javascript" src="{$baseurl}/js/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
<script language="javascript" type="text/javascript" src="{$baseurl}/js/tiny_mce.js"></script>
--!>
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/0088ed5e015ccce171613f5a9d6ccecb001c6a10...6d4a65e5afaacb53b155e03bf245ef23c99a95ab
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20150924/2334f146/attachment-0001.html>
More information about the Devel
mailing list