"
+=title_content.content
+=raw ""
+
diff --git a/app/views/portlet/portlets/_portlet.html.haml b/app/views/portlet/portlets/_portlet.html.haml
index 54c8dc6..86bb426 100644
--- a/app/views/portlet/portlets/_portlet.html.haml
+++ b/app/views/portlet/portlets/_portlet.html.haml
@@ -1,15 +1,12 @@
-
-
-
#portlet.portlet{:id => portlet.id,:"data-portlet_id" => portlet.id, :class => "portlet_"+portlet.content_type.tableize.singularize+(" " if portlet.content_type == "BlockContent").to_s}
-if portlet.content_type == "BlockContent"
- .btn-toolbar{:style => "position:absolute;margin-left:10px;margin-top:-3em;"}
+ .btn-toolbar{:style => "position:absolute;margin-left:150px;margin-top:5px;"}
.btn-group
%a.btn.handle{:href => "#"}=i :move, :icon => false
=link_to i(:pencil, :icon => false), eval("edit_portlet_"+portlet.content_type.tableize.singularize+"_path(portlet.content, :portlet_id => portlet.id)"), :remote => true, :class => "btn"
- =link_to i(:trash, :icon => false), eval("portlet_"+portlet.content_type.tableize.singularize+"_path(portlet.content, :portlet_id => portlet.id)"), :method => :delete, :data => { :confirm => "Etes-vous sûr ?"}, :remote => true, :class => "btn"
+ =link_to i(:"trash", :icon => false), eval("portlet_"+portlet.content_type.tableize.singularize+"_path(portlet.content, :portlet_id => portlet.id)"), :method => :delete, :data => { :confirm => "Etes-vous sûr ?"}, :remote => true, :class => "btn"
@@ -20,7 +17,7 @@
.btn-group
%a.btn.handle{:href => "#"}=i :move, :icon => false
=link_to i(:pencil, :icon => false), eval("edit_portlet_"+portlet.content_type.tableize.singularize+"_path(portlet.content, :portlet_id => portlet.id)"), :remote => true, :class => "btn"
- =link_to i(:trash, :icon => false), eval("portlet_"+portlet.content_type.tableize.singularize+"_path(portlet.content, :portlet_id => portlet.id)"), :method => :delete, :data => { :confirm => "Etes-vous sûr ?"}, :remote => true, :class => "btn"
+ =link_to i(:"trash", :icon => false), eval("portlet_"+portlet.content_type.tableize.singularize+"_path(portlet.content, :portlet_id => portlet.id)"), :method => :delete, :data => { :confirm => "Etes-vous sûr ?"}, :remote => true, :class => "btn"
@@ -28,7 +25,4 @@
- =render :partial => "portlets/render_public/"+portlet.content_type.to_s.downcase, :locals => {:input => portlet.content, :admin => true}
-
-
-
\ No newline at end of file
+ =render :partial => "portlets/render_public/"+portlet.content_type.to_s.downcase, :locals => {:input => portlet.content, :admin => true, :edit_link => eval("edit_portlet_"+portlet.content_type.tableize.singularize+"_path(portlet.content, :portlet_id => portlet.id)") }
\ No newline at end of file
diff --git a/app/views/portlet/shared/edit.js.erb b/app/views/portlet/shared/edit.js.erb
index 6e09501..b42ce41 100644
--- a/app/views/portlet/shared/edit.js.erb
+++ b/app/views/portlet/shared/edit.js.erb
@@ -1,15 +1,16 @@
-$("#portlet_<%= @portlet.id %>").html("");
+//$("#portlet_<%= @portlet.id %>").html("");
-$("#edit_portlet_content_form").html("<%= escape_javascript(render( :partial => "form")) %>");
+//$("#edit_portlet_content_form").html("<%= escape_javascript(render( :partial => "form")) %>");
-$(".block_portlets").sortable("disable");
+$("#element_form").html("<%= escape_javascript(render( :partial => "form")) %>");
-$("#edit_portlet_content_form .text_editor").each(function() {
+$("#collapse2").collapse('hide');
+$("#collapse3").collapse('show');
+//$(".block_portlets").sortable("disable");
+
- auto_tiny_mce($(this));
-});
<%- cancel_button = escape_javascript(link_to("annuler", portlet_portlet_path(@portlet), :class => "button cancel", :remote => true)); %>
$("#portlet_<%= @portlet.id %>").find('.buttons ol').prepend('<%= cancel_button %>');
diff --git a/app/views/portlet/shared/update.js.erb b/app/views/portlet/shared/update.js.erb
index d47c241..39957c6 100644
--- a/app/views/portlet/shared/update.js.erb
+++ b/app/views/portlet/shared/update.js.erb
@@ -1,7 +1,7 @@
$("#portlet_<%= @portlet.id %>").replaceWith("<%= escape_javascript(render(@portlet)) %>");
-
-$(".block_portlets").sortable("enable");
+$("#element_form").html("")
+//$(".block_portlets").sortable("enable");
<%= flash_js %>
\ No newline at end of file
diff --git a/app/views/portlet/text_contents/_form.html.haml b/app/views/portlet/text_contents/_form.html.haml
index 0a3cd7d..a42911d 100644
--- a/app/views/portlet/text_contents/_form.html.haml
+++ b/app/views/portlet/text_contents/_form.html.haml
@@ -1,35 +1,76 @@
-=semantic_form_for( [:portlet, @text_content], :remote => true) do |f|
-
- %p{:style => "text-align:center;"}= f.submit "Sauvegarder", :class => "btn btn-primary"
-
- =f.text_area :content, :style => "width:98%;height:600px;", :class => "redactor_content"
+-if @text_content.id
+ =semantic_form_for( [:portlet, @text_content], :remote => true, :html => {:"data-portlet-id" => @text_content.portlet.id}) do |f|
+
+ %p{:style => "text-align:center;"}= f.submit "Sauvegarder", :class => "btn btn-primary"
+
+ =f.text_area :content, :style => "width:98%;height:600px;", :class => "redactor_content", :style => "display:none;"
- #toolbar-text
-
-
- -if TextContent::STYLES.size > 0
- Style :
- = f.select :style, TextContent::STYLES
+
+
+
+ -if TextContent::STYLES.size > 0
+ Style :
+ = f.select :style, TextContent::STYLES
-
-
-
- :javascript
-
- $('.redactor_content').redactor({
- toolbarExternal: '#toolbar-text',
-
- lang: 'fr',
- buttons : ['html', '|', 'formatting', '|', 'bold', 'italic', 'deleted','underline','|', 'alignleft', 'aligncenter', 'alignright', 'justify', '|', 'unorderedlist', 'orderedlist', 'outdent', 'indent', '|', 'table', 'link', '|','fontcolor', 'backcolor','|', 'horizontalrule']
-
-
- });
-
-
+
+ :javascript
+ $("#element_form form").submit(function (e){
+
+ $("textarea").val($('#portlet_'+$("#element_form form").data("portlet-id")+' .content').html());
+ $("#toolbar-text").html("");
+
+ });
+
+ $('#portlet_'+$("#element_form form").data("portlet-id")+' .content').redactor({
+ toolbarExternal: '#toolbar-text',
+ lang: 'fr',
+ buttons : ['undo','redo','|', 'formatting', '|', 'bold', 'italic', 'deleted','underline','|', 'alignleft', 'aligncenter', 'alignright', 'justify', '|', 'unorderedlist', 'orderedlist', 'outdent', 'indent', '|', 'table', 'link', '|','fontcolor', 'backcolor','|', 'horizontalrule', '|','html']
+
+
+
+ });
+
+
-
-
-
+
+
+
+-else
+ =semantic_form_for( [:portlet, @text_content], :remote => true) do |f|
+
+ %p{:style => "text-align:center;"}= f.submit "Sauvegarder", :class => "btn btn-primary"
+
+ =f.text_area :content, :style => "width:98%;height:600px;", :class => "redactor_content"
+
+
+
+
+ -if TextContent::STYLES.size > 0
+ Style :
+ = f.select :style, TextContent::STYLES
+
+
+
+
+
+ :javascript
+
+ $('.redactor_content').redactor({
+ toolbarExternal: '#toolbar-text',
+ lang: 'fr',
+
+ buttons : ['undo','redo','|', 'formatting', '|', 'bold', 'italic', 'deleted','underline','|', 'alignleft', 'aligncenter', 'alignright', 'justify', '|', 'unorderedlist', 'orderedlist', 'outdent', 'indent', '|', 'table', 'link', '|','fontcolor', 'backcolor','|', 'horizontalrule', '|','html']
+
+
+ });
+
+
+
+
+
+
+
+
diff --git a/app/views/portlet/text_contents/_text_content.html.haml b/app/views/portlet/text_contents/_text_content.html.haml
index afdbae0..f36ab60 100644
--- a/app/views/portlet/text_contents/_text_content.html.haml
+++ b/app/views/portlet/text_contents/_text_content.html.haml
@@ -1 +1,2 @@
-%p=raw text_content.content
\ No newline at end of file
+
+.content=raw text_content.content
\ No newline at end of file
diff --git a/app/views/portlet/title_contents/_form.html.haml b/app/views/portlet/title_contents/_form.html.haml
index c0c9db3..b084cfd 100644
--- a/app/views/portlet/title_contents/_form.html.haml
+++ b/app/views/portlet/title_contents/_form.html.haml
@@ -1,6 +1,6 @@
=semantic_form_for( [:portlet, @title_content], :remote => true) do |f|
- =f.text_field :content, :style => "width:98%;", :class => "inputText"
+ =f.text_field :content, :style => "width:98%;", :class => "inputText" if !@title_content.id
Importance :
= f.select :level, TitleContent::LEVELS
diff --git a/app/views/portlets.old/render_public/_blockcontent.html.haml b/app/views/portlets.old/render_public/_blockcontent.html.haml
new file mode 100644
index 0000000..220b93d
--- /dev/null
+++ b/app/views/portlets.old/render_public/_blockcontent.html.haml
@@ -0,0 +1,30 @@
+
+-if input.nbr_columns == 1 and admin == "dd"
+ -input.blocks.each do |block|
+ .block
+ =render :partial => "admin/blocks/block", :locals => {:block => block, :sortable => false}
+ .clear
+
+-else
+ =raw '' if !admin
+
+ - css_class = ""
+ - css_class = "fond-gris" if input.style == 2
+ - css_class = "fond-bleu" if input.style == 3
+
+ =raw "" if !admin
+
+ %div{:class => css_class}
+ .row-fluid
+ -for i in 1..input.nbr_columns.to_i
+ %div{:class => "span"+eval("input.row#{i}").to_s}
+ -if admin
+ =render :partial => "admin/blocks/block", :locals => {:admin => false,:block => input.blocks[i-1], :sortable => false}
+ -else
+ =render :partial => "public/blocks/block", :locals => {:admin => false, :block => input.blocks[i-1], :sortable => false}
+
+
+ =raw "
" if !admin
+ =raw '' if !admin
+
+
\ No newline at end of file
diff --git a/app/views/portlets.old/render_public/_breakcontent.html.haml b/app/views/portlets.old/render_public/_breakcontent.html.haml
new file mode 100644
index 0000000..a287381
--- /dev/null
+++ b/app/views/portlets.old/render_public/_breakcontent.html.haml
@@ -0,0 +1 @@
+%hr
\ No newline at end of file
diff --git a/app/views/portlets.old/render_public/_downloadcontent.html.haml b/app/views/portlets.old/render_public/_downloadcontent.html.haml
new file mode 100644
index 0000000..8165052
--- /dev/null
+++ b/app/views/portlets.old/render_public/_downloadcontent.html.haml
@@ -0,0 +1,11 @@
+-if input.data_file
+
+
+
+ .portlet.download_content
+ =link_to input.title.to_s, input.data_file.file.url
+
+-else
+
+ .portlet.download_content
+ =link_to input.title.to_s, ""
diff --git a/app/views/portlets.old/render_public/_dynamiccontent.html.haml b/app/views/portlets.old/render_public/_dynamiccontent.html.haml
new file mode 100644
index 0000000..7b58256
--- /dev/null
+++ b/app/views/portlets.old/render_public/_dynamiccontent.html.haml
@@ -0,0 +1,3 @@
+
+
+=render :partial => "portlets/dynamic_contents/"+input.name.to_s.downcase if input.name
\ No newline at end of file
diff --git a/app/views/portlets.old/render_public/_eventcontent.html.haml b/app/views/portlets.old/render_public/_eventcontent.html.haml
new file mode 100644
index 0000000..c312515
--- /dev/null
+++ b/app/views/portlets.old/render_public/_eventcontent.html.haml
@@ -0,0 +1,106 @@
+.event{:class => input.event_type.to_i}
+ %a{:id => "event_#{input.id}"}
+ -if input.image_file
+
+ %p.img{:style =>"float:left;"}
+ =image_tag(input.image_file.file.large.medium.small.thumb)
+
+
+
+
+
+
+
+
+
+
+
+
+ %h2=input.title
+ %h3= input.artist
+ %h4
+ ="Rencontre avec l'artiste" if input.event_type.to_i == 1
+ = l input.start_at, :format => :human
+ %p{:style => "clear:both;margin-top:20px;"}
+
+ #map.map{:id => input.id, :style => "width:400px; height:200px;"}
+
+
+
+
+
+
+
+
+ %p
+ %strong=input.place
+ %br
+ =simple_format input.address
+
+
+
+ =simple_format input.description
+ %p=link_to "voir la carte en grand", "http://maps.google.com/maps?q="+u(input.address), :target => "blank"
+
+ -if input.with_cible?
+
+
+ - if input.cible
+ =link_to "site de l'artiste", input.cible.cible_url, :target => ("_blank" if input.popup).to_s
+
+ %p{:style => "clear:both;margin-top:10px;"}
+
\ No newline at end of file
diff --git a/app/views/portlets.old/render_public/_gallerycontent.html.haml b/app/views/portlets.old/render_public/_gallerycontent.html.haml
new file mode 100644
index 0000000..a9a2a60
--- /dev/null
+++ b/app/views/portlets.old/render_public/_gallerycontent.html.haml
@@ -0,0 +1,136 @@
+
+-if admin
+
+ %h2=input.name
+ .description
+ =raw input.description
+
+ %p{:style => "text-align:center;"}=link_to "Ajouter des images", "#", :onclick => "select_gallery_images_from_manager('"+input.id.to_s+"');return false;", :class => "btn"
+
+ .gallery_images
+ =render :collection => input.gallery_images, :partial => "portlet/gallery_images/gallery_image"
+ %p{:style => "clear:both;"}
+
+ :coffeescript
+
+ adjustment = ""
+
+ $('.gallery_images').sortable({
+ itemSelector:".gallery_image",
+ containerSelector :".gallery_images",
+ nested:true,
+ placeholder:"
",
+ onDragStart: ($item, container, _super) ->
+ $("body").addClass("dragging")
+
+ offset = $item.offset()
+ pointer = container.rootGroup.pointer
+ adjustment = {
+ left: pointer.left - offset.left,
+ top: pointer.top - offset.top
+ }
+ onDrag: ($item, position, _super) ->
+
+ $item.css({
+
+ left: position.left - adjustment.left,
+ top: position.top - adjustment.top - $(window).scrollTop()
+
+ })
+
+ onDrop: ($item, container, _super) ->
+
+ $item.removeClass("dragged").removeAttr("style")
+ $("body").removeClass("dragging")
+
+ result = []
+ container.el.find(".gallery_image").each ->
+ result.push $(this).data("id")
+
+
+
+
+ $.ajax({
+ url:"/portlet/gallery_images/reorder.js",
+ type: "GET",
+ data: {
+ order : result
+ }
+
+ })
+ });
+
+
+
+
+-else
+ -if input.style == 4
+ %ul#portfolio-filter
+
+ %li
+ %a.current{:href => "#all"} Tous
+
+ -input.tags.each do |tag|
+ %li
+ %a{:href => "##{tag.to_slug}"}= tag
+
+
+
+ %ul#portfolio-list
+ -input.gallery_images.each do |gallery_images|
+ %li{:class => gallery_images.tags_class}=link_to image_tag(gallery_images.image_file.file.square.url),gallery_images.image_file.file.large.url, :title => "#{gallery_images.title}", :rel => "prettyPhoto"
+
+
+ :coffeescript
+ $('#portfolio-list').filterable({
+ animationSpeed: 300,
+ show: { height: 'show',width: 'show' },
+ hide: { height: 'hide' ,width: 'hide'}
+ })
+
+
+
+ -if input.style == 3
+ .portlet.input
+ .gallery_images
+ -input.gallery_images.each do |gallery_images|
+ =link_to image_tag(gallery_images.image_file.file.square.url, :alt => "#{gallery_images.title}"), gallery_images.image_file.file.large.url, :rel => "prettyPhoto"
+ %p{:style => "clear:both;"}
+
+
+ -elsif input.style==2
+
+
+
+ -input.gallery_images.each do |gallery_images|
+ =image_tag gallery_images.image_file.file.large.medium.url
+
+
+
+
+
+
+
+
+ -elsif input.style==1
+ .portlet.input
+ %table.gallery_images
+ =raw "
"
+
+ - i = 0
+ -input.gallery_images.each do |gallery_images|
+ - i = i+1
+
+ %td=link_to image_tag(gallery_images.image_file.file.large.medium.small.thumb.url, :alt => "#{gallery_images.title}"), gallery_images.image_file.file.large.url, :rel => "prettyPhoto"
+
+ -if i % 4 == 0
+ =raw "
"
+
+
+ =raw "
"
+
\ No newline at end of file
diff --git a/app/views/portlets.old/render_public/_htmlcontent.html.haml b/app/views/portlets.old/render_public/_htmlcontent.html.haml
new file mode 100644
index 0000000..edf5dc6
--- /dev/null
+++ b/app/views/portlets.old/render_public/_htmlcontent.html.haml
@@ -0,0 +1,5 @@
+
+-begin
+ =render :inline => input.content, :type => input.content_type
+-rescue Exception=>e
+ =raw "
"
\ No newline at end of file
diff --git a/app/views/portlets.old/render_public/_imagecontent.html.haml b/app/views/portlets.old/render_public/_imagecontent.html.haml
new file mode 100644
index 0000000..57f456a
--- /dev/null
+++ b/app/views/portlets.old/render_public/_imagecontent.html.haml
@@ -0,0 +1,51 @@
+
+-if input.image_file
+
+ -if input.style== "1"
+ -url =input.image_file.file.large.medium.url
+
+ -elsif input.style== "2"
+ -url =input.image_file.file.large.medium.small.url
+
+ -elsif input.style== "3"
+ -url =input.image_file.file.square.url
+
+ -elsif input.style== "4"
+ -url =input.image_file.file.large.medium.small.thumb.url
+
+ -elsif input.style== "5"
+ -url =input.image_file.file.large.url
+
+
+
+-else
+ -url =""
+
+-url = "http://"+request.host_with_port+url
+-style = ""
+-style = "text-align:center;" if input.alignement == "center"
+
+
+-style = "float:right;" if input.alignement == "right"
+
+
+-style = "float:left;" if input.alignement == "left"
+
+- if input.cible
+ -link = input.cible.cible_url
+
+-styleimg=""
+-styleimg += "width:"+input.width.to_s+"px;" if input.width?
+-styleimg += "height:"+input.height.to_s+"px;" if input.height?
+
+%p.img{:style =>style}
+ -if link
+
+ =link_to image_tag(url, :alt => input.alt.to_s, :style => styleimg ), link, :title => input.alt.to_s, :target => (input.popup ? "_blank" : "")
+
+
+ -elsif input.expandable
+ =link_to image_tag(url, :alt => input.alt.to_s, :style => styleimg ), (input.image_file ? input.image_file.file.large.url : ""), :rel => "prettyPhoto", :title => input.alt.to_s
+
+ -else
+ =image_tag(url, :alt => input.alt.to_s, :style => styleimg )
diff --git a/app/views/portlets.old/render_public/_imglinkcontent.html.haml b/app/views/portlets.old/render_public/_imglinkcontent.html.haml
new file mode 100644
index 0000000..673a185
--- /dev/null
+++ b/app/views/portlets.old/render_public/_imglinkcontent.html.haml
@@ -0,0 +1,27 @@
+.img_link_portlet
+
+ - if input.cible
+ -url = input.cible.cible_url
+
+ .image_file
+ =link_to image_tag(input.image_file.file.square.url), url if input.image_file
+
+ .title
+ %h3=link_to input.title, url
+ .description
+ = link_to simple_format(input.description), url
+ .clear
+
+
+ -else
+
+
+ .image_file
+ =image_tag(input.image_file.file.square.url) if input.image_file
+
+ .title
+ %h3=input.title
+ .description
+ = simple_format(input.description)
+ .clear
+
diff --git a/app/views/portlets.old/render_public/_linkcontent.html.haml b/app/views/portlets.old/render_public/_linkcontent.html.haml
new file mode 100644
index 0000000..6cf9229
--- /dev/null
+++ b/app/views/portlets.old/render_public/_linkcontent.html.haml
@@ -0,0 +1,6 @@
+.portlet.link_content
+ - if input.cible
+ -url = input.cible.cible_url
+ -else
+ -url = ""
+ =link_to input.name.to_s, url.to_s, :class => "external_link", :target => ("_blank" if input.popup).to_s
\ No newline at end of file
diff --git a/app/views/portlets.old/render_public/_mapcontent.html.haml b/app/views/portlets.old/render_public/_mapcontent.html.haml
new file mode 100644
index 0000000..7fd76a6
--- /dev/null
+++ b/app/views/portlets.old/render_public/_mapcontent.html.haml
@@ -0,0 +1,64 @@
+#map_content_map.map_content_map{:id => input.id, :style => "width:100%; height:400px;margin:auto;"}
+
+
+
+
\ No newline at end of file
diff --git a/app/views/portlets.old/render_public/_tablecontent.html.haml b/app/views/portlets.old/render_public/_tablecontent.html.haml
new file mode 100644
index 0000000..bf01fc8
--- /dev/null
+++ b/app/views/portlets.old/render_public/_tablecontent.html.haml
@@ -0,0 +1,74 @@
+-if admin
+
+
+
+
+
+ %table
+ -table_rows = input.table_rows
+ %tr
+ -i = 0
+ -input.nbr_cols.times do
+ -i += 1
+ %td.add_col{:style => "text-align:center;"}
+
+ .btn-group
+ %a.btn.dropdown-toggle{:href => "#", :data => {:toggle => "dropdown"}}
+ = i(:cog)
+
+ %ul.dropdown-menu
+ %li=link_to "Ajouter une colonne avant", portlet_table_cols_path(:position => i, :table_content_id =>input.id ), :method => :post, :remote => true
+
+ %li=link_to "Ajouter une colonne après", portlet_table_cols_path(:position => i+1, :table_content_id =>input.id ), :method => :post, :remote => true
+
+ -if input.nbr_cols > 1
+ %li=link_to "Supprimer cette colonne", portlet_table_col_path(:id => i, :table_content_id =>input.id ), :method => :delete, :remote => true, :confirm => "Voulez-vous vraiment supprimer cette colonne ?"
+
+
+ %td
+
+ -table_rows.each do |table_row|
+ %tr{:id => table_row.id}
+
+
+ -CelTable.where(:table_row_id => table_row.id).order("position ASC").each do |cel_table|
+
+ %td.input_cel{:id => cel_table.id, :style => "border:1px solid black;"}
+
+ =render :partial => "admin/blocks/block", :locals => {:block => cel_table.block, :sortable => false}
+
+ %td.add_cel
+
+ .btn-group{:style => "position:relative;"}
+ %a.btn.dropdown-toggle{:href => "#", :data => {:toggle => "dropdown"}}
+ = i(:cog)
+
+ %ul.dropdown-menu{:style => "position:absolute;right:40px !important;left:auto !important;top:-2px !important;"}
+ %li=link_to "Ajouter un rang avant", portlet_table_rows_path(:table_row => {:table_content_id => input.id, :position => (table_row.position)}), :method => :post, :remote => true
+
+ %li=link_to "Ajouter un rang après", portlet_table_rows_path(:table_row => {:table_content_id => input.id, :position => (table_row.position+1)}), :method => :post, :remote => true
+ -if input.nbr_rows > 1
+ %li=link_to "Supprimer ce rang", portlet_table_row_path(table_row), :method => :delete, :remote => true, :confirm => "Voulez-vous vraiment supprimer ce rang ?"
+
+
+
+
+
+-else
+
+ %table{:class =>("condensed" if input.style == 2)}
+ -table_rows = input.table_rows
+
+
+ -table_rows.each do |table_row|
+ %tr
+
+ -table_row.cel_tables.each do |cel_table|
+
+ %td
+
+ =render cel_table.block
+
+
+
+
diff --git a/app/views/portlets.old/render_public/_textcontent.html.haml b/app/views/portlets.old/render_public/_textcontent.html.haml
new file mode 100644
index 0000000..81883ed
--- /dev/null
+++ b/app/views/portlets.old/render_public/_textcontent.html.haml
@@ -0,0 +1 @@
+=raw(input.content)
\ No newline at end of file
diff --git a/app/views/portlets.old/render_public/_titlecontent.html.haml b/app/views/portlets.old/render_public/_titlecontent.html.haml
new file mode 100644
index 0000000..72e2a08
--- /dev/null
+++ b/app/views/portlets.old/render_public/_titlecontent.html.haml
@@ -0,0 +1,5 @@
+-level = (input.level || "1").to_s
+
+=raw '"
+=input.content
+=raw '"
diff --git a/app/views/portlets/render_public/_gallerycontent.html.haml b/app/views/portlets/render_public/_gallerycontent.html.haml
index a9a2a60..bb5f02a 100644
--- a/app/views/portlets/render_public/_gallerycontent.html.haml
+++ b/app/views/portlets/render_public/_gallerycontent.html.haml
@@ -133,4 +133,5 @@
=raw ""
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/app/views/portlets/render_public/_imagecontent.html.haml b/app/views/portlets/render_public/_imagecontent.html.haml
index 57f456a..df149ba 100644
--- a/app/views/portlets/render_public/_imagecontent.html.haml
+++ b/app/views/portlets/render_public/_imagecontent.html.haml
@@ -1,25 +1,25 @@
-
+
-if input.image_file
- -if input.style== "1"
- -url =input.image_file.file.large.medium.url
+ -if input.style== "1"
+ -url =input.image_file.file.large.medium.url
- -elsif input.style== "2"
- -url =input.image_file.file.large.medium.small.url
+ -elsif input.style== "2"
+ -url =input.image_file.file.large.medium.small.url
- -elsif input.style== "3"
- -url =input.image_file.file.square.url
+ -elsif input.style== "3"
+ -url =input.image_file.file.square.url
- -elsif input.style== "4"
- -url =input.image_file.file.large.medium.small.thumb.url
-
- -elsif input.style== "5"
- -url =input.image_file.file.large.url
-
-
+ -elsif input.style== "4"
+ -url =input.image_file.file.large.medium.small.thumb.url
+
+ -elsif input.style== "5"
+ -url =input.image_file.file.large.url
+
+
-else
- -url =""
+ -url =""
-url = "http://"+request.host_with_port+url
-style = ""
@@ -27,25 +27,29 @@
-style = "float:right;" if input.alignement == "right"
-
+
-style = "float:left;" if input.alignement == "left"
- if input.cible
- -link = input.cible.cible_url
+ -link = input.cible.cible_url
-styleimg=""
-styleimg += "width:"+input.width.to_s+"px;" if input.width?
-styleimg += "height:"+input.height.to_s+"px;" if input.height?
%p.img{:style =>style}
- -if link
-
- =link_to image_tag(url, :alt => input.alt.to_s, :style => styleimg ), link, :title => input.alt.to_s, :target => (input.popup ? "_blank" : "")
+ -if admin
+ =link_to image_tag(url, :alt => input.alt.to_s, :style => styleimg ), edit_link, :remote => true
+ -else
+
+ -if link
+
+ =link_to image_tag(url, :alt => input.alt.to_s, :style => styleimg ), link, :title => input.alt.to_s, :target => (input.popup ? "_blank" : "")
-
- -elsif input.expandable
- =link_to image_tag(url, :alt => input.alt.to_s, :style => styleimg ), (input.image_file ? input.image_file.file.large.url : ""), :rel => "prettyPhoto", :title => input.alt.to_s
+
+ -elsif input.expandable
+ =link_to image_tag(url, :alt => input.alt.to_s, :style => styleimg ), (input.image_file ? input.image_file.file.large.url : ""), :rel => "prettyPhoto", :title => input.alt.to_s
- -else
- =image_tag(url, :alt => input.alt.to_s, :style => styleimg )
+ -else
+ =image_tag(url, :alt => input.alt.to_s, :style => styleimg )
diff --git a/app/views/portlets/render_public/_tablecontent.html.haml b/app/views/portlets/render_public/_tablecontent.html.haml
index bf01fc8..bed8375 100644
--- a/app/views/portlets/render_public/_tablecontent.html.haml
+++ b/app/views/portlets/render_public/_tablecontent.html.haml
@@ -56,7 +56,7 @@
-else
- %table{:class =>("condensed" if input.style == 2)}
+ %table
-table_rows = input.table_rows
diff --git a/app/views/portlets/render_public/_textcontent.html.haml b/app/views/portlets/render_public/_textcontent.html.haml
index 81883ed..3208fe0 100644
--- a/app/views/portlets/render_public/_textcontent.html.haml
+++ b/app/views/portlets/render_public/_textcontent.html.haml
@@ -1 +1,4 @@
-=raw(input.content)
\ No newline at end of file
+-if admin
+ .content=raw(input.content)
+-else
+ =raw(input.content)
\ No newline at end of file
diff --git a/app/views/portlets/render_public/_titlecontent.html.haml b/app/views/portlets/render_public/_titlecontent.html.haml
index 72e2a08..364280d 100644
--- a/app/views/portlets/render_public/_titlecontent.html.haml
+++ b/app/views/portlets/render_public/_titlecontent.html.haml
@@ -1,5 +1,8 @@
-level = (input.level || "1").to_s
-=raw '"
+-if admin
+ =raw '"
+-else
+ =raw '"
=input.content
=raw '"