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

Merge branch 'design_team' into ldap

This commit is contained in:
Christophe Vilayphiou 2012-05-23 12:11:38 +08:00
parent f1c8bed29d 71d4241a2f
commit c062b43069
7 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/stylesheets/style.css.erb
View File

@ -722,6 +722,9 @@
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 1);
}
#category_id, #module_app_id {
width: auto;
}
[class^="icons-"] {
display: inline-block;

2
app/controllers/orbit_backend_controller.rb
View File

@ -155,7 +155,7 @@ class OrbitBackendController< ApplicationController
def get_viewable(object_class)
objects = get_objects(object_class)
objects = get_objects(object_class).order_by(:created_at, :desc)
Kaminari.paginate_array(objects).page(params[:page]).per(10)
end

2
config/locales/zh_tw.yml
View File

@ -39,7 +39,7 @@ zh_tw:
submit: 送出
sure?: 您肯定嗎?
update: 更新
update: 更新失敗
update_failed: 更新失敗
view: 檢視
view_count: 查看次數
yes_: "Yes"

2
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb vendored
View File

@ -137,6 +137,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
else
@bulletin = Bulletin.new(params[:bulletin])
@bulletin.deadline = nil if @bulletin.deadline < @bulletin.postdate
@bulletin.create_user_id = current_user.id
@bulletin.update_user_id = current_user.id
@ -245,6 +246,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
else
@bulletin = Bulletin.find(params[:id])
@bulletin.deadline = nil if @bulletin.deadline < @bulletin.postdate
@bulletin.update_user_id = current_user.id

2
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb vendored
View File

@ -15,7 +15,7 @@
<div class="upload-picture">
<!--請程式務必將圖片尺寸加入到行內裡-->
<% if @bulletin.image %>
<%= image_tag @bulletin.image, :width=> "456", :height=>'700' rescue ''%>
<%= image_tag @bulletin.image rescue ''%>
<% else %>
<img class="pull-left upload-picture" src="/assets/default-img.png" />
<% end %>

2
vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb vendored
View File

@ -136,6 +136,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
else
@news_bulletin = NewsBulletin.new(params[:news_bulletin])
@news_bulletin.deadline = nil if @news_bulletin.deadline < @news_bulletin.postdate
@news_bulletin.create_user_id = current_user.id
@news_bulletin.update_user_id = current_user.id
@ -244,6 +245,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
else
@news_bulletin = NewsBulletin.find(params[:id])
@news_bulletin.deadline = nil if @news_bulletin.deadline < @news_bulletin.postdate
@news_bulletin.update_user_id = current_user.id

4
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb vendored
View File

@ -15,11 +15,10 @@
<div class="upload-picture">
<!--請程式務必將圖片尺寸加入到行內裡-->
<% if @news_bulletin.image %>
<%= image_tag @news_bulletin.image, :width=> "456", :height=>'700' rescue ''%>
<%= image_tag @news_bulletin.image rescue ''%>
<% else %>
<img class="pull-left upload-picture" src="/assets/default-img.png" />
<% end %>
</div>
<div class="controls file-upload input-prepend">
<label class="control-label add-on btn" for="input-upload">
@ -29,6 +28,7 @@
<span id='fu' class="file-name"></span>
<br>
<input name='fu' class="input-medium" type="text">
<span class="alert widgetInfo"><%= t("admin.ad.widget_info_for_ad_image_size", :best_size=> "290px x 150px") %></span>
<br>
<% if @news_bulletin.image.file %>
<%= f.check_box :remove_image %>