developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ray fix for css and filemanager

This commit is contained in:
rulingcom 2013-12-12 15:39:20 +08:00
parent 6c01d517d2
commit 4c85d62866
21 changed files with 94 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/html5.js
View File

@ -1,3 +1,8 @@
/*! HTML5 Shiv vpre3.6 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
Uncompressed source: https://github.com/aFarkas/html5shiv */
(function(a,b){function h(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function i(){var a=l.elements;return typeof a=="string"?a.split(" "):a}function j(a){var b={},c=a.createElement,f=a.createDocumentFragment,g=f();a.createElement=function(a){if(!l.shivMethods)return c(a);var f;return b[a]?f=b[a].cloneNode():e.test(a)?f=(b[a]=c(a)).cloneNode():f=c(a),f.canHaveChildren&&!d.test(a)?g.appendChild(f):f},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+i().join().replace(/\w+/g,function(a){return c(a),g.createElement(a),'c("'+a+'")'})+");return n}")(l,g)}function k(a){var b;return a.documentShived?a:(l.shivCSS&&!f&&(b=!!h(a,"article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio{display:none}canvas,video{display:inline-block;*display:inline;*zoom:1}[hidden]{display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}mark{background:#FF0;color:#000}")),g||(b=!j(a)),b&&(a.documentShived=b),a)}var c=a.html5||{},d=/^<|^(?:button|form|map|select|textarea|object|iframe|option|optgroup)$/i,e=/^<|^(?:a|b|button|code|div|fieldset|form|h1|h2|h3|h4|h5|h6|i|iframe|img|input|label|li|link|ol|option|p|param|q|script|select|span|strong|style|table|tbody|td|textarea|tfoot|th|thead|tr|ul)$/i,f,g;(function(){var c=b.createElement("a");c.innerHTML="<xyz></xyz>",f="hidden"in c,f&&typeof injectElementWithStyles=="function"&&injectElementWithStyles("#modernizr{}",function(b){b.hidden=!0,f=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle).display=="none"}),g=c.childNodes.length==1||function(){try{b.createElement("a")}catch(a){return!0}var c=b.createDocumentFragment();return typeof c.cloneNode=="undefined"||typeof c.createDocumentFragment=="undefined"||typeof c.createElement=="undefined"}()})();var l={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:k};a.html5=l,k(b)})(this,document)
/*
HTML5 Shiv v3.7.0 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
*/
(function(l,f){function m(){var a=e.elements;return"string"==typeof a?a.split(" "):a}function i(a){var b=n[a[o]];b||(b={},h++,a[o]=h,n[h]=b);return b}function p(a,b,c){b||(b=f);if(g)return b.createElement(a);c||(c=i(b));b=c.cache[a]?c.cache[a].cloneNode():r.test(a)?(c.cache[a]=c.createElem(a)).cloneNode():c.createElem(a);return b.canHaveChildren&&!s.test(a)?c.frag.appendChild(b):b}function t(a,b){if(!b.cache)b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag();
a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/[\w\-]+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x<style>article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}</style>";
c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="<xyz></xyz>";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode||
"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video",version:"3.7.0",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);
if(g)return a.createDocumentFragment();for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document);

9
app/assets/stylesheets/lib/filemanager.css
View File

@ -33,3 +33,12 @@ body > section {
margin-bottom: 0;
text-align: center;
}
#editform .edit_asset {
margin-bottom: 0;
}
#editform fieldset {
margin-bottom: 0;
}
#editform .input-area .control-label {
width: 160px;
}

6
app/helpers/application_helper.rb
View File

@ -191,9 +191,9 @@ module ApplicationHelper
def page_stylesheets(page, edit=nil)
stylesheets = ''
stylesheets << "<link href='#{asset_path 'orbit_bar_bootstrap'}' rel='stylesheet' type='text/css' />\n"
stylesheets << "<link href='#{page.design.css_reset.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.css_reset
stylesheets << "<link href='#{asset_path 'banner_nav.css'}' rel='stylesheet' type='text/css' />\n"
stylesheets << "<link href='#{asset_path 'default_widget.css'}' rel='stylesheet' type='text/css' />\n"
# stylesheets << "<link href='#{page.design.css_reset.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.css_reset
# stylesheets << "<link href='#{asset_path 'banner_nav.css'}' rel='stylesheet' type='text/css' />\n"
# stylesheets << "<link href='#{asset_path 'default_widget.css'}' rel='stylesheet' type='text/css' />\n"
stylesheets << "<link href='#{page.design.css_default.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.css_default
theme = page.design.themes.detect{ |d| d.id == page.theme_id }
stylesheets << "<link href='#{theme.file.url}' rel='stylesheet' type='text/css' />\n" if theme

4
app/views/admin/assets/_edit.html.erb
View File

@ -4,9 +4,11 @@
<h3><%= t('editing.asset') %></h3>
</div>
<%= form_for @asset, :url => admin_asset_path(@asset), :remote => true do |f| %>
<div class="modal-body" id="modal_body">
<div class="modal-body main-forms" id="modal_body">
<fieldset>
<%= f.error_messages %>
<%= render :partial => "form", :locals => { :f => f } %>
</fieldset>
</div>
<div class="modal-footer">
<a href="#" class="btn" data-dismiss="modal">Close</a>

10
app/views/admin/assets/_form.html.erb
View File

@ -1,9 +1,13 @@
<div class="control-group">
<div class="input-area form-horizontal">
<div class="nav-name">
<strong>Language</strong>
</div>
<ul class="nav nav-pills language-nav">
<% @site_in_use_locales.each_with_index do |locale, i| %>
<li <%= ( i == 0 ) ? "class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
<% end %>
</ul>
<div class="tab-content">
<% @site_in_use_locales.each_with_index do |locale, i| %>
<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
<div class="control-group input-title">
@ -19,14 +23,13 @@
<%= f.fields_for :description_translations do |f| %>
<div class="controls">
<div class="textarea">
<%= f.text_area locale, :style=>"width:100%;height:100px", :class => '', :value => (@asset.description_translations[locale] rescue nil) %>
<%= f.text_area locale, :style=>"height:100px", :class => '', :value => (@asset.description_translations[locale] rescue nil) %>
</div>
</div>
<% end %>
</div>
</div>
<% end %>
</div>
<div class="control-group">
<label class="control-label muted"><%= f.label :data, t(:data) %></label>
@ -34,3 +37,4 @@
<%= f.file_field :data, :class => 'upload' %>
</div>
</div>
</div>

2
app/views/admin/assets/index.html.erb
View File

@ -319,10 +319,10 @@
</div>
</div>
</div>
<div id="editform" class="modal hide fade"></div>
</fieldset>
</div>
<div id="editform" class="modal hide fade"></div>
<% content_for :page_specific_javascript do %>
<%= javascript_include_tag "file-upload/vendor/jquery.ui.widget.js" %>
<%= javascript_include_tag "file-upload/tmpl.min.js" %>

8
app/views/layouts/page_layout.html.erb
View File

@ -4,17 +4,17 @@
<%= render 'layouts/meta' %>
<meta charset="utf-8">
<%= page_title(@item).html_safe %>
<link rel="shortcut icon" href="<%= asset_path "ncculogo.ico" %>">
<!-- <link rel="shortcut icon" href="<%= asset_path "ncculogo.ico" %>"> -->
<%= page_metas(@item).html_safe %>
<!--[if lt IE 9]>
<%= javascript_include_tag "html5" %>
<![endif]-->
<%= stylesheet_link_tag "page_layout" %>
<%= page_stylesheets(@item).html_safe %>
<%= javascript_include_tag "page_layout" %>
<%= page_javascripts(@item).html_safe %>
<%= javascript_include_tag "orbit_js_1.0.1-front-end.js" unless @no_orbit_bar %>
<%= csrf_meta_tag %>
<!--[if lt IE 9]>
<%= javascript_include_tag "html5" %>
<![endif]-->
</head>
<body>
<%= yield %>

2
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_and_web_links.html.erb vendored
View File

@ -32,4 +32,4 @@
<% content_for :page_specific_javascript do %>
<% end %>
<%= stylesheet_link_tag "announcement/bulletins_and_web_links" %>
<%#= stylesheet_link_tag "announcement/bulletins_and_web_links" %>

2
vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/_index.html.erb vendored
View File

@ -86,7 +86,7 @@
<% end %>
<%= stylesheet_link_tag "archive/archives" %>
<%#= stylesheet_link_tag "archive/archives" %>

4
vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb vendored
View File

@ -1,11 +1,11 @@
<%= stylesheet_link_tag "default_widget" %>
<%#= stylesheet_link_tag "default_widget" %>
<%= javascript_include_tag "mobile/jquery.mu.image.resize.js" %>
<div id="archive_file_widget">
<%= render 'index' %>
</div>
<%= stylesheet_link_tag "archive/archives" %>
<%#= stylesheet_link_tag "archive/archives" %>

4
vendor/built_in_modules/archive/app/views/panel/archive/widget/archive_files/index.html.erb vendored
View File

@ -1,8 +1,8 @@
<%= stylesheet_link_tag "default_widget" %>
<%#= stylesheet_link_tag "default_widget" %>
<%= javascript_include_tag "mobile/jquery.mu.image.resize.js" %>
<div id="archive_file_widget">
<%= render 'index' %>
</div>
<%= stylesheet_link_tag "archive/archives" %>
<%#= stylesheet_link_tag "archive/archives" %>

2
vendor/built_in_modules/ask/app/views/panel/ask/front_end/ask_questions/index.html.erb vendored
View File

@ -1,4 +1,4 @@
<link href='/assets/ask.css' rel='stylesheet' type='text/css' />
<!-- <link href='/assets/ask.css' rel='stylesheet' type='text/css' /> -->
<style type="text/css">
.spinner {
position: fixed;

4
vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/_album.html.erb vendored
View File

@ -1,14 +1,14 @@
<div class='rgalbum'>
<a title='<%= album.name %>' href='<%= panel_gallery_front_end_album_path(album) %>'>
<a class='cover' title='<%= album.name %>' href='<%= panel_gallery_front_end_album_path(album) %>'>
<% if album.cover == "default" %>
<%= image_tag "gallery/default.jpg" %>
<% else %>
<img src="<%= album.cover_path %>">
<% end %>
</a>
<span class='categoryname'><i class='icon-folder-close'></i><%= Category.find(album.category_id).title %></span>
<span class='albumname'>
<a title='<%= album.description %>' href='<%= panel_gallery_front_end_album_path(album) %>'><%= album.name %></a>
</span>
<span class='categoryname'><i class='icon-folder-close'></i><%= Category.find(album.category_id).title %></span>
<span class='tagnames'></span>
</div>

2
vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/index.html.erb vendored
View File

@ -1,4 +1,4 @@
<%= stylesheet_link_tag "gallery_frontend" %>
<%#= stylesheet_link_tag "gallery_frontend" %>
<div id="orbit_gallery" class="rg">
<div class="rgbody">

2
vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/show.html.erb vendored
View File

@ -1,4 +1,4 @@
<%= stylesheet_link_tag "gallery_frontend" %>
<%#= stylesheet_link_tag "gallery_frontend" %>
<div id="orbit_gallery" class="rg">
<div class="rgbody">

2
vendor/built_in_modules/gallery/app/views/panel/gallery/widget/albums/widget1.html.erb vendored
View File

@ -1,4 +1,4 @@
<%= stylesheet_link_tag "widget_gallery" %>
<%#= stylesheet_link_tag "widget_gallery" %>
<%# content_for :page_specific_javascript do %>
<%#= javascript_include_tag "cycle" %>
<%# end %>

2
vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/index.html.erb vendored
View File

@ -108,4 +108,4 @@
<% end %>
<%= stylesheet_link_tag "member/members" %>
<%#= stylesheet_link_tag "member/members" %>

2
vendor/built_in_modules/member_staff/app/views/panel/member_staff/front_end/member_staff_lists/index.html.erb vendored
View File

@ -197,4 +197,4 @@
<% end %>
<%= stylesheet_link_tag "member_staff/members" %>
<%#= stylesheet_link_tag "member_staff/members" %>

13
vendor/built_in_modules/video/app/views/panel/video/front_end/channel_videos/index.html.erb vendored
View File

@ -1,9 +1,14 @@
<h2>Videos</h2>
<div class="video-widget">
<h3 class="h3">Videos</h3>
<ul class="video-list">
<% @client_videos.videos.each do |v| %>
<% @video = v.video_id.split(/tag:youtube.com,2008:video:+/).last %>
<% @vd = UnvlogIt.new("https://www.youtube.com/watch?v=#{@video}")%>
<li><p class="video-title"><%= @vd.title %>
<div class="video"><%=link_to image_tag(@vd.thumbnail, :size => '200x150'), "https://www.youtube.com/watch?v=#{@video}", :target => "blank" %></div></li>
<li>
<p class="video-title"><%= @vd.title %></p>
<div class="video">
<%=link_to image_tag(@vd.thumbnail, :size => '200x150'), "https://www.youtube.com/watch?v=#{@video}", :class => "cover", :target => "blank" %>
</div>
</li>
<%end%>
</div>

2
vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/index.html.erb vendored
View File

@ -33,4 +33,4 @@
<%#= paginate @web_links, :param_name => :page_main, :params => {:inner => false}%>
<%= stylesheet_link_tag "web_resource/links" %>
<%#= stylesheet_link_tag "web_resource/links" %>

2
vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/index.html.erb vendored
View File

@ -4,4 +4,4 @@
<%= stylesheet_link_tag "web_resource/links" %>
<%#= stylesheet_link_tag "web_resource/links" %>