From 9ecb93fe4f455d5b19fa469c19fe3da125e23a8d Mon Sep 17 00:00:00 2001
From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Fri, 4 Jun 2010 18:15:23 +0200
Subject: [PATCH] rename changes to actions

---
 lib/MojoFacets.pm                            |  2 +-
 lib/MojoFacets/{Changes.pm => Actions.pm}    | 20 ++++++++--------
 public/edit_table.js                         |  4 ++--
 public/mojo_facets.css                       |  8 +++----
 templates/{changes => actions}/edits.html.ep |  0
 templates/{changes => actions}/index.html.ep | 24 ++++++++++----------
 templates/{changes => actions}/view.html.ep  |  0
 templates/admin.html.ep                      |  8 +++----
 8 files changed, 33 insertions(+), 33 deletions(-)
 rename lib/MojoFacets/{Changes.pm => Actions.pm} (81%)
 rename templates/{changes => actions}/edits.html.ep (100%)
 rename templates/{changes => actions}/index.html.ep (64%)
 rename templates/{changes => actions}/view.html.ep (100%)

diff --git a/lib/MojoFacets.pm b/lib/MojoFacets.pm
index e68fde8..9a5b315 100644
--- a/lib/MojoFacets.pm
+++ b/lib/MojoFacets.pm
@@ -28,7 +28,7 @@ sub save_tx {
 				$time = $time_travel;
 			}
 
-			my $path = '/tmp/changes/';
+			my $path = '/tmp/actions/';
 			mkdir $path unless -e $path;
 			$path .= sprintf '%.4f.%s', $time, join('.', @$parts);
 
diff --git a/lib/MojoFacets/Changes.pm b/lib/MojoFacets/Actions.pm
similarity index 81%
rename from lib/MojoFacets/Changes.pm
rename to lib/MojoFacets/Actions.pm
index 1fb2cde..3e3f278 100644
--- a/lib/MojoFacets/Changes.pm
+++ b/lib/MojoFacets/Actions.pm
@@ -1,4 +1,4 @@
-package MojoFacets::Changes;
+package MojoFacets::Actions;
 
 use strict;
 use warnings;
@@ -18,28 +18,28 @@ sub index {
 
 	my $actions;
 
-	my $changes;
-	foreach my $path ( sort { $b cmp $a } glob '/tmp/changes/*' ) {
+	my $stats;
+	foreach my $path ( sort { $b cmp $a } glob '/tmp/actions/*' ) {
 		if ( $path =~ m{/((\d+\.\d+)\.data\.(.+))$} ) {
 			my ( $uid, $t, $action ) = ( $1, $2, $3 );
-			$actions->{$action}++;
+			$stats->{$action}++;
 			next if $action_regex && $action !~ m/^($action_regex)$/;
-			push @$changes, { uid => $uid, t => $t, action => $action }
-				if $#$changes < $max;
+			push @$actions, { uid => $uid, t => $t, action => $action }
+				if $#$actions < $max;
 		} else {
 			warn "ignore: $path\n";
 		}
 	}
 
-	# Render template "changes/index.html.ep" with message
-	$self->render(message => 'Latest Changes', changes => $changes, actions => $actions );
+	# Render template "actions/index.html.ep" with message
+	$self->render(actions => $actions, stats => $stats );
 }
 
 
 sub view {
 	my $self = shift;
 	my $uid = $self->param('uid');
-	$self->render( change => retrieve( "/tmp/changes/$uid" ), uid => $uid );
+	$self->render( change => retrieve( "/tmp/actions/$uid" ), uid => $uid );
 }
 
 sub _edit_path {
@@ -95,7 +95,7 @@ sub edit {
 		unlink $self->_edit_path . '/' . $t;
 	}
 
-	$self->redirect_to('/changes/edits');
+	$self->redirect_to('/actions/edits');
 }
 
 1;
diff --git a/public/edit_table.js b/public/edit_table.js
index 03a1ad8..5c8d00d 100644
--- a/public/edit_table.js
+++ b/public/edit_table.js
@@ -32,8 +32,8 @@ var cell_blur = function() {
 		if ( ! data ) {
 			data = new_content; // fallback to submited data for 304
 		} else {
-			if ( $('a.save_changes').length == 0 )
-			$('a.changes').before('<a class=save_changes href="/data/save">save</a>')
+			if ( $('a.save_actions').length == 0 )
+			$('a.actions').before('<a class=save_actions href="/data/save">save</a>')
 		}
 		var vals = data.split('¶');
 		data = vals.join('<span class=d>¶</span>');
diff --git a/public/mojo_facets.css b/public/mojo_facets.css
index 25b0747..3db2795 100644
--- a/public/mojo_facets.css
+++ b/public/mojo_facets.css
@@ -48,11 +48,11 @@ span.h {
 	font-weight: bold;
 }
 
-.admin .changes {
+.admin .actions {
 	float: right;
 }
 
-.admin .save_changes {
+.admin .save_actions {
 	float: right;
 	color: #f00;
 	padding-left: 1em;
@@ -164,7 +164,7 @@ a.facet {
 	text-decoration: none;
 }
 
-/* /changes */
+/* /actions */
 .change_box {
 	border: 3px dashed #f84;
 }
@@ -174,7 +174,7 @@ a.facet {
 	text-decoration: line-through;
 }
 
-/* /changes/edits */
+/* /actions/edits */
 
 tr.edit pre {
 	color: #000;
diff --git a/templates/changes/edits.html.ep b/templates/actions/edits.html.ep
similarity index 100%
rename from templates/changes/edits.html.ep
rename to templates/actions/edits.html.ep
diff --git a/templates/changes/index.html.ep b/templates/actions/index.html.ep
similarity index 64%
rename from templates/changes/index.html.ep
rename to templates/actions/index.html.ep
index 8366dc6..431e9b7 100644
--- a/templates/changes/index.html.ep
+++ b/templates/actions/index.html.ep
@@ -1,32 +1,32 @@
 % layout 'ui';
-<h2><%= $message %></h2>
+<h2>Latest actions</h2>
 
 <form class=action_filter>
-<input type=submit value="Filter changes">
+<input type=submit value="Filter">
 <ul>
-% foreach my $type ( sort keys %$actions ) {
+% foreach my $type ( sort keys %$stats ) {
 <li><label>
 <input type=checkbox name=action_filter value="<%= $type %>">
-<%= $type %><span class=count><%= $actions->{$type} %></span>
+<%= $type %><span class=count><%= $stats->{$type} %></span>
 </label>
 % }
 </ul>
-<input type=submit value="Filter changes">
+<input type=submit value="Filter">
 </form>
 
 <table>
 <tr><th>action</th><th>timestamp</th></tr>
-% foreach my $change ( @$changes ) {
+% foreach my $action ( @$actions ) {
 <tr><td>
-<a class="view" href="<%= url_for( controller => 'changes', action => 'view' )->query( uid => $change->{uid} ) %>"><%= $change->{action} %></a>
+<a class="view" href="<%= url_for( controller => 'actions', action => 'view' )->query( uid => $action->{uid} ) %>"><%= $action->{action} %></a>
 </td><td>
-<tt class=ts><%= $change->{t} %></tt>
+<tt class=ts><%= $action->{t} %></tt>
 </td></tr>
 % }
 </table>
 
-% my $more = ( $#$changes ) * 10;
-Show <a href="<%= url_for( controller => 'changes', action => 'index' )->query( max => $more ) %>"><%= $more %> changes</a>
+% my $more = ( $#$actions ) * 10;
+Show <a href="<%= url_for( controller => 'actions', action => 'index' )->query( max => $more ) %>"><%= $more %> actions</a>
 
 <script type="text/javascript" src="/js/date_pretty.js"></script>
 <script type="text/javascript">
@@ -46,11 +46,11 @@ $(document).ready( function(){
 				var form = $(data).filter('form');
 				console.debug('ajax',e,form);
 				e.html( form )
-				.addClass( 'change_box' )
+				.addClass( 'action_box' )
 				.append(
 					$('<input type=button value=hide>').click( function() {
 console.debug(this,link_html);
-					e.html( link_html ).removeClass( 'change_box' ).addClass( 'change_viewed' );
+					e.html( link_html ).removeClass( 'action_box' ).addClass( 'action_viewed' );
 					})
 				)
 				;
diff --git a/templates/changes/view.html.ep b/templates/actions/view.html.ep
similarity index 100%
rename from templates/changes/view.html.ep
rename to templates/actions/view.html.ep
diff --git a/templates/admin.html.ep b/templates/admin.html.ep
index ae71d80..b3865c4 100644
--- a/templates/admin.html.ep
+++ b/templates/admin.html.ep
@@ -9,17 +9,17 @@ items:
 <a href="<%= url_for( controller => 'data', action => 'items' )->query( show => $show ) %>" <%= $class %>><%= $show %></a>
 % }
 
-<span class=changes>
+<span class=actions>
 
 % if ( session('modified') ) {
 %  my $path = session('path');
-<a class=save_changes title="<%= $path %>" href="<%= url_for( controller => 'data', action => 'save', path => $path ) %>">save</a>
+<a class=save_actions title="<%= $path %>" href="<%= url_for( controller => 'data', action => 'save', path => $path ) %>">save</a>
 % }
 % if ( $self->can('_export_path') && glob $self->_export_path('*') ) {
 <a href="<%= url_for( controller => 'data', action => 'export' ) %>">export</a>
 % }
-<a href="<%= url_for( controller => 'changes', action => 'edits' ) %>">edits</a>
-<a href="<%= url_for( controller => 'changes', action => 'index' ) %>">changes</a>
+<a href="<%= url_for( controller => 'actions', action => 'edits' ) %>">edits</a>
+<a href="<%= url_for( controller => 'actions', action => 'index' ) %>">actions</a>
 </span>
 
 </div>
-- 
2.20.1