Changeset 81

Timestamp:

08/27/07 11:55:07 (10 months ago)

Author:

orion

Message:

live version as of now

Files:

• trunk/email-submission/email.html (modified) (1 diff)
• trunk/rtNoAuth/changeshown.html (modified) (4 diffs)
• trunk/rtNoAuth/getannotations-devel.html (modified) (1 diff)
• trunk/rtNoAuth/getannotations.html (modified) (1 diff)
• trunk/rtNoAuth/readsay.html (modified) (10 diffs)
• trunk/rtNoAuth/readsay2.html (modified) (5 diffs)
• trunk/rtNoAuth/submitcomment-cachetoo.html (modified) (3 diffs)
• trunk/rtNoAuth/xmlresults-debug.html (modified) (6 diffs)
• trunk/rtNoAuth/xmlresults-intense.html (modified) (2 diffs)
• trunk/stet-intense-shorter.js (modified) (4 diffs)

trunk/email-submission/email.html

@@ -72 +72 @@
-<p>Send comments on the GFDL draft to: <a href="mailto:gfdl-comments@gplv3.fsf.org">gfdl-comments at gplv3.fsf.org</a></p>
-<p>Send comments on the GSFDL draft to: <a href="mailto:gsfdl-comments@gplv3.fsf.org">gsfdl-comments at gplv3.fsf.org</a></p>
+<p>Send comments on the AGPL draft to: <a href="mailto:agpl-comments@gplv3.fsf.org">agpl-comments at gplv3.fsf.org</a></p>
-</div>
-</html>

trunk/rtNoAuth/changeshown.html

@@ -94 +94 @@
-<OPTION VALUE="Drafter">Drafters' comments</OPTION>
-% }
+%# committee queues: A->8182, B->8183, C->8184, D->8185, T->8186 [for testing]
+%    foreach my $id ("CommitteeA","CommitteeB","CommitteeC","CommitteeD","CommitteeT") {
+%       $drafterQ->Load($id);
+%       if ($drafterQ->CurrentUserHasRight('CreateTicket')) {
+<OPTION VALUE="<% $id %>"><% $id %></OPTION>
+%       }
+%    }
+
-</SELECT>
-</td></tr>
@@ -197 +205 @@
-</td>
-<td>
-disabled name="ValueOf&#39;CF.NoteUrl&#39;" size="20" value="gplv3-draft-1
+name="ValueOf&#39;CF.NoteUrl&#39;" size="20" value="<% $filename %>
-</td></tr>
-
-<input type="hidden" NAME="&#39;CF.NoteUrl&#39;Op" VALUE="LIKE">
-input type="hidden" name="ValueOf&#39;CF.NoteUrl&#39;" value="gplv3-draft-1"
+!-- <input type="hidden" name="ValueOf&#39;CF.NoteUrl&#39;" value="<% $filename %>"> --
-
-
@@ -1020 +1028 @@
-# {{{ Show the results, if we were asked.
-if ( $ARGS{"DoSearch"} ) {
+if ($came_from !~ m#^/comment#) { $came_from = "/comments/$came_from"; }
-my $redirurl = "$came_from?Query=$Query&Order=$Order&OrderBy=$OrderBy&Rows=$RowsPerPage";
-   $m->redirect($redirurl);
@@ -1056 +1065 @@
-$Delete => 1
-$NewQuery => 1
+$filename => undef
-</%ARGS>
-

trunk/rtNoAuth/getannotations-devel.html

@@ -72 +72 @@
-
-($CurrentUser, $resp, $name) = getUser("foo");
-$CurrentUser
+".$CurrentUser->Name."
-
-my $drafter = '';
-my $DrafterQueue = RT::Queue->new($CurrentUser);
-$DrafterQueue->Load('Drafter');
-SeeQueue
+CreateTicket
-  $drafter = "drafter";
-}
+else {
+# committee queues: A->8182, B->8183, C->8184, D->8185, T->8186 [for testing]
+    foreach my $id ("CommitteeA","CommitteeB","CommitteeC","CommitteeD","CommitteeT") {
+        $DrafterQueue->Load($id);
+        if ($DrafterQueue->CurrentUserHasRight('CreateTicket')) {
+            $drafter = "$id";
+        }
+    }
+}
+
-
-$r->content_type('text/xml');

trunk/rtNoAuth/getannotations.html

@@ -72 +72 @@
-
-($CurrentUser, $resp, $name) = getUser("foo");
-$CurrentUser
+".$CurrentUser->Name."
-
-my $drafter = '';
-my $DrafterQueue = RT::Queue->new($CurrentUser);
-$DrafterQueue->Load('Drafter');
-SeeQueue
+CreateTicket
-  $drafter = "drafter";
-}
+else {
+# committee queues: A->8182, B->8183, C->8184, D->8185, T->8186 [for testing]
+    foreach my $id ("CommitteeA","CommitteeB","CommitteeC","CommitteeD","CommitteeT") {
+        $DrafterQueue->Load($id);
+        if ($DrafterQueue->CurrentUserHasRight('CreateTicket')) {
+            $drafter = "$id";
+        }
+    }
+}
+
-
-$r->content_type('text/xml');

trunk/rtNoAuth/readsay.html

@@ -64 +64 @@
-%   if ($Tickets->CountAll() > $Rows) {
-%       if ($StartAt > 1 ) {
-
+&Order=<% $Order %>
-%       }
-%   if (($Tickets->CountAll() > $Rows) && ($Tickets->CountAll() < $StartAt + $Rows)) {
@@ -70 +70 @@
-%   }
-%   if ($Tickets->CountAll() > $StartAt + $Rows) {
-
+&Order=<% $Order %>
-%   }
-%}
@@ -98 +98 @@
-%
-% while (my $item = $Tickets ? $Tickets->Next : $Ticket) {
-
+
+
+
+
-<% displayTicket(\$item,$showactions,0) %>
-% $Ticket = '';
@@ -253 +256 @@
-% }
- <br>
-$resp == 1
+($resp == 1) && ($item->CreatorObj->Name ne "ratiodoc")
-        <input type=hidden name="UpdateType" value="public">
-        <span class="TktLabel">Add comments:</span> <br/>
@@ -277 +280 @@
-use CGI qw/:standard/;
-use HTML::Scrubber;
-
+
+
+
-require "/var/www/stet/stetsubs.pl";
-our $issuequeue = 5; 
@@ -285 +290 @@
-my ($pass, $agr_vals, $thing);
-($CurrentUser, $resp, $name) = getUser("foo");
+
+
-$CurrentUser = $session{'CurrentUser'};
-
@@ -328 +335 @@
-}
-
+# DISABLE SPECIFIC LICENSES HERE:
+ if ($filename =~ m/^(gplv3-|lgpl-)/) { $resp = 0; }
+
+
-my $NewQueueObj = RT::Queue->new( $CurrentUser );
-$NewQueueObj->Load($issuequeue); 
@@ -367 +378 @@
-    my $Transactions = $item->Transactions;
-    my $allcomments = '';
-
+q blockquote 
-    while (my $Transaction = $Transactions->Next) {
-        
@@ -424 +435 @@
-    my $itemref = shift;
-    my $item = $$itemref;
-
-
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -440 +459 @@
-}
-
-
+
+
-}
-

trunk/rtNoAuth/readsay2.html

@@ -253 +253 @@
-% }
- <br>
-$resp == 1
+($resp == 1) && ($item->CreatorObj->Name != "ratiodoc")
-        <input type=hidden name="UpdateType" value="public">
-        <span class="TktLabel">Add comments:</span> <br/>
@@ -277 +277 @@
-use CGI qw/:standard/;
-use HTML::Scrubber;
-
+
+
+
-require "/var/www/stet/stetsubs.pl";
-our $issuequeue = 5; 
@@ -367 +369 @@
-    my $Transactions = $item->Transactions;
-    my $allcomments = '';
-
+q blockquote 
-    while (my $Transaction = $Transactions->Next) {
-        
@@ -424 +426 @@
-    my $itemref = shift;
-    my $item = $$itemref;
-
-
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -440 +450 @@
-}
-
-
+
+
-}
-

trunk/rtNoAuth/submitcomment-cachetoo.html

@@ -80 +80 @@
-$urlpath =~ s/http:\/\/([^\/]+)\/?(.*)\?.*/$2/;
-
-
+#
- $dompath = $ARGS{'DomPath'};
- $selectedtext = URI::Escape::uri_unescape($ARGS{'Selection'});
@@ -112 +112 @@
-                    Subject => $notesubj,
-#                      Owner => 'Nobody',
-
+CurrentUser->EmailAddress, # 
-                      #InitialPriority => '11',
-                      #FinalPriority => '20',
@@ -125 +125 @@
-                      );
-  ($id, my $transaction_object, my $err) = $ticket->Create(%ticket_vals);
-$err . "
+"submitcomment-cachetoo err: $err 
-  system("/home/orion/cacheresults.sh ".$urlpath." &");
-}

trunk/rtNoAuth/xmlresults-debug.html

@@ -25 +25 @@
-<response>
-% if ($Tickets) {
-
-
+
+
+
+
+
+
+
+
+
+
-%   if ($Tickets->CountAll() > $Rows) {
-%       if ($StartAt > 1 ) {
-             <a href="/comments/<% stripCrap($Tickets->First->FirstCustomFieldValue('NoteUrl')) %>?Query=<% $ARGS{'Query'} |n %>&amp;Rows=<%$Rows%>&amp;StartAt=<% (($StartAt - $Rows) < 0) ? 1 : ($StartAt - $Rows) |n%>">prev</a
+<pr>/comments/<% stripCrap($Tickets->First->FirstCustomFieldValue('NoteUrl')) %>?Query=<% $ARGS{'Query'} |n %>&amp;Rows=<%$Rows%>&amp;StartAt=<% (($StartAt - $Rows) < 0) ? 1 : ($StartAt - $Rows) |n%></pr
-%       }
-if (($Tickets->CountAll() > $Rows) && ($Tickets->CountAll() < $StartAt + $Rows)
-
+    if ($Tickets->CountAll() > $StartAt + $Rows
+
-% }
-
-
-
-
-
-
+
-</cs>
-% 
-<%perl> 
-    $Tickets->GotoFirstItem;
@@ -51 +53 @@
-</%perl>
-% } elsif ($Ticket) {
-
+
+
+
+
+
+
-% }
-% if ($Ticket || $Tickets) {
-% my $i = 0;
-% while (my $item = $Tickets ? $Tickets->Next : $Ticket) {
-notation
-
-
+t
+%# 
+%# 
-<s><% cleanNoteSel(\$item) %></s>
-<i><% $item->FirstCustomFieldValue('NoteStartNodeId') %></i>
-
-
-
-
+%# 
+,$name
+%# 
+%# 
-<id><% $item->id %></id>
-
+
+
-% $Ticket = '';
-% $i++;
@@ -75 +83 @@
-% }
-% else {
-gplv3-draft-1">change query
+<% $filename %>">search again
-% }
-</response>
@@ -98 +106 @@
-
-my $rsslink = "/comments/rt/rssresults.rdf?" . (($ARGS{'Query'}) ? ("Query=".$ARGS{'Query'}) : ("id=".$ARGS{'id'}));
-
+ . "&Order=DESC"
-#  my $printargs = param('Query')." (".$Tickets->CountAll()." found)";
-
@@ -108 +116 @@
-my ($Tickets, $Ticket);
-
+my $drafter = '';
+my $DrafterQueue = RT::Queue->new($CurrentUser);
+$DrafterQueue->Load('Drafter');
+if ($DrafterQueue->CurrentUserHasRight('CreateTicket')) {
+  $drafter = "drafter";
+}
+else {
+# committee queues: A->8182, B->8183, C->8184, D->8185, T->8186 [for testing]
+    foreach my $id ("CommitteeA","CommitteeB","CommitteeC","CommitteeD","CommitteeT") {
+        $DrafterQueue->Load($id);
+        if ($DrafterQueue->CurrentUserHasRight('CreateTicket')) {
+            $drafter = "$id";
+        }
+    }
+}
+
+
-if ($ARGS{'Query'}) {
+    my $Qargs = '';
+unless ($ARGS{'Query'} =~ /Queue/) {
+ $Qargs = " AND 'Queue.Name' != 'Drafter'";
+if ($drafter) {
+ $Qargs = '';
+}
+}
+
-    $Tickets = RT::Tickets->new($CurrentUser);
-# exclude, from this view, comments whose selection got messed up:
-
+ $Qargs
-    $Tickets->OrderBy( FIELD => 'id', ORDER => $ARGS{'Order'});
-}
-elsif ($ARGS{'id'}) {
-    $Ticket = RT::Ticket->new($CurrentUser);
-
+
+
+
+
+
-}
-
-
-
+
-
-
@@ -131 +167 @@
-$StartAt => 1
-$Order => 'DESC'
+$Query => "'CF.NoteUrl'%20LIKE%20'gplv3-draft-1'";
+$filename => 'gplv3-draft-1';
-</%ARGS>

trunk/rtNoAuth/xmlresults-intense.html

@@ -21 +21 @@
-%# License, version 3, and the GNU General Public License, version 2,
-%# along with this software.  If not, see <http://www.gnu.org/licenses/>.
-%
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-%
@@ -120 +119 @@
-my $DrafterQueue = RT::Queue->new($CurrentUser);
-$DrafterQueue->Load('Drafter');
-SeeQueue
+CreateTicket
-  $drafter = "drafter";
-}
+else {
+# committee queues: A->8182, B->8183, C->8184, D->8185, T->8186 [for testing]
+    foreach my $id ("CommitteeA","CommitteeB","CommitteeC","CommitteeD","CommitteeT") {
+        $DrafterQueue->Load($id);
+        if ($DrafterQueue->CurrentUserHasRight('CreateTicket')) {
+            $drafter = "$id";
+        }
+    }
+}
+
-
-if ($ARGS{'Query'}) {
-
+    
-unless ($ARGS{'Query'} =~ /Queue/) {
- $Qargs = " AND 'Queue.Name' != 'Drafter'";

trunk/stet-intense-shorter.js

@@ -400 +400 @@
-      }
-      resp_arrA = response.getElementsByTagName("agreement");
-N.length && (resp_arrN
+A.length && (resp_arrA
-        processAgreement(response);
-        did++;
@@ -1143 +1143 @@
-  myAgr.setAttribute('href','#');
-  loadHTMLtoDiv(myAgr.innerHTML+'ing...',myAgr.id);
-amp;
+
-}
-
@@ -1177 +1177 @@
-        namepass = decodeBase64(readCookie('__ac'));
-        var name = namepass.substr(0,namepass.indexOf(':'));
- <a href=\"http://gplv3.fsf.org/comments/classic.html\">old interface</a>
+
-<span id="selectsome" class="selectsome">select some text</span> and <a class="fakelink" onmousedown="javascript:XpathSel()">add a comment</a> | <a href="http://gplv3.fsf.org/comments/email.html">email your comment</a>','login');
-  }
-  else {
- <a href=\"http://gplv3.fsf.org/comments/classic.html\">old interface</a>
+
-  }
-}
@@ -1239 +1239 @@
-    newMe.appendChild(lLnk);
-
-!filename.match(/lgpl-draft-1/
+(!filename.match(/lgpl-draft-1/)) && (!filename.match(/gplv3-draft-3/)) && (!filename.match(/gplv3-draft-4/)
-    newMe.appendChild(document.createTextNode(' '));
-    rat = document.createElement('a');