end of file newline cleanup+ some minor UI bundle property edits

romainguinot · romainguinot · commit fa096eb94c4e · 2011-11-04T15:01:26.000Z
git-svn-id: https://share-extras.googlecode.com/svn/trunk/Sandbox/Audit Dashlet@750 a3f5c567-fd0f-3a89-9b71-a290c5a5f590
diff --git a/config/alfresco/site-webscripts/org/alfresco/components/dashlets/audit-application-data.get.js b/config/alfresco/site-webscripts/org/alfresco/components/dashlets/audit-application-data.get.js
@@ -60,4 +60,4 @@ function main()
       status.redirect = true;
    }
 }
-main();
+main();
diff --git a/config/alfresco/site-webscripts/org/alfresco/components/dashlets/audit-application-data.get.json.ftl b/config/alfresco/site-webscripts/org/alfresco/components/dashlets/audit-application-data.get.json.ftl
@@ -1,7 +1,7 @@
 {
-   "count": "${auditresponse.count}",
-   "entries": 
-   [
+    "count": "${auditresponse.count}",
+    "entries":
+    [
     <#list auditresponse.entries as e>
 	{
 	    "id": "${e.id}",
@@ -19,7 +19,5 @@
 	    }
 	}<#if e_has_next>,</#if>
     </#list>
-   ]
+    ]
 }
-
-                        
diff --git a/config/alfresco/site-webscripts/org/alfresco/components/dashlets/audit-application.get.head.ftl b/config/alfresco/site-webscripts/org/alfresco/components/dashlets/audit-application.get.head.ftl
@@ -2,4 +2,4 @@
 <!-- Audit Application dashlet -->
 <@script type="text/javascript" src="${page.url.context}/modules/simple-dialog.js"></@script>
 <@link rel="stylesheet" type="text/css" href="${page.url.context}/res/components/dashlets/audit-application.css" />
-<@script type="text/javascript" src="${page.url.context}/res/components/dashlets/audit-application.js"></@script> 
+<@script type="text/javascript" src="${page.url.context}/res/components/dashlets/audit-application.js"></@script>
diff --git a/config/alfresco/site-webscripts/org/alfresco/components/dashlets/audit-application.get.html.ftl b/config/alfresco/site-webscripts/org/alfresco/components/dashlets/audit-application.get.html.ftl
@@ -68,4 +68,3 @@
 	</div>
     </#if>
 </div>
-
diff --git a/config/alfresco/site-webscripts/org/alfresco/components/dashlets/audit-application.get.js b/config/alfresco/site-webscripts/org/alfresco/components/dashlets/audit-application.get.js
@@ -32,6 +32,6 @@ function main()
 {
     model.userHasConfigPermission = getUserHasConfigPermission(user.name);
     model.userIsAdmin = user.isAdmin;
-    
+
 }
 main();
diff --git a/config/alfresco/site-webscripts/org/alfresco/components/dashlets/audit-application.get.properties b/config/alfresco/site-webscripts/org/alfresco/components/dashlets/audit-application.get.properties
@@ -4,15 +4,15 @@ audit.dashlet.link.configure=Configure
 audit.dashlet.link.help=Help
 audit.dashlet.link.help.url=http://code.google.com/p/share-extras/wiki/SampleAuditDashlet
 
-audit.dashlet.notConfigured=No application is configured
-audit.dashlet.notFound=The application could not be found
+audit.dashlet.notConfigured=No application is configured.
+audit.dashlet.notFound=The application could not be found !
 audit.dashlet.loading=Loading ...
-audit.dashlet.noEntries=No matching entries found
+audit.dashlet.noEntries=No matching entries found.
 audit.dashlet.searchWithinResults=Search within the {0} results
 audit.dashlet.valuefilteredOn=filtered on
 audit.dashlet.filteredResults={0} results ({1} filtered out)
-audit.dashlet.invalidSearch=Invalid search expression
-audit.dashlet.adminPrivilegesRequired=You need to be an admin user to query audit entries
+audit.dashlet.invalidSearch=Invalid search expression !
+audit.dashlet.adminPrivilegesRequired=You need to be an admin user to query audit entries.
 
 audit.dashlet.field.label.id=DB ID
 audit.dashlet.field.label.application=Application
diff --git a/config/alfresco/site-webscripts/org/alfresco/components/dashlets/audit-application.get_en.properties b/config/alfresco/site-webscripts/org/alfresco/components/dashlets/audit-application.get_en.properties
@@ -4,15 +4,15 @@ audit.dashlet.link.configure=Configure
 audit.dashlet.link.help=Help
 audit.dashlet.link.help.url=http://code.google.com/p/share-extras/wiki/SampleAuditDashlet
 
-audit.dashlet.notConfigured=No application is configured
-audit.dashlet.notFound=The application could not be found
+audit.dashlet.notConfigured=No application is configured.
+audit.dashlet.notFound=The application could not be found !
 audit.dashlet.loading=Loading ...
-audit.dashlet.noEntries=No matching entries found
+audit.dashlet.noEntries=No matching entries found.
 audit.dashlet.searchWithinResults=Search within the {0} results
 audit.dashlet.valuefilteredOn=filtered on
 audit.dashlet.filteredResults={0} results ({1} filtered out)
-audit.dashlet.invalidSearch=Invalid search expression
-audit.dashlet.adminPrivilegesRequired=You need to be an admin user to query audit entries
+audit.dashlet.invalidSearch=Invalid search expression !
+audit.dashlet.adminPrivilegesRequired=You need to be an admin user to query audit entries.
 
 audit.dashlet.field.label.id=DB ID
 audit.dashlet.field.label.application=Application
diff --git a/config/alfresco/site-webscripts/org/alfresco/components/dashlets/audit-application.get_fr.properties b/config/alfresco/site-webscripts/org/alfresco/components/dashlets/audit-application.get_fr.properties
@@ -4,15 +4,15 @@ audit.dashlet.link.configure=Configurer
 audit.dashlet.link.help=Aide
 audit.dashlet.link.help.url=http://code.google.com/p/share-extras/wiki/SampleAuditDashlet
 
-audit.dashlet.notConfigured=Aucune application configur\u00e9e
-audit.dashlet.notFound=L'application n'a pas \u00e9t\u00e9 trouv\u00e9e
+audit.dashlet.notConfigured=Aucune application configur\u00e9e.
+audit.dashlet.notFound=L'application n'a pas \u00e9t\u00e9 trouv\u00e9e !
 audit.dashlet.loading=Chargement ...
-audit.dashlet.noEntries=Aucun \u00e9v\u00e8nement correspondant au crit\u00e8re de recherche
+audit.dashlet.noEntries=Aucun \u00e9v\u00e8nement correspondant au crit\u00e8re de recherche.
 audit.dashlet.searchWithinResults=Chercher parmi les {0} r\u00e9sultats
 audit.dashlet.valuefilteredOn=filtr\u00e9e sur
 audit.dashlet.filteredResults={0} r\u00e9sultats ({1} filtr\u00e9s)
-audit.dashlet.invalidSearch=Recherche invalide
-audit.dashlet.adminPrivilegesRequired=Vous devez \u00eatre un administrateur pour consulter les donn\u00e9es d'audit
+audit.dashlet.invalidSearch=Recherche invalide !
+audit.dashlet.adminPrivilegesRequired=Vous devez \u00eatre un administrateur pour consulter les donn\u00e9es d'audit.
 
 audit.dashlet.field.label.id=DB ID
 audit.dashlet.field.label.application=Application
diff --git a/config/alfresco/site-webscripts/org/alfresco/modules/dashlets/audit-application-applist.get.js b/config/alfresco/site-webscripts/org/alfresco/modules/dashlets/audit-application-applist.get.js
@@ -1,8 +1,8 @@
 function main()
 {
-      
+
     // get the live list from the repo of currently registered audit applications
-    // requires to be logged in as an admin user 
+    // requires to be logged in as an admin user
     var uri = "/api/audit/control";
     var connector = remote.connect("alfresco");
     var result = connector.get(uri);
@@ -19,4 +19,4 @@ function main()
     }
 
 }
-main();
+main();
diff --git a/config/alfresco/site-webscripts/org/alfresco/modules/dashlets/audit-application-applist.get.json.ftl b/config/alfresco/site-webscripts/org/alfresco/modules/dashlets/audit-application-applist.get.json.ftl
@@ -12,4 +12,4 @@
 	}<#if app_has_next>,</#if>
 	</#list>
    ]
-}
+}
diff --git a/config/alfresco/site-webscripts/org/alfresco/modules/dashlets/audit-application-config.get.html.ftl b/config/alfresco/site-webscripts/org/alfresco/modules/dashlets/audit-application-config.get.html.ftl
@@ -68,4 +68,4 @@
            </div>
       </div>
    </div>
-</div>
+</div>
diff --git a/config/alfresco/site-webscripts/org/alfresco/modules/dashlets/audit-application-config.get.js b/config/alfresco/site-webscripts/org/alfresco/modules/dashlets/audit-application-config.get.js
@@ -1 +1 @@
-<import resource="classpath:alfresco/site-webscripts/org/alfresco/callutils.js">
+<import resource="classpath:alfresco/site-webscripts/org/alfresco/callutils.js">
diff --git a/config/alfresco/site-webscripts/org/alfresco/modules/dashlets/audit-application-config.get_fr.properties b/config/alfresco/site-webscripts/org/alfresco/modules/dashlets/audit-application-config.get_fr.properties
@@ -5,7 +5,7 @@ audit.dashlet.config.label.valueFilter=Filtre sur la valeur (Exact)
 audit.dashlet.config.label.limit=Nombre d'entr\u00e9es Max
 audit.dashlet.config.label.rowsPerPage=Entr\u00e9es par page
 
-audit.dashlet.config.label.additionalQueryParams=Params additionnels
+audit.dashlet.config.label.additionalQueryParams=Param\u00e8tres additionnels
 
 audit.dashlet.config.label.show_fields=Afficher
 
diff --git a/source/web/components/dashlets/audit-application.js b/source/web/components/dashlets/audit-application.js
@@ -28,35 +28,35 @@
  */
 (function()
 {
-   /**
+    /**
     * YUI Library aliases
     */
-   var Dom = YAHOO.util.Dom,
+    var Dom = YAHOO.util.Dom,
       Event = YAHOO.util.Event;
 
-   /**
+    /**
     * Alfresco Slingshot aliases
     */
-   var $html = Alfresco.util.encodeHTML,
+    var $html = Alfresco.util.encodeHTML,
       $combine = Alfresco.util.combinePaths;
 
-   /**
+    /**
     * Dashboard AuditApplication constructor.
-    * 
+    *
     * @param {String} htmlId The HTML id of the parent element
     * @return {Alfresco.dashlet.AuditApplication} The new component instance
     * @constructor
     */
-   Alfresco.dashlet.AuditApplication = function AuditApplication_constructor(htmlId)
-   {
+    Alfresco.dashlet.AuditApplication = function AuditApplication_constructor(htmlId)
+    {
       return Alfresco.dashlet.AuditApplication.superclass.constructor.call(this, "Alfresco.dashlet.AuditApplication", htmlId, ["datatable", "datasource", "paginator", "autocomplete"]);
    };
 
-   /**
+    /**
     * Extend from Alfresco.component.Base and add class implementation
     */
-   YAHOO.extend(Alfresco.dashlet.AuditApplication, Alfresco.component.Base,
-   {
+    YAHOO.extend(Alfresco.dashlet.AuditApplication, Alfresco.component.Base,
+    {
 	/**
 	* Object container for initialization options
 	*
@@ -118,50 +118,50 @@
 	    */
 	    rowsPerPage: "",
 
-            /**
-            * Additional audit API server side query params
-            *
-            * @property additionalQueryParams
-            * @type string
-            * @default ""
-            */
-            additionalQueryParams: "",
-
-            /**
-            * Whether or not to show the ID column
-            *
-            * @property show_id_column
-            * @type string
-            * @default ""
-            */
-            show_id_column: "",
-
-            /**
-            * Whether or not to show the user column
-            *
-            * @property show_user_column
-            * @type string
-            * @default ""
-            */
-            show_user_column: "",
-
-            /**
-            * Whether or not to show the time column
-            *
-            * @property show_time_column
-            * @type string
-            * @default ""
-            */
-            show_time_column: "",
-
-            /**
-            * Whether or not to show the values column
-            *
-            * @property show_values_column
-            * @type string
-            * @default ""
-            */
-            show_values_column: ""
+	    /**
+	    * Additional audit API server side query params
+	    *
+	    * @property additionalQueryParams
+	    * @type string
+	    * @default ""
+	    */
+	    additionalQueryParams: "",
+
+	    /**
+	    * Whether or not to show the ID column
+	    *
+	    * @property show_id_column
+	    * @type string
+	    * @default ""
+	    */
+	    show_id_column: "",
+
+	    /**
+	    * Whether or not to show the user column
+	    *
+	    * @property show_user_column
+	    * @type string
+	    * @default ""
+	    */
+	    show_user_column: "",
+
+	    /**
+	    * Whether or not to show the time column
+	    *
+	    * @property show_time_column
+	    * @type string
+	    * @default ""
+	    */
+	    show_time_column: "",
+
+	    /**
+	    * Whether or not to show the values column
+	    *
+	    * @property show_values_column
+	    * @type string
+	    * @default ""
+	    */
+	    show_values_column: ""
 
 	},
 
@@ -674,21 +674,21 @@
 	    this.entriesDataSource = myDataSource;
 	    this.dataTable = myDataTable;
 
-            // column display/hide
-            this.showOrHideColumn(0,this.options.show_id_column);
-            this.showOrHideColumn(1,this.options.show_user_column);
-            this.showOrHideColumn(2,this.options.show_time_column);
-            this.showOrHideColumn(3,this.options.show_values_column);
+	    // column display/hide
+	    this.showOrHideColumn(0,this.options.show_id_column);
+	    this.showOrHideColumn(1,this.options.show_user_column);
+	    this.showOrHideColumn(2,this.options.show_time_column);
+	    this.showOrHideColumn(3,this.options.show_values_column);
 
 	},
 
 	showOrHideColumn : function  AuditApplication_showOrHideColumn(column_number,show)
-        {
-            if(show == "show")
-               this.dataTable.showColumn(column_number);
-            else
-                this.dataTable.hideColumn(column_number);
-        },
+	{
+	    if(show == "show")
+	       this.dataTable.showColumn(column_number);
+	    else
+		this.dataTable.hideColumn(column_number);
+	},
 
 	// This is the searchbox filter function 
 	// the complete results will be filtered out according to the query before being returned for display 
@@ -934,7 +934,7 @@
 	{
 	    if (e)
 		Event.preventDefault(e); // Stop browser's default click behaviour for the link
-	    
+
 	    this.lastButtonRefreshEventTimeStamp = new Date().getTime();
 	    var that = this; // "that" is the new "this" :), i.e access the dashlet object (current this) inside setTimeout
 	    setTimeout(function() 
@@ -1147,4 +1147,6 @@
 		this.configDialog.show();
 	}
     });
-})();
+    }
+)
+();

Original file line number	Diff line number	Diff line change
`@@ -60,4 +60,4 @@ function main()`
`60`	`60`	`status.redirect = true;`
`61`	`61`	`}`
`62`	`62`	`}`
`63`		`-main();`
	`63`	`+main();`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`		`- "count": "${auditresponse.count}",`
`3`		`- "entries":`
`4`		`- [`
	`2`	`+ "count": "${auditresponse.count}",`
	`3`	`+ "entries":`
	`4`	`+ [`
`5`	`5`	`<#list auditresponse.entries as e>`
`6`	`6`	`{`
`7`	`7`	`"id": "${e.id}",`
`@@ -19,7 +19,5 @@`
`19`	`19`	`}`
`20`	`20`	`}<#if e_has_next>,</#if>`
`21`	`21`	`</#list>`
`22`		`- ]`
	`22`	`+ ]`
`23`	`23`	`}`
`24`		`-`
`25`		`-`
-Original file line number
+Diff line change
 	</div>
     </#if>
 </div>
+-
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,6 @@ function main()`
`32`	`32`	`{`
`33`	`33`	`model.userHasConfigPermission = getUserHasConfigPermission(user.name);`
`34`	`34`	`model.userIsAdmin = user.isAdmin;`
`35`		`-`
	`35`	`+`
`36`	`36`	`}`
`37`	`37`	`main();`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`function main()`
`2`	`2`	`{`
`3`		`-`
	`3`	`+`
`4`	`4`	`// get the live list from the repo of currently registered audit applications`
`5`		`- // requires to be logged in as an admin user`
	`5`	`+ // requires to be logged in as an admin user`
`6`	`6`	`var uri = "/api/audit/control";`
`7`	`7`	`var connector = remote.connect("alfresco");`
`8`	`8`	`var result = connector.get(uri);`
`@@ -19,4 +19,4 @@ function main()`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`}`
`22`		`-main();`
	`22`	`+main();`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,4 @@`
`12`	`12`	`}<#if app_has_next>,</#if>`
`13`	`13`	`</#list>`
`14`	`14`	`]`
`15`		`-}`
	`15`	`+}`