remove ISO categories from ws-client ResourceQuery + minor improvements of GWT API

3 files changed, 51 insertions, 29 deletions

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/_base.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/_base.html.erb
new file mode 100644
index 00000000000..4f57e2112ff
--- /dev/null
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/_base.html.erb
@@ -0,0 +1,51 @@
+<script type="text/javascript">
+  var config = {
+    "sonar_url":"<%= url_for(:controller => '/', :action => '', :only_path => true, :trailing_slash => false)[0...-2] -%>",
+    "version":"<%= sonar_version -%>",
+    "popup":<%= popup -%>
+<% if metric %>
+    ,"metric": "<%= metric -%>"
+<% end
+   if resource
+%>
+    ,"resource_key": "<%= resource.id -%>",
+    "resource":[{"id": <%= resource.id -%>, "key":"<%= resource.key -%>","scope": "<%= resource.scope -%>", "qualifier": "<%= resource.qualifier -%>", "name": "<%= resource.name -%>", "lang":"<%= resource.language -%>"}]
+    <% end %>
+    <% if @snapshot %>
+      <% if @snapshot.project_snapshot.period1_mode %>
+        ,"period1": "<%= @snapshot.project_snapshot.period1_mode -%>"
+        ,"period1_date": "<%= @snapshot.project_snapshot.period1_date.strftime("%Y-%m-%dT%H:%M:%S%z") -%>"
+      <% end
+         if @snapshot.project_snapshot.period2_mode %>
+        ,"period2": "<%= @snapshot.project_snapshot.period2_mode -%>"
+        ,"period2_date": "<%= @snapshot.project_snapshot.period2_date.strftime("%Y-%m-%dT%H:%M:%S%z") -%>"
+      <% end
+         if @snapshot.project_snapshot.period3_mode %>
+        ,"period3": "<%= @snapshot.project_snapshot.period3_mode -%>"
+        ,"period3_date": "<%= @snapshot.project_snapshot.period3_date.strftime("%Y-%m-%dT%H:%M:%S%z") -%>"
+      <% end
+         if @snapshot.project_snapshot.period4_mode %>
+        ,"period4": "<%= @snapshot.project_snapshot.period4_mode -%>"
+        ,"period4_date": "<%= @snapshot.project_snapshot.period4_date.strftime("%Y-%m-%dT%H:%M:%S%z") -%>"
+      <% end
+         if @snapshot.project_snapshot.period5_mode %>
+        ,"period5": "<%= @snapshot.project_snapshot.period5_mode -%>"
+        ,"period5_date": "<%= @snapshot.project_snapshot.period5_date.strftime("%Y-%m-%dT%H:%M:%S%z") -%>"
+      <% end %>
+    <% end %>
+  };
+
+  var rp = {
+  <%
+    index=0
+    params.each do |key,value|  
+  %>
+    <%= ',' if index>0 -%>"<%= key -%>":"<%= value -%>"
+  <%
+      index+=1
+    end
+  %>
+  };
+
+  var modules = new Object();
+</script>
\ No newline at end of file
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/_base.rhtml b/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/_base.rhtml
deleted file mode 100644
index bc640bf864f..00000000000
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/_base.rhtml
+++ /dev/null
@@ -1,29 +0,0 @@
-<script type="text/javascript">
-  var config = {
-    "sonar_url":"<%= url_for(:controller => '/', :action => '', :only_path => true, :trailing_slash => false)[0...-2] -%>",
-    "version":"<%= sonar_version -%>",
-    "popup":<%= popup -%>
-<% if metric %>
-    ,"metric": "<%= metric -%>"
-<% end
-   if resource
-%>
-    ,"resource_key": "<%= resource.id -%>",
-    "resource":[{"id": <%= resource.id -%>, "key":"<%= resource.key -%>","scope": "<%= resource.scope -%>", "qualifier": "<%= resource.qualifier -%>", "name": "<%= resource.name -%>", "lang":"<%= resource.language -%>"}]
-    <% end %>
-  };
-
-  var rp = {
-  <%
-    index=0
-    params.each do |key,value|  
-  %>
-    <%= ',' if index>0 -%>"<%= key -%>":"<%= value -%>"
-  <%
-      index+=1
-    end
-  %>
-  };
-
-  var modules = new Object();
-</script>
\ No newline at end of file
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/page.rhtml b/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/page.html.erb
index f1cf389a57c..f1cf389a57c 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/page.rhtml
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/page.html.erb