Skip to content

Commit

Permalink
-Refinements to owner forms, suggested forms, newItemParse (Hal's) form.
Browse files Browse the repository at this point in the history
-Added subheadline, author, unique, and other new fields.
-Article.pl - made owner processing more generic
-Common.pl - moved error log to error.pl; fixed file lock code
-Display.pl - fixed display of subsection vs section; fixed totalItems logic
-docitem.pl: added csspath to global for owner
-indexes.pl: fixed .cnt.cnt filename extension. Tried to fix problem with pages index high end (page 99)
-owner.pl: minor changes
-sectsubs.pl: simplified owner section logic for adding, deleting sections. (If one sectsub is named Calendar and the other CalendarHistory, it can't tell one from the other. Solution: renamed CalendarHistory to CalHistory)
-Smartdata.pl: changed By to By: for author
-Template_ctrl.pl: very minor changes
-Hitcounter.php - put an error trap in SQL query for count
-woa_mauveindex.css - added missing smallfont class
-cswp_admin.php: Changed section to subsection; cosmetic changes
-cswp_top.htm and ownerSubtitle.htm - added for cosmetics
-ftp.pl - new program; uses Net ftp; works with telavant, but not with Sierra Club due to / after host name.
  • Loading branch information
karengaia committed Sep 6, 2012
1 parent 2a364db commit 2c916d3
Show file tree
Hide file tree
Showing 112 changed files with 397 additions and 920 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,12 @@ subdomains/www/autosubmit/popmail/*
subdomains/www/autosubmit/deleted/*.del
subdomains/www/autosubmit/items/*
subdomains/www/autosubmit/items/*.itm
subdomains/www/autosubmit/log/*
subdomains/www/autosubmit/sections/*.idx
subdomains/www/autosubmit/sections_Backup_prod_2012-08-09/*
subdomains/www/autosubmit/sections/*.bak
subdomains/www/autosubmit/sections/*.cnt
subdomains/www/autosubmit/sections/*.cnt.cnt
subdomains/www/autosubmit/sepmail/*
subdomains/www/autosubmit/templates/*.mid
subdomains/www/autosubmit/volunteerEmail.txt
Expand All @@ -52,7 +54,9 @@ subdomains/www/cgi-bin/save_*
subdomains/www/cgi-bin/test/*
subdomains/www/clock/*
subdomains/www/counter/_save/*
subdomains/www/counter/*.txt
subdomains/www/css/old_*
subdomains/www/img/*
subdomains/www/img/imagesNew/*.jpg
subdomains/www/img/whatworks/*.jpg
subdomains/www/img/whatworks/*.tif
Expand All @@ -61,6 +65,7 @@ subdomains/www/mail-list/Gregs/*
subdomains/www/mail-list/_save/*
subdomains/www/mauve*
subdomains/www/media_PowerPoint_movies/*
subdomains/www/pdfs_documents/*
subdomains/www/*.csv
subdomains/www/php/not_used/*
subdomains/www/php/_save/*
Expand Down
1 change: 1 addition & 0 deletions settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
require dirname(__FILE__) . '/settings_overrides.php';
}
else {
echo " development <br>";
$CONFIG['mysql_host'] = 'overpop';
$CONFIG['mysql_user'] = 'root';
$CONFIG['mysql_password'] = '';
Expand Down
1 change: 0 additions & 1 deletion subdomains/www/autosubmit/sections/Countries_Asia.cnt

This file was deleted.

1 change: 0 additions & 1 deletion subdomains/www/autosubmit/sections/Countries_Asia.cnt.cnt

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion subdomains/www/autosubmit/sections/Countries_info.cnt.cnt

This file was deleted.

1 change: 0 additions & 1 deletion subdomains/www/autosubmit/sections/Countries_intro.cnt.cnt

This file was deleted.

1 change: 0 additions & 1 deletion subdomains/www/autosubmit/sections/Facts_faq.cnt.cnt

This file was deleted.

1 change: 0 additions & 1 deletion subdomains/www/autosubmit/sections/Facts_item.cnt.cnt

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion subdomains/www/autosubmit/sections/Facts_naysayers.cnt.cnt

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion subdomains/www/autosubmit/sections/WhatWorks_Cairo.cnt.cnt

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion subdomains/www/autosubmit/sections/WhatWorks_new.cnt.cnt

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

25 changes: 11 additions & 14 deletions subdomains/www/autosubmit/templates/article_control.htm
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@
<!-- LEFT COLUMN -->
<td width="20%" valign="top">
<br>
Summarized que: <span style="color:red;font-weight:bold;font-size:120%;">[summarizedcnt]</span><br>
Suggested que: <span style="color:red;font-weight:bold;font-size:120%;">[suggestedcnt]</span>
<a target="_blank" href="http://[SCRIPTPATH]/article.pl?display_subsection%%%Suggested_summarizedItem%%%20">Summarized</a> que: <span style="color:red;font-weight:bold;font-size:120%;">[summarizedcnt]</span><br>
<a target="_blank" href="http://[SCRIPTPATH]/article.pl?display_subsection%%%Suggested_suggestedItem%%%10">Suggested</a> que: <span style="color:red;font-weight:bold;font-size:120%;">[suggestedcnt]</span>
<br><br>
<b>Server:</b>&nbsp;
[svrinfoSvrname]
Expand Down Expand Up @@ -199,7 +199,7 @@
<a target="_blank" href="http://[PUBLICURL]/autosubmit/summarize.html">Summarize instructions</a><br>
<a target="_blank" href="http://[PUBLICURL]/autosubmit/apply.html">Application</a><br>
<a target="_top" href="http://[PUBLICURL]/volunteer_page.html">Volunteer page</a><br>
<a target="_blank" href="http://[SCRIPTPATH]/article.pl?display_section%%fly%Volunteer_intro">
<a target="_blank" href="http://[SCRIPTPATH]/article.pl?display_subsection%%fly%Volunteer_intro">
Volunteer Inside Pg(fly)</a><br>
<br>
<b>Quick Fix files (not used)</b><br>
Expand Down Expand Up @@ -409,16 +409,16 @@
<br><br>
<b class="head">Worklists</b><br>

<a target="_blank" href="http://[SCRIPTPATH]/article.pl?display_section%%%Headlines_priority%%%100">Headlines Priority</a><br>
<a target="_blank" href="http://[SCRIPTPATH]/article.pl?display_subsection%%%Headlines_priority%%%100">Headlines Priority</a><br>

<a target="_blank" href="http://[SCRIPTPATH]/article.pl?display_section%%%Suggested_suggestedItem%%%10">Suggested Update List</a><br>
<a target="_blank" href="http://[SCRIPTPATH]/article.pl?display_subsection%%%Suggested_suggestedItem%%%10">Suggested Update List</a><br>

<a target="_blank" href="http://[SCRIPTPATH]/article.pl?display_section%%%Suggested_emailedItem%%A3491">
<a target="_blank" href="http://[SCRIPTPATH]/article.pl?display_subsection%%%Suggested_emailedItem%%A3491">
Select email</a><br>
<a target="_blank" href="http://www.overpopulation.org/cgi-bin/cgiwrap/popaware/article.pl?clean_index%%%Suggested_emailedItem%%A3491">Clean email index</a><br>

<a target="_blank" href="http://[SCRIPTPATH]/article.pl?display_section%%%NewsDigest_NewsItem%">News on the fly</a><br>
<a target="_blank" href="http://[SCRIPTPATH]/article.pl?display_section%%fly%Headlines_sustainability%">Headlines</a><br>
<a target="_blank" href="http://[SCRIPTPATH]/article.pl?display_subsection%%%NewsDigest_NewsItem%">News on the fly</a><br>
<a target="_blank" href="http://[SCRIPTPATH]/article.pl?display_subsection%%fly%Headlines_sustainability%">Headlines</a><br>
<a target="_blank" href="http://[PUBLICURL]/autosubmit/prepage/newsScan.html">news prepage</a><br>
<br>
<a target="_blank" href="http://[SCRIPTPATH]/article.pl?display_section%%fly%Volunteer_newArticle">New Article</a><br>
Expand All @@ -427,17 +427,14 @@
<br>
<b class="head">Population News Weekly</b><br>

<a target="_blank" href="http://[SCRIPTPATH]/article.pl?display_section%%%NewsWeekly_WeeklyItem%">
<a target="_blank" href="http://[SCRIPTPATH]/article.pl?display_subsection%%%NewsWeekly_WeeklyItem%">
Print PopNewsWeekly email</a><br>
(Do a View->Source and then use Notepad to delete p br and nbsp tags.)<br><br>
http://overpopulation.org/mail-list/quickmsg.php
<b>Email Popnews</b>&nbsp;<a target="blank" href="http://overpopulation.org/mail-list/quickmsg.php">List admin PHP</a>
<br><br>
<b class="head">Move to Public:</b>
<a target="_blank" href="http://[SCRIPTPATH]/moveutil.p
l?move2">NewsScan/Headlines</a> <br>
<a target="_blank" href="http://[SCRIPTPATH]/moveutil.p
l?move1">NewsScan only</a>
<b class="head">Owner:</b>
<a target="_blank" href="http://[PUBLICURL]/prepage/viewOwnerUpdate.php?%ownerUpdate%CSWP_Calendar%CSWP%A3491%Calendar;MotherSch;AdminCalendar">CRUD panel for CSWP</a> (best accessed from grey dot) <br>

<br><br>
<b class="head">Control files</b><br>
Expand Down
7 changes: 4 additions & 3 deletions subdomains/www/autosubmit/templates/cswpEventItem.htm
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
<table><tr><td valign="top">
[STD_ITEM_TOP]
</td><td>
<h6>
<h6 style="font-size: 100%;font-family:verdana;color:black;font-style:normal;font-weight:bold;margin-top:-1px;margin-bottom:1px;">
[ALINK]
[headline]
</a></h6>
</a></h6><span style="font-family:arial">
[SUBHEADLINE]
[BODY]
[REDARROW]
</td></tr></table>
</span></td></tr></table>
<!-- end cswpEventItem template -->
11 changes: 6 additions & 5 deletions subdomains/www/autosubmit/templates/cswpMotherSchItem.htm
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<!-- cswpMotherSchItem template -->
<table><tr><td valign="top">
<table width="100%"><tr><td valign="top">
[STD_ITEM_TOP]
</td><td>
<h6 style="color: darkblue;">
</td><td style="font-size:100%;text-align:center;">
<h6 style="text-align:center;font-size: 80%;font-family:verdana;text-align:center;color:darkblue;font-style:normal;font-weight:bold;margin-top:-1px;margin-bottom:1px;">
[ALINK]
[headline]
</a></h6>
</a></h6><span style="font-size="100%;font-family:arial;text-align:center;">
[SUBHEADLINE]
[BODY]
[REDARROW]
</td></tr></table>
</span></td></tr></table>
<!-- end cswpMotherSchItem template -->
35 changes: 35 additions & 0 deletions subdomains/www/autosubmit/templates/cswp_top.htm
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />

<script LANGUAGE="JavaScript">

<!--
function CheckAll()
{
for (var i=0;i<document.itemsSelect.elements.length;i++) {
var e = document.itemsSelect.elements[i];
if (e.name.match(/^selitem/))
e.checked = document.itemsSelect.allbox.checked;
}
}
//-->
</script>

<link rel="stylesheet" type="text/css" href="[OWNER_CSS]" media="Screen">

</head>
<body>
<form method="post" name="itemsSelect" action=
"http://[SCRIPTPATH]/article.pl">
<input type="hidden" name="cmd" value="selectItems">
<input type="hidden" name="thisSectsub" value="[thisSectsub]">
<input type="hidden" name="owner" value="[owner]">
<input type="hidden" name="ipform" value="owner_top">

<!-- <font size="2" face="arial">
<input name="allbox" type="checkbox" value="moxnix" onClick="CheckAll();">
&nbsp;Check/uncheck all<p>
</font> -->

Loading

0 comments on commit 2c916d3

Please sign in to comment.