? .DS_Store
? commitlog/.DS_Store
Index: commitlog/commitlog.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/versioncontrol/commitlog/commitlog.css,v
retrieving revision 1.6
diff -u -p -r1.6 commitlog.css
--- commitlog/commitlog.css 16 Oct 2009 14:15:27 -0000 1.6
+++ commitlog/commitlog.css 19 Nov 2010 01:59:44 -0000
@@ -1,27 +1,128 @@
/* $Id: commitlog.css,v 1.6 2009/10/16 14:15:27 sdboyer Exp $ */
-.commitlog pre {
- margin-top: 0.6em;
- white-space: pre-wrap; /* css-3 */
- white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
- white-space: -pre-wrap; /* Opera 4-6 */
- white-space: -o-pre-wrap; /* Opera 7 */
- word-wrap: break-word; /* Internet Explorer 5.5+ */
+/* Global view */
+
+.view-commitlog-global-commits .view-content h3 {
+ margin: 15px 0 10px;
+ font-size: 1.35em;
+}
+
+.view-commitlog-global-commits .commit-global {
+ font-weight: bold;
+ margin-bottom: 5px;
+}
+
+.view-commitlog-global-commits li.views-row {
+ background: none;
+ list-style-type: none;
+ list-style-image: none;
+ padding: 0;
+}
+
+.view-commitlog-commit-items .views-field-nothing {
+ font-size: 1.1em;
+}
+
+.view-commitlog-global-commits .views-label-revision-1 {
+ padding-left: 10px;
+ font-style: italic;
+}
+
+.view-commitlog-global-commits .views-field-view {
+ font-weight: normal;
+}
+
+.view-commitlog-global-commits .views-field-message {
+ background: #F6F6F2;
+ padding: 1px;
+ margin: 0 0 2em 0;
+ border-bottom: solid 1px #E1E1DB;
+ font-size: 0.923em;
+}
+
+
+/* Author view */
+
+.view-commitlog-author-commits .view-content h3 {
+ margin: 15px 0 10px;
+ font-size: 1.35em;
+}
+
+.view-commitlog-author-commits .commit-author {
+ font-weight: bold;
+ margin-bottom: 5px;
+}
+
+.view-commitlog-author-commits li.views-row {
+ background: none;
+ list-style-type: none;
+ list-style-image: none;
+ padding: 0;
}
-.commitlog .operation {
- margin-top: 0.4em;
- margin-bottom: 0.4em;
+.view-commitlog-author-items .views-field-nothing {
+ font-size: 1.1em;
}
-.commitlog .items {
- line-height: 1.4em;
+.view-commitlog-author-commits .views-label-revision-1 {
+ padding-left: 10px;
+ font-style: italic;
}
-.commitlog .commitlog-messages {
- margin-bottom: 2em;
+.view-commitlog-author-commits .views-field-view {
+ font-weight: normal;
}
-.commitlog h3 {
- margin-top: 1.0em;
+.view-commitlog-author-commits .views-field-message {
+ background: #F6F6F2;
+ padding: 1px;
+ margin: 0 0 2em 0;
+ border-bottom: solid 1px #E1E1DB;
+ font-size: 0.923em;
}
+
+/* Repository */
+
+.view-commitlog-repository-commits .view-content h3 {
+ margin: 15px 0 10px;
+ font-size: 1.35em;
+}
+
+.view-commitlog-repository-commits .commit-repository {
+ font-weight: bold;
+ margin-bottom: 5px;
+}
+
+.view-commitlog-repository-commits .item-list {
+}
+
+.view-commitlog-repository-commits li.views-row {
+ background: none;
+ list-style-type: none;
+ list-style-image: none;
+ padding: 0;
+}
+
+.view-commitlog-repository-items .views-field-nothing {
+ font-size: 1.1em;
+}
+
+.view-commitlog-repository-commits .views-label-revision-1 {
+ padding-left: 10px;
+ font-style: italic;
+}
+
+.view-commitlog-repository-commits .views-field-view {
+ font-weight: normal;
+}
+
+.view-commitlog-repository-commits .views-field-message {
+ background: #F6F6F2;
+ padding: 1px;
+ margin: 0 0 2em 0;
+ border-bottom: solid 1px #E1E1DB;
+ font-size: 0.923em;
+}
+
+
+
Index: commitlog/commitlog.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/versioncontrol/commitlog/commitlog.module,v
retrieving revision 1.69
diff -u -p -r1.69 commitlog.module
--- commitlog/commitlog.module 17 Nov 2010 21:18:03 -0000 1.69
+++ commitlog/commitlog.module 19 Nov 2010 01:59:44 -0000
@@ -351,6 +351,8 @@ function commitlog_operations_filtered_p
function commitlog_operations_page($type = NULL, $argument = NULL) {
// TODO: Add CSS?
// TODO: Preprocess functions to assign our own templates to these views?
+ $path = drupal_get_path('module','commitlog');
+ drupal_add_css($path .'/commitlog.css', 'module');
if ($type == 'author' && !is_null($argument)) {
$output = views_embed_view('commitlog_author_commits', 'default', $argument);
}
Index: commitlog/includes/commitlog.views_default.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/versioncontrol/commitlog/includes/commitlog.views_default.inc,v
retrieving revision 1.1
diff -u -p -r1.1 commitlog.views_default.inc
--- commitlog/includes/commitlog.views_default.inc 17 Nov 2010 21:18:03 -0000 1.1
+++ commitlog/includes/commitlog.views_default.inc 19 Nov 2010 01:59:44 -0000
@@ -4,18 +4,19 @@
/**
* @file
* Provide default views for use by the commitlog module.
-
+ */
+
/**
* Implementation of hook_views_default_views().
*/
function commitlog_views_default_views() {
$views = array();
- /**
- * Global commit view
+ /*
+ * View 'commitlog_author_commits'
*/
$view = new view;
- $view->name = 'commitlog_global_commits';
- $view->description = 'Commitlog Global Commit Log';
+ $view->name = 'commitlog_author_commits';
+ $view->description = 'VersionControl Commits By Author';
$view->tag = 'VersionControl Core';
$view->view_php = '';
$view->base_table = 'versioncontrol_operations';
@@ -182,7 +183,7 @@ function commitlog_views_default_views()
'nothing' => array(
'label' => '',
'alter' => array(
- 'text' => 'Commit [revision] by [author] at [date]',
+ 'text' => '',
'make_link' => 0,
'path' => '',
'link_class' => '',
@@ -195,8 +196,8 @@ function commitlog_views_default_views()
'max_length' => '',
'word_boundary' => 1,
'ellipsis' => 1,
- 'strip_tags' => 0,
'html' => 0,
+ 'strip_tags' => 0,
),
'empty' => '',
'hide_empty' => 0,
@@ -253,8 +254,8 @@ function commitlog_views_default_views()
'max_length' => '',
'word_boundary' => TRUE,
'ellipsis' => TRUE,
- 'html' => FALSE,
'strip_tags' => FALSE,
+ 'html' => FALSE,
),
'empty' => '',
'hide_empty' => 0,
@@ -262,225 +263,16 @@ function commitlog_views_default_views()
'view' => 'commitlog_commit_items',
'display' => 'default',
'arguments' => '[revision_1]',
- 'query_aggregation' => 1,
+ 'query_aggregation' => 0,
'exclude' => 0,
'id' => 'view',
'table' => 'views',
'field' => 'view',
'relationship' => 'none',
),
- ));
- $handler->override_option('access', array(
- 'type' => 'none',
- ));
- $handler->override_option('cache', array(
- 'type' => 'none',
- ));
- $handler->override_option('style_options', array(
- 'grouping' => 'date_1',
- ));
- $views[$view->name] = $view;
-
- /**
- * Per repository commit view.
- */
- $view = new view;
- $view->name = 'commitlog_repository_commits';
- $view->description = 'VersionControl Repository Commits';
- $view->tag = 'VersionControl Core';
- $view->view_php = '';
- $view->base_table = 'versioncontrol_operations';
- $view->is_cacheable = FALSE;
- $view->api_version = 2;
- $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
- $handler = $view->new_display('default', 'Defaults', 'default');
- $handler->override_option('fields', array(
- 'author' => array(
- 'label' => 'Author',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'exclude' => 1,
- 'id' => 'author',
- 'table' => 'versioncontrol_operations',
- 'field' => 'author',
- 'relationship' => 'none',
- ),
- 'date_1' => array(
- 'label' => 'Date',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'date_format' => 'custom',
- 'custom_date_format' => 'F j, Y',
- 'exclude' => 1,
- 'id' => 'date_1',
- 'table' => 'versioncontrol_operations',
- 'field' => 'date',
- 'relationship' => 'none',
- ),
- 'vc_op_id' => array(
- 'label' => 'Operation ID',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'set_precision' => FALSE,
- 'precision' => 0,
- 'decimal' => '.',
- 'separator' => ',',
- 'prefix' => '',
- 'suffix' => '',
- 'exclude' => 1,
- 'id' => 'vc_op_id',
- 'table' => 'versioncontrol_operations',
- 'field' => 'vc_op_id',
- 'relationship' => 'none',
- ),
- 'revision' => array(
- 'label' => 'Revision',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 1,
- 'max_length' => '10',
- 'word_boundary' => 0,
- 'ellipsis' => 0,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'exclude' => 1,
- 'id' => 'revision',
- 'table' => 'versioncontrol_operations',
- 'field' => 'revision',
- 'relationship' => 'none',
- ),
- 'date' => array(
- 'label' => 'Date',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'date_format' => 'custom',
- 'custom_date_format' => 'G:i',
- 'exclude' => 1,
- 'id' => 'date',
- 'table' => 'versioncontrol_operations',
- 'field' => 'date',
- 'relationship' => 'none',
- ),
- 'nothing' => array(
+ 'message' => array(
'label' => '',
'alter' => array(
- 'text' => 'Commit [revision] by [author] at [date]',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'exclude' => 0,
- 'id' => 'nothing',
- 'table' => 'views',
- 'field' => 'nothing',
- 'relationship' => 'none',
- ),
- 'revision_1' => array(
- 'label' => 'Revision',
- 'alter' => array(
'alter_text' => 0,
'text' => '',
'make_link' => 0,
@@ -501,48 +293,15 @@ function commitlog_views_default_views()
'empty' => '',
'hide_empty' => 0,
'empty_zero' => 0,
- 'exclude' => 1,
- 'id' => 'revision_1',
- 'table' => 'versioncontrol_operations',
- 'field' => 'revision',
- 'relationship' => 'none',
- ),
- 'view' => array(
- 'label' => '',
- 'alter' => array(
- 'alter_text' => FALSE,
- 'text' => '',
- 'make_link' => FALSE,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => FALSE,
- 'max_length' => '',
- 'word_boundary' => TRUE,
- 'ellipsis' => TRUE,
- 'strip_tags' => FALSE,
- 'html' => FALSE,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'view' => 'commitlog_commit_items',
- 'display' => 'default',
- 'arguments' => '[revision_1]',
- 'query_aggregation' => 0,
'exclude' => 0,
- 'id' => 'view',
- 'table' => 'views',
- 'field' => 'view',
+ 'id' => 'message',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'message',
'relationship' => 'none',
),
));
$handler->override_option('arguments', array(
- 'name' => array(
+ 'author' => array(
'default_action' => 'ignore',
'style_plugin' => 'default_summary',
'style_options' => array(),
@@ -559,9 +318,9 @@ function commitlog_views_default_views()
'case' => 'none',
'path_case' => 'none',
'transform_dash' => 0,
- 'id' => 'name',
- 'table' => 'versioncontrol_repositories',
- 'field' => 'name',
+ 'id' => 'author',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'author',
'validate_user_argument_type' => 'uid',
'validate_user_roles' => array(
'2' => 0,
@@ -604,8 +363,8 @@ function commitlog_views_default_views()
));
$views[$view->name] = $view;
- /**
- * A list of items modified in each commit
+ /*
+ * View 'commitlog_commit_items'
*/
$view = new view;
$view->name = 'commitlog_commit_items';
@@ -752,14 +511,14 @@ function commitlog_views_default_views()
'grouping' => '',
'type' => 'ul',
));
- $views[$view->name] = $view;
+ $views[$view->name] = $view;
- /**
- * Per author commit view.
+ /*
+ * View 'commitlog_global_commits'
*/
$view = new view;
- $view->name = 'commitlog_author_commits';
- $view->description = 'VersionControl Commits By Author';
+ $view->name = 'commitlog_global_commits';
+ $view->description = 'Commitlog Global Commit Log';
$view->tag = 'VersionControl Core';
$view->view_php = '';
$view->base_table = 'versioncontrol_operations';
@@ -926,10 +685,10 @@ function commitlog_views_default_views()
'nothing' => array(
'label' => '',
'alter' => array(
- 'text' => 'Commit [revision] by [author] at [date]',
+ 'text' => '',
'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
+ 'path' => '#',
+ 'link_class' => 'global-author',
'alt' => '',
'prefix' => '',
'suffix' => '',
@@ -939,8 +698,8 @@ function commitlog_views_default_views()
'max_length' => '',
'word_boundary' => 1,
'ellipsis' => 1,
- 'strip_tags' => 0,
'html' => 0,
+ 'strip_tags' => 0,
),
'empty' => '',
'hide_empty' => 0,
@@ -997,8 +756,8 @@ function commitlog_views_default_views()
'max_length' => '',
'word_boundary' => TRUE,
'ellipsis' => TRUE,
- 'strip_tags' => FALSE,
'html' => FALSE,
+ 'strip_tags' => FALSE,
),
'empty' => '',
'hide_empty' => 0,
@@ -1006,7 +765,7 @@ function commitlog_views_default_views()
'view' => 'commitlog_commit_items',
'display' => 'default',
'arguments' => '[revision_1]',
- 'query_aggregation' => 0,
+ 'query_aggregation' => 1,
'exclude' => 0,
'id' => 'view',
'table' => 'views',
@@ -1030,8 +789,8 @@ function commitlog_views_default_views()
'max_length' => '',
'word_boundary' => 1,
'ellipsis' => 1,
- 'strip_tags' => 0,
'html' => 0,
+ 'strip_tags' => 0,
),
'empty' => '',
'hide_empty' => 0,
@@ -1043,58 +802,6 @@ function commitlog_views_default_views()
'relationship' => 'none',
),
));
- $handler->override_option('arguments', array(
- 'author' => array(
- 'default_action' => 'ignore',
- 'style_plugin' => 'default_summary',
- 'style_options' => array(),
- 'wildcard' => 'all',
- 'wildcard_substitution' => 'All',
- 'title' => '',
- 'breadcrumb' => '',
- 'default_argument_type' => 'fixed',
- 'default_argument' => '',
- 'validate_type' => 'none',
- 'validate_fail' => 'not found',
- 'glossary' => 0,
- 'limit' => '0',
- 'case' => 'none',
- 'path_case' => 'none',
- 'transform_dash' => 0,
- 'id' => 'author',
- 'table' => 'versioncontrol_operations',
- 'field' => 'author',
- 'validate_user_argument_type' => 'uid',
- 'validate_user_roles' => array(
- '2' => 0,
- ),
- 'relationship' => 'none',
- 'default_options_div_prefix' => '',
- 'default_argument_user' => 0,
- 'default_argument_fixed' => '',
- 'default_argument_php' => '',
- 'validate_argument_node_type' => array(
- 'project_project' => 0,
- 'company' => 0,
- 'page' => 0,
- 'person' => 0,
- 'story' => 0,
- ),
- 'validate_argument_node_access' => 0,
- 'validate_argument_nid_type' => 'nid',
- 'validate_argument_vocabulary' => array(
- '1' => 0,
- ),
- 'validate_argument_type' => 'tid',
- 'validate_argument_transform' => 0,
- 'validate_user_restrict_roles' => 0,
- 'validate_argument_project_term_argument_type' => 'tid',
- 'validate_argument_project_term_argument_action_top_without' => 'pass',
- 'validate_argument_project_term_argument_action_top_with' => 'pass',
- 'validate_argument_project_term_argument_action_child' => 'pass',
- 'validate_argument_php' => '',
- ),
- ));
$handler->override_option('access', array(
'type' => 'none',
));
@@ -1106,12 +813,12 @@ function commitlog_views_default_views()
));
$views[$view->name] = $view;
- /**
- * Per-author commit view
+ /*
+ * View 'commitlog_repository_commits'
*/
$view = new view;
- $view->name = 'commitlog_user_commits';
- $view->description = 'A per-user commit log.';
+ $view->name = 'commitlog_repository_commits';
+ $view->description = 'A per-repository commit log.';
$view->tag = 'VersionControl Core';
$view->view_php = '';
$view->base_table = 'versioncontrol_operations';
@@ -1278,7 +985,7 @@ function commitlog_views_default_views()
'nothing' => array(
'label' => '',
'alter' => array(
- 'text' => 'Commit [revision] by [author] at [date]',
+ 'text' => '',
'make_link' => 0,
'path' => '',
'link_class' => '',
@@ -1291,8 +998,8 @@ function commitlog_views_default_views()
'max_length' => '',
'word_boundary' => 1,
'ellipsis' => 1,
- 'strip_tags' => 0,
'html' => 0,
+ 'strip_tags' => 0,
),
'empty' => '',
'hide_empty' => 0,
@@ -1365,9 +1072,38 @@ function commitlog_views_default_views()
'field' => 'view',
'relationship' => 'none',
),
+ 'message' => array(
+ 'label' => '',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'exclude' => 0,
+ 'id' => 'message',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'message',
+ 'relationship' => 'none',
+ ),
));
$handler->override_option('arguments', array(
- 'author' => array(
+ 'repo_id' => array(
'default_action' => 'ignore',
'style_plugin' => 'default_summary',
'style_options' => array(),
@@ -1379,14 +1115,11 @@ function commitlog_views_default_views()
'default_argument' => '',
'validate_type' => 'none',
'validate_fail' => 'not found',
- 'glossary' => 0,
- 'limit' => '0',
- 'case' => 'none',
- 'path_case' => 'none',
- 'transform_dash' => 0,
- 'id' => 'author',
- 'table' => 'versioncontrol_operations',
- 'field' => 'author',
+ 'break_phrase' => 0,
+ 'not' => 0,
+ 'id' => 'repo_id',
+ 'table' => 'versioncontrol_repositories',
+ 'field' => 'repo_id',
'validate_user_argument_type' => 'uid',
'validate_user_roles' => array(
'2' => 0,
@@ -1426,12 +1159,12 @@ function commitlog_views_default_views()
));
$views[$view->name] = $view;
- /**
- * Per-author commit view
+ /*
+ * View 'commitlog_user_commits'
*/
$view = new view;
- $view->name = 'commitlog_repository_commits';
- $view->description = 'A per-repository commit log.';
+ $view->name = 'commitlog_user_commits';
+ $view->description = 'A per-user commit log.';
$view->tag = 'VersionControl Core';
$view->view_php = '';
$view->base_table = 'versioncontrol_operations';
@@ -1687,7 +1420,7 @@ function commitlog_views_default_views()
),
));
$handler->override_option('arguments', array(
- 'repo_id' => array(
+ 'author' => array(
'default_action' => 'ignore',
'style_plugin' => 'default_summary',
'style_options' => array(),
@@ -1699,11 +1432,14 @@ function commitlog_views_default_views()
'default_argument' => '',
'validate_type' => 'none',
'validate_fail' => 'not found',
- 'break_phrase' => 0,
- 'not' => 0,
- 'id' => 'repo_id',
- 'table' => 'versioncontrol_repositories',
- 'field' => 'repo_id',
+ 'glossary' => 0,
+ 'limit' => '0',
+ 'case' => 'none',
+ 'path_case' => 'none',
+ 'transform_dash' => 0,
+ 'id' => 'author',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'author',
'validate_user_argument_type' => 'uid',
'validate_user_roles' => array(
'2' => 0,
@@ -1746,3 +1482,4 @@ function commitlog_views_default_views()
return $views;
}
+