Skip to content

Commit

Permalink
Don't offer to link to files when there are no files present. Made pa…
Browse files Browse the repository at this point in the history 
…ges_list id unique again and moved the CSS selector to a class name instead.
  • Loading branch information
@parndt
parndt committed Mar 11, 2011
1 parent 50dbca9 commit 7c06713
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
44 changes: 22 additions & 22 deletions core/public/stylesheets/refinery/refinery.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -623,37 +623,37 @@ label.stripped {
.record .title span {
line-height: 30px;
}
#records.files .record .title, #dialog_main #resource_file_area #pages_list ul li a.page_link {
#records.files .record .title, #dialog_main #resource_file_area .pages_list ul li a.page_link {
display:inline-block;
padding-left:24px;
min-height:16px;
background-repeat:no-repeat;
background-position:left;
background-image: url('/images/refinery/icons/folder_page_white.png');
}
#dialog_main #resource_file_area #pages_list ul li a.page_link{
#dialog_main #resource_file_area .pages_list ul li a.page_link{
background-position:5px center;
display:block;
}
#records.files .record .title.pdf, #dialog_main #resource_file_area #pages_list ul li a.page_link.pdf {
#records.files .record .title.pdf, #dialog_main #resource_file_area .pages_list ul li a.page_link.pdf {
background-image: url('/images/refinery/icons/pdf.png');
}
#records.files .record .title.jpg, #records.files .record .title.gif, #records.files .record .title.jpeg, #records.files .record .title.png, #records.files .record .title.tiff, #dialog_main #resource_file_area #pages_list ul li a.page_link.jpg, #dialog_main #resource_file_area #pages_list ul li a.page_link.jpeg, #dialog_main #resource_file_area #pages_list ul li a.page_link.gif, #dialog_main #resource_file_area #pages_list ul li a.page_link.png, #dialog_main #resource_file_area #pages_list ul li a.page_link.tiff {
#records.files .record .title.jpg, #records.files .record .title.gif, #records.files .record .title.jpeg, #records.files .record .title.png, #records.files .record .title.tiff, #dialog_main #resource_file_area .pages_list ul li a.page_link.jpg, #dialog_main #resource_file_area .pages_list ul li a.page_link.jpeg, #dialog_main #resource_file_area .pages_list ul li a.page_link.gif, #dialog_main #resource_file_area .pages_list ul li a.page_link.png, #dialog_main #resource_file_area .pages_list ul li a.page_link.tiff {
background-image: url('/images/refinery/icons/img.png');
}
#records.files .record .title.doc, #records.files .record .title.pages, #records.files .record .title.docx, #dialog_main #resource_file_area #pages_list ul li a.page_link.doc, #dialog_main #resource_file_area #pages_list ul li a.page_link.docx, #dialog_main #resource_file_area #pages_list ul li a.page_link.pages {
#records.files .record .title.doc, #records.files .record .title.pages, #records.files .record .title.docx, #dialog_main #resource_file_area .pages_list ul li a.page_link.doc, #dialog_main #resource_file_area .pages_list ul li a.page_link.docx, #dialog_main #resource_file_area .pages_list ul li a.page_link.pages {
background-image: url('/images/refinery/icons/doc.png');
}
#records.files .record .title.ppt, #records.files .record .title.keynote, #dialog_main #resource_file_area #pages_list ul li a.page_link.ppt, #dialog_main #resource_file_area #pages_list ul li a.page_link.keynote {
#records.files .record .title.ppt, #records.files .record .title.keynote, #dialog_main #resource_file_area .pages_list ul li a.page_link.ppt, #dialog_main #resource_file_area .pages_list ul li a.page_link.keynote {
background-image: url('/images/refinery/icons/ppt.png');
}
#records.files .record .title.xls, #records.files .record .title.numbers, #dialog_main #resource_file_area #pages_list ul li a.page_link.xls, #dialog_main #resource_file_area #pages_list ul li a.page_link.numbers {
#records.files .record .title.xls, #records.files .record .title.numbers, #dialog_main #resource_file_area .pages_list ul li a.page_link.xls, #dialog_main #resource_file_area .pages_list ul li a.page_link.numbers {
background-image: url('/images/refinery/icons/xls.png');
}
#records.files .record .title.zip, #records.files .record .title.rar, #dialog_main #resource_file_area #pages_list ul li a.page_link.zip, #dialog_main #resource_file_area #pages_list ul li a.page_link.rar {
#records.files .record .title.zip, #records.files .record .title.rar, #dialog_main #resource_file_area .pages_list ul li a.page_link.zip, #dialog_main #resource_file_area .pages_list ul li a.page_link.rar {
background-image: url('/images/refinery/icons/zip.png');
}
#records.files .record .title.mp3, #records.files .record .title.wav, #records.files .record .title.aiff, #records.files .record .title.m4a, #dialog_main #resource_file_area #pages_list ul li a.page_link.mp3, #dialog_main #resource_file_area #pages_list ul li a.page_link.wav, #dialog_main #resource_file_area #pages_list ul li a.page_link.aiff, #dialog_main #resource_file_area #pages_list ul li a.page_link.m4a {
#records.files .record .title.mp3, #records.files .record .title.wav, #records.files .record .title.aiff, #records.files .record .title.m4a, #dialog_main #resource_file_area .pages_list ul li a.page_link.mp3, #dialog_main #resource_file_area .pages_list ul li a.page_link.wav, #dialog_main #resource_file_area .pages_list ul li a.page_link.aiff, #dialog_main #resource_file_area .pages_list ul li a.page_link.m4a {
background-image: url('/images/refinery/icons/music.png');
}
#records .actions {
Expand Down Expand Up @@ -875,59 +875,59 @@ body.dialog form {
width: 940px;
padding: 6px;
}
#dialog_main #pages_list {
#dialog_main .pages_list {
width: 100%;
padding-bottom: 40px;
}
#dialog_main #pages_list ul {
#dialog_main .pages_list ul {
margin: 0px 12px 0px 12px;
padding: 0px;
}
#dialog_main #pages_list ul li {
#dialog_main .pages_list ul li {
cursor: pointer;
line-height: 24px;
list-style: none;
}
#dialog_main #pages_list li.child a {
#dialog_main .pages_list li.child a {
padding-left: 27px;
}
#dialog_main #pages_list li.child1 a {
#dialog_main .pages_list li.child1 a {
padding-left: 47px;
}
#dialog_main #pages_list li.child2 a {
#dialog_main .pages_list li.child2 a {
padding-left: 67px;
}
#dialog_main #pages_list li.child3 a {
#dialog_main .pages_list li.child3 a {
padding-left: 87px;
}
#dialog_main #pages_list li.child4 a {
#dialog_main .pages_list li.child4 a {
padding-left: 107px;
}
/*
#dialog_main #pages_list ul li span {
#dialog_main .pages_list ul li span {
display: block;
padding: 3px;
margin-left: 24px;
}*/
#dialog_main #pages_list ul li a {
#dialog_main .pages_list ul li a {
display: block;
padding: 3px 3px 3px 27px;
text-decoration: none;
border-bottom: none;
border: 1px solid transparent;
}
#dialog_main #pages_list li a:hover {
#dialog_main .pages_list li a:hover {
background-color: #C9DAE2;
}
#dialog_main .actions {
margin-right: 48px;
}
#dialog_main #pages_list .linked a, #dialog_main #pages_list .linked a:hover {
#dialog_main .pages_list .linked a, #dialog_main .pages_list .linked a:hover {
border: 1px solid #00A017;
color: #00A017;
background: 7px 7px no-repeat url('/images/refinery/icons/accept.png') #E0F5E0;
}
#dialog_main #pages_list .linked a em {
#dialog_main .pages_list .linked a em {
color: #00A017;
}
#dialog_main #web_address_area, #dialog_main #email_address_area {
Expand Down
8 changes: 4 additions & 4 deletions pages/app/views/admin/pages_dialogs/link_to.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<input type='radio' name='link_to' value='email_address' id='link_to_email_address' <%= "checked='true'" if @email_address_area_selected %> />
<label for='link_to_email_address' class='stripped'><%= t('tab_name', :scope => 'admin.pages_dialogs.link_to.email_address') %></label>
</span>
<% if ::Refinery::Plugins.registered.names.include?("refinery_files") %>
<% if ::Refinery::Plugins.registered.names.include?("refinery_files") and @resources.any? %>
<span id="resource_file_radio" class="radio<%= " selected_radio" if @resource_area_selected %>">
<input type="radio" name="link_to" value="resource_file" id="link_to_resource_file" <%= "checked='true'" if @resource_area_selected %> />
<label for="link_to_resource_file" class="stripped"><%= t('tab_name', :scope => 'admin.pages_dialogs.link_to.your_resource') %></label>
Expand All @@ -25,7 +25,7 @@
<div id='your_page_area' class='dialog_area' <%= "style='display: none'" unless @page_area_selected %>>
<input type='hidden' name='selected_image' id='selected_image' />
<div id='your_page_content' class='clearfix'>
<div id='pages_list'>
<div id='pages_list' class='pages_list'>
<ul class="link_list">
<%= render :partial => "page_link", :collection => @pages,
:locals => {
Expand Down Expand Up @@ -92,9 +92,9 @@
</ol>
</div>
</div>
<% if ::Refinery::Plugins.registered.names.include?("refinery_files") %>
<% if ::Refinery::Plugins.registered.names.include?("refinery_files") and @resources.any? %>
<div id="resource_file_area"<%= " style='display:none'" unless @resource_area_selected %> class="dialog_area">
<div id='pages_list'>
<div id='resources_list' class='pages_list'>
<ul class="link_list">
<% @resources.each do |resource| -%>
<% resource_linked = (resource.url == params[:current_link]) unless params[:current_link].blank? %>
Expand Down

0 comments on commit 7c06713

Please sign in to comment.