ref: refs/heads/master
commit 2f54ed4d2cccdc3b412fd368dc745569f1f0f6a0
Author: Klaus Kämpf
Date: Fri Jul 10 13:47:30 2009 +0200
Clean up and dont make it a resource
---
.../app/controllers/webservices_controller.rb | 32 +++--------------
webclient/app/views/webservices/index.html.erb | 39 ++++++++++++++++++++
webclient/app/views/webservices/index.xml.erb | 1 +
3 files changed, 45 insertions(+), 27 deletions(-)
diff --git a/webclient/app/controllers/webservices_controller.rb b/webclient/app/controllers/webservices_controller.rb
index b91ba2e..4d3a2e4 100644
--- a/webclient/app/controllers/webservices_controller.rb
+++ b/webclient/app/controllers/webservices_controller.rb
@@ -2,34 +2,22 @@ class WebservicesController < ApplicationController
layout 'main'
# GET /webservices
- # GET /webservices.xml
def index
begin
@webservices = Webservice.find(:all)
rescue
redirect_to "/migrate"
end
- respond_to do |format|
- format.html # index.html.erb
- format.xml { render :xml => @webservices }
- end if @webservices
end
# GET /webservices/show/1
- # GET /webservices/show/1.xml
def show
@webservice = Webservice.find(params[:id])
end
# GET /webservices/new
- # GET /webservices/new.xml
def new
@webservice = Webservice.new
-
- respond_to do |format|
- format.html # new.html.erb
- format.xml { render :xml => @webservice }
- end
end
# GET /webservices/1/edit
@@ -38,48 +26,38 @@ class WebservicesController < ApplicationController
end
# POST /webservices
- # POST /webservices.xml
def create
@webservice = Webservice.new(params[:webservice])
respond_to do |format|
if @webservice.save
flash[:notice] = 'Webservice was successfully created.'
- format.html { redirect_to(webservices_url) }
- format.xml { render :xml => @webservice, :status => :created, :location => @webservice }
+ redirect_to webservices_url
else
- format.html { render :action => "new" }
- format.xml { render :xml => @webservice.errors, :status => :unprocessable_entity }
+ rendirect_to new_webservice_url
end
end
end
# PUT /webservices/1
- # PUT /webservices/1.xml
def update
@webservice = Webservice.find(params[:id])
respond_to do |format|
if @webservice.update_attributes(params[:webservice])
flash[:notice] = 'Webservice was successfully updated.'
- format.html { redirect_to(webservices_url) }
- format.xml { head :ok }
+ redirect_to webservices_url
else
- format.html { render :action => "edit" }
- format.xml { render :xml => @webservice.errors, :status => :unprocessable_entity }
+ redirect_to edit_webservice_url
end
end
end
# DELETE /webservices/1
- # DELETE /webservices/1.xml
def destroy
@webservice = Webservice.find(params[:id])
@webservice.destroy
- respond_to do |format|
- format.html { redirect_to(webservices_url) }
- format.xml { head :ok }
- end
+ redirect_to webservices_url
end
end
diff --git a/webclient/app/views/webservices/index.html.erb b/webclient/app/views/webservices/index.html.erb
new file mode 100644
index 0000000..b7f18cb
--- /dev/null
+++ b/webclient/app/views/webservices/index.html.erb
@@ -0,0 +1,39 @@
+
+
+<div class="services-list">
+ <label for="#services-list">Please choose a service:</label>
+ <table id="services-list" class="list">
+ <tbody>
+ <% for webservice in @webservices %>
+ <tr class="service-item">
+ <td class="icon"><div class="container"><img src="/icons/yast-service-22.png"></div></td>
+ <td><div class="title"><%= link_to webservice.name, new_session_path(:hostname => webservice.name) %></div><td>
+ <td><div class="label"><%=h webservice.desc %></div></td>
+ <td class="icon">
+ <div class="container">
+ <%= link_to image_tag("/images/edit-icon.gif", :alt => "edit"),
+ edit_webservice_path(webservice) %>
+ </div>
+ </td>
+ <td class="icon">
+ <div class="container">
+ <%= link_to image_tag("/images/delete.png", :alt => "delete"),
+ webservice, :confirm => _('Are you sure?'), :method => :delete %>
+ </div>
+ </td>
+
+ </tr>
+ <% end %>
+ </tbody>
+
+ </table>
+ <input class="button jqModal" type="submit" value="Add" id="add-webservice" />
+ <!--
+ FIXME may be add remove and edit buttons and get rid of the icons above
+ <input class="button disabled" disabled="true" type="submit" value="Remove" id="remove-printer"/>
+ <input class="button disabled" disabled="true" type="submit" value="Edit" id="edit-printer"/>
+ -->
+</div>
+<!-- webservices list -->
+
+
diff --git a/webclient/app/views/webservices/index.xml.erb b/webclient/app/views/webservices/index.xml.erb
new file mode 100644
index 0000000..90906a4
--- /dev/null
+++ b/webclient/app/views/webservices/index.xml.erb
@@ -0,0 +1 @@
+<%= @webservices.to_xml if @webservices %>
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org