diff --git a/app/assets/stylesheets/admin.css.scss b/app/assets/stylesheets/admin.css.scss index 230cb73..60d136f 100644 --- a/app/assets/stylesheets/admin.css.scss +++ b/app/assets/stylesheets/admin.css.scss @@ -13,4 +13,10 @@ ul#navigation { li { display: inline; } +} + +#admin_bar { +background: white; +padding: 5px; +text-align: center; } \ No newline at end of file diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 89e68bf..7cb48f3 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -3,6 +3,11 @@ $gw-column: 100px; // Column Width $gw-gutter: 40px; // Gutter Width +#admin_bar { + background: white; + padding: 10px; + text-align: center; +} * { margin: 0; diff --git a/app/controllers/admin/services_controller.rb b/app/controllers/admin/services_controller.rb new file mode 100644 index 0000000..46a75d1 --- /dev/null +++ b/app/controllers/admin/services_controller.rb @@ -0,0 +1,83 @@ +class Admin::ServicesController < Admin::BaseController + # GET /services + # GET /services.json + def index + @services = Service.all + + respond_to do |format| + format.html # index.html.erb + format.json { render json: @services } + end + end + + # GET /services/1 + # GET /services/1.json + def show + @service = Service.find(params[:id]) + + respond_to do |format| + format.html # show.html.erb + format.json { render json: @service } + end + end + + # GET /services/new + # GET /services/new.json + def new + @service = Service.new + + respond_to do |format| + format.html # new.html.erb + format.json { render json: @service } + end + end + + # GET /services/1/edit + def edit + @service = Service.find(params[:id]) + end + + # POST /services + # POST /services.json + def create + @service = Service.new(params[:service]) + + respond_to do |format| + if @service.save + format.html { redirect_to services_url, notice: 'Service was successfully created.' } + format.json { render json: @service, status: :created, location: @service } + else + format.html { render action: "new" } + format.json { render json: @service.errors, status: :unprocessable_entity } + end + end + end + + # PUT /services/1 + # PUT /services/1.json + def update + @service = Service.find(params[:id]) + + respond_to do |format| + if @service.update_attributes(params[:service]) + format.html { redirect_to admin_services_url, notice: 'Service was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: "edit" } + format.json { render json: @service.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /services/1 + # DELETE /services/1.json + def destroy + @service = Service.find(params[:id]) + @service.destroy + + respond_to do |format| + format.html { redirect_to services_url } + format.json { head :no_content } + end + end +end diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb index e1bd3c2..8c9c91b 100644 --- a/app/controllers/services_controller.rb +++ b/app/controllers/services_controller.rb @@ -20,64 +20,4 @@ def show format.json { render json: @service } end end - - # GET /services/new - # GET /services/new.json - def new - @service = Service.new - - respond_to do |format| - format.html # new.html.erb - format.json { render json: @service } - end - end - - # GET /services/1/edit - def edit - @service = Service.find(params[:id]) - end - - # POST /services - # POST /services.json - def create - @service = Service.new(params[:service]) - - respond_to do |format| - if @service.save - format.html { redirect_to services_url, notice: 'Service was successfully created.' } - format.json { render json: @service, status: :created, location: @service } - else - format.html { render action: "new" } - format.json { render json: @service.errors, status: :unprocessable_entity } - end - end - end - - # PUT /services/1 - # PUT /services/1.json - def update - @service = Service.find(params[:id]) - - respond_to do |format| - if @service.update_attributes(params[:service]) - format.html { redirect_to services_url, notice: 'Service was successfully updated.' } - format.json { head :no_content } - else - format.html { render action: "edit" } - format.json { render json: @service.errors, status: :unprocessable_entity } - end - end - end - - # DELETE /services/1 - # DELETE /services/1.json - def destroy - @service = Service.find(params[:id]) - @service.destroy - - respond_to do |format| - format.html { redirect_to services_url } - format.json { head :no_content } - end - end end diff --git a/app/models/service.rb b/app/models/service.rb index 7cece69..c969464 100644 --- a/app/models/service.rb +++ b/app/models/service.rb @@ -1,2 +1,5 @@ class Service < ActiveRecord::Base + def to_s + name + end end diff --git a/app/views/admin/projects/index.html.erb b/app/views/admin/projects/index.html.erb index e21d80f..433ffe9 100644 --- a/app/views/admin/projects/index.html.erb +++ b/app/views/admin/projects/index.html.erb @@ -1,3 +1,5 @@ + \ No newline at end of file diff --git a/app/views/admin/services/edit.html.erb b/app/views/admin/services/edit.html.erb new file mode 100644 index 0000000..73088b1 --- /dev/null +++ b/app/views/admin/services/edit.html.erb @@ -0,0 +1,13 @@ +<%= form_for ['admin',@service] do |f| %> +
+ <%= f.label :name %> + <%= f.text_field :name %> +
+
+ <%= f.label :description %> + <%= f.text_area :description %> +
+
+ <%= f.submit %> +
+<% end %> diff --git a/app/views/admin/services/index.html.erb b/app/views/admin/services/index.html.erb new file mode 100644 index 0000000..6b86524 --- /dev/null +++ b/app/views/admin/services/index.html.erb @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index fcec819..9fdf8de 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -10,11 +10,13 @@ +
<%= link_to("Preview Site", root_path) %>
+