Merge branch 'design_team' into ldap
Conflicts: app/views/devise/sessions/new.html.erb
This commit is contained in:
Christophe Vilayphiou
commit
308cfc7cf2
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 2.4 KiB |
|
|
@ -47,10 +47,12 @@ $(document).ready(function(){
|
|||
|
||||
/*tinyscrollbar&windows-Size*/
|
||||
resize();
|
||||
var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2;
|
||||
var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2,
|
||||
$subWiget = $('#sub-wiget').width()+18;
|
||||
$('#main-sidebar').css("height", viewportheight-30);
|
||||
$('#main-sidebar .viewport').css("height", viewportheight-30);
|
||||
$('.post-title').css("width", viewportwidth-495);
|
||||
$('#post-body').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget);
|
||||
$('.post-title').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget-16);
|
||||
$('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft);
|
||||
$('#main-sidebar').tinyscrollbar();
|
||||
$('.detal-list').tinyscrollbar();
|
||||
|
|
@ -68,10 +70,12 @@ $(document).ready(function(){
|
|||
});
|
||||
$(window).resize(function(){
|
||||
resize();
|
||||
var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2;
|
||||
var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2,
|
||||
$subWiget = $('#sub-wiget').width()+18;
|
||||
$('#main-sidebar').css("height", viewportheight-30);
|
||||
$('#main-sidebar .viewport').css("height", viewportheight-30);
|
||||
$('.post-title').css("width", viewportwidth-495);
|
||||
$('#post-body').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget);
|
||||
$('.post-title').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget-16);
|
||||
$('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft)
|
||||
$('#main-sidebar').tinyscrollbar({size:(viewportheight-34)});
|
||||
mainTablePosition();
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
/*bootstrap-orbit*/
|
||||
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
font-weight:normal ;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
/*bootstrap*/
|
||||
/*!
|
||||
* Bootstrap v2.0.0
|
||||
*
|
||||
|
|
@ -538,7 +539,7 @@ select,
|
|||
width: 210px;
|
||||
height: 18px;
|
||||
padding: 4px;
|
||||
margin-bottom: 9px;
|
||||
/*margin-bottom: 9px;*/
|
||||
font-size: 13px;
|
||||
line-height: 18px;
|
||||
color: #555555;
|
||||
|
|
@ -2664,18 +2665,23 @@ button.btn.small, input[type="submit"].btn.small {
|
|||
display: inline;
|
||||
}
|
||||
|
||||
.pagination .page{
|
||||
/*.pagination .page{
|
||||
float: left;
|
||||
padding: 0 14px;
|
||||
line-height: 34px;
|
||||
text-decoration: none;
|
||||
border: 1px solid #ddd;
|
||||
border-left-width: 0;
|
||||
}
|
||||
}*/
|
||||
.pagination a {
|
||||
float: left;
|
||||
padding: 0 14px;
|
||||
line-height: 34px;
|
||||
text-decoration: none;
|
||||
border: 1px solid #DDD;
|
||||
border-left-width: 0;
|
||||
}
|
||||
.pagination .next{
|
||||
/*.pagination .next{
|
||||
float: left;
|
||||
padding: 0 14px;
|
||||
line-height: 34px;
|
||||
|
|
@ -2690,7 +2696,7 @@ button.btn.small, input[type="submit"].btn.small {
|
|||
text-decoration: none;
|
||||
border: 1px solid #ddd;
|
||||
border-left-width: 0;
|
||||
}
|
||||
}*/
|
||||
.pagination .current{
|
||||
border-left-width: 1px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,77 +0,0 @@
|
|||
.checkblock {
|
||||
display: inline-block;
|
||||
float: left;
|
||||
width: 200px;
|
||||
}
|
||||
.check[type="checkbox"]{
|
||||
display:none;
|
||||
}
|
||||
.checkbox{
|
||||
padding: 5px;
|
||||
margin: 5px 5px 10px;
|
||||
display: inline-block;
|
||||
color:#777777;
|
||||
text-shadow: 0 1px 0px rgba(255,255,255,.4);
|
||||
border-radius: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
height: 30px;
|
||||
position: relative;
|
||||
cursor: pointer;
|
||||
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #ededed), color-stop(1, #dfdfdf) );
|
||||
background:-moz-linear-gradient( center top, #ededed 5%, #dfdfdf 100% );
|
||||
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed', endColorstr='#dfdfdf');
|
||||
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
|
||||
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
|
||||
}
|
||||
.checkbox .check-icon {
|
||||
display: none;
|
||||
position: absolute;
|
||||
width: 26px;
|
||||
height: 26px;
|
||||
background: url('img/check.png') no-repeat left top;
|
||||
right: -10px;
|
||||
top: -5px;
|
||||
}
|
||||
.checkbox .member-name {
|
||||
cursor: pointer;
|
||||
font-family: helvetica;
|
||||
font-size: 12px;
|
||||
line-height: 30px;
|
||||
padding: 0 10px 0 40px;
|
||||
color: #333333;
|
||||
display: inline-block;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.member-avatar {
|
||||
position: absolute;
|
||||
width: 34px;
|
||||
height: 34px;
|
||||
overflow: hidden;
|
||||
margin-top: -2px;
|
||||
}
|
||||
img.member-img {
|
||||
max-width: 100%;
|
||||
}
|
||||
.checked .check-icon {
|
||||
display: block;
|
||||
}
|
||||
.popover-inner {
|
||||
width: auto;
|
||||
display: inline-block;
|
||||
text-align: center;
|
||||
}
|
||||
.popover-title {
|
||||
display: block;
|
||||
font-size: 12px;
|
||||
font-weight: normal;
|
||||
padding: 3px 10px;
|
||||
}
|
||||
.popover-content {
|
||||
padding: 3px 10px;
|
||||
color: #898989;
|
||||
}
|
||||
.popover-content p {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
/*isotope*/
|
||||
|
||||
#isotope {
|
||||
margin-top: 2px;
|
||||
background-color:#f4f4f4;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
.list-remove {
|
||||
position: relative;
|
||||
top: 2px;
|
||||
left: 2px;
|
||||
}
|
||||
/*list*/
|
||||
|
||||
.table th.select {
|
||||
border-bottom:2px solid #0088CC;
|
||||
}
|
||||
|
|
@ -112,9 +109,6 @@ legend {
|
|||
margin-bottom: 15px;
|
||||
padding-bottom: 5px;
|
||||
}
|
||||
.upload-picture {
|
||||
margin-left: 20px;
|
||||
}
|
||||
.subnav {
|
||||
-moz-border-radius: 0;
|
||||
-webkit-border-radius: 0;
|
||||
|
|
@ -149,3 +143,24 @@ legend {
|
|||
display: block;
|
||||
text-align:center;
|
||||
}
|
||||
.sort-header th {
|
||||
padding: 0 8px;
|
||||
vertical-align: inherit;
|
||||
position: relative;
|
||||
}
|
||||
.sort-header th a {
|
||||
display: block;
|
||||
padding: 10px 0;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.sort-header th a:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
#check_all_bulletins {
|
||||
position: absolute;
|
||||
top: 10px;
|
||||
left: 5px;
|
||||
}
|
||||
.list-remove {
|
||||
padding: 8px 0 8px 16px !important;
|
||||
}
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
/*message*/
|
||||
|
||||
.error{
|
||||
color:red;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
/*reset*/
|
||||
|
||||
|
||||
html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video {
|
||||
-webkit-text-size-adjust:none;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
/*scroll_style*/
|
||||
|
||||
@charset "UTF-8";
|
||||
/* CSS Document */
|
||||
.my_scroll {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
/*sidebar*/
|
||||
|
||||
#back_sidebar {
|
||||
left: 0;
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
/*site_assets*/
|
||||
|
||||
.assets_setup{
|
||||
padding:42px 0 0 0;
|
||||
}
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
/*site_designs*/
|
||||
|
||||
.designs_setup{
|
||||
padding:42px 0 0 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
/*site_items*/
|
||||
|
||||
html, body{
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
/*style*/
|
||||
|
||||
@font-face{
|
||||
font-family: 'WebSymbolsRegular';
|
||||
src: url(<%= asset_path 'websymbols-regular-webfont.eot' %>);
|
||||
|
|
@ -371,7 +373,7 @@
|
|||
#post-body .editor {
|
||||
}
|
||||
#post-body-content {
|
||||
margin-right: 320px;
|
||||
/*margin-right: 320px;*/
|
||||
padding: 8px 0 8px 6px;
|
||||
}
|
||||
.filter .accordion-heading > a:hover {
|
||||
|
|
@ -605,6 +607,20 @@
|
|||
.text-green {
|
||||
color: #39b54a !important;
|
||||
}
|
||||
.adbanner-list {
|
||||
margin-top: 20px;
|
||||
}
|
||||
.adbanner-list ul {
|
||||
margin: 0px;
|
||||
}
|
||||
.adbanner-list ul li {
|
||||
list-style: none;
|
||||
margin-left: 0;
|
||||
margin-right: 20px;
|
||||
}
|
||||
.adbanner-action {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
[class^="icons-"] {
|
||||
display: inline-block;
|
||||
width: 16px;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
/*Widget*/
|
||||
|
||||
|
||||
.widget-size-300 {
|
||||
width:298px;
|
||||
}
|
||||
|
|
@ -82,7 +84,7 @@
|
|||
border-radius: 0 3px 3px 0;
|
||||
text-align: left;
|
||||
margin: 0;
|
||||
width: 182px;
|
||||
width: 180px;
|
||||
}
|
||||
.file-upload .upload {
|
||||
margin:0;
|
||||
|
|
|
|||
|
|
@ -8,12 +8,15 @@
|
|||
<%= f.text_field :transition_sec,:placeholder=>"3秒請輸入3000",:class=> "span3" %> <%= t("admin.ad.trans_unit_sec") %>
|
||||
<%= f.submit t("admin.ad.update_banner") %>
|
||||
<%= f.submit t("cancel"),:type=>'reset' %>
|
||||
<div>
|
||||
<%= render :partial => "ad_image_update", :collection => ad_banner_tab.ad_images,:as => :ad_image,:locals=>{:ad_banner => ad_banner_tab} %>
|
||||
<%#= render :partial => 'new_add_banner_file', :object => ad_banner_tab.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %>
|
||||
<div class="adbanner-list">
|
||||
<div class="adbanner-action">
|
||||
<%= link_to t("admin.ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%>
|
||||
<%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab.title) , :class=>'preview_trigger btn btn-success'%>
|
||||
|
||||
</div>
|
||||
<ul class="clear">
|
||||
<%= render :partial => "ad_image_update", :collection => ad_banner_tab.ad_images,:as => :ad_image,:locals=>{:ad_banner => ad_banner_tab} %>
|
||||
</ul>
|
||||
<%#= render :partial => 'new_add_banner_file', :object => ad_banner_tab.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %>
|
||||
</div>
|
||||
<% end -%>
|
||||
<%#= render :partial => 'preview_block',:locals=> {:ad_banner =>ad_banner_tab} %>
|
||||
|
|
|
|||
|
|
@ -9,4 +9,3 @@
|
|||
<%= link_to t('delete'),admin_ad_banner_ad_image_path(ad_banner,ad_image),:class => 'btn',:method => :delete,:confirm => t('sure?') %>
|
||||
</p>
|
||||
</li>
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,6 @@
|
|||
per_page: number of items to fetch per page
|
||||
remote: data-remote
|
||||
-%>
|
||||
<span class="first">
|
||||
<li class="first">
|
||||
<%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote %>
|
||||
</span>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -5,4 +5,4 @@
|
|||
per_page: number of items to fetch per page
|
||||
remote: data-remote
|
||||
-%>
|
||||
<span class="page gap"><%= raw(t 'views.pagination.truncate') %></span>
|
||||
<li class="page gap"><%= raw(t 'views.pagination.truncate') %></li>
|
||||
|
|
|
|||
|
|
@ -6,6 +6,6 @@
|
|||
per_page: number of items to fetch per page
|
||||
remote: data-remote
|
||||
-%>
|
||||
<span class="last">
|
||||
<li class="last">
|
||||
<%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote} %>
|
||||
</span>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -6,6 +6,6 @@
|
|||
per_page: number of items to fetch per page
|
||||
remote: data-remote
|
||||
-%>
|
||||
<span class="next">
|
||||
<li class="next">
|
||||
<%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
|
||||
</span>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -7,6 +7,10 @@
|
|||
per_page: number of items to fetch per page
|
||||
remote: data-remote
|
||||
-%>
|
||||
<span class="page<%= ' current' if page.current? %>">
|
||||
<%= link_to_unless page.current?, page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
|
||||
</span>
|
||||
<li class="page<%= ' active' if page.current? %>">
|
||||
<% if page.current? %>
|
||||
<a><%= page %></a>
|
||||
<% else %>
|
||||
<%= link_to page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
|
||||
<% end %>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,8 @@
|
|||
paginator: the paginator that renders the pagination tags inside
|
||||
-%>
|
||||
<%= paginator.render do -%>
|
||||
<nav class="pagination">
|
||||
<div class="pagination">
|
||||
<ul>
|
||||
<%= first_page_tag unless current_page.first? %>
|
||||
<%= prev_page_tag unless current_page.first? %>
|
||||
<% each_page do |page| -%>
|
||||
|
|
@ -19,5 +20,6 @@
|
|||
<% end -%>
|
||||
<%= next_page_tag unless current_page.last? %>
|
||||
<%= last_page_tag unless current_page.last? %>
|
||||
</nav>
|
||||
</ul>
|
||||
</div>
|
||||
<% end -%>
|
||||
|
|
|
|||
|
|
@ -6,6 +6,6 @@
|
|||
per_page: number of items to fetch per page
|
||||
remote: data-remote
|
||||
-%>
|
||||
<span class="prev">
|
||||
<li class="prev">
|
||||
<%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
|
||||
</span>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,9 @@
|
|||
<%= content_tag :div do -%>
|
||||
<% form_tag :action => "update_setting" do %>
|
||||
<%= render :partial => "privilege_user", :locals => {:users => @users_array} %>
|
||||
<%= submit_tag "Update" %>
|
||||
<div class="form-actions pagination-centered">
|
||||
<%= submit_tag "Update", :class => 'btn' %>
|
||||
</div>
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
</div>
|
||||
|
|
|
|||
Reference in New Issue