tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.0'

Browse Source 
Conflicts:
	code/model/SiteTree.php
This commit is contained in:
Ingo Schommer 2012-11-06 19:56:04 +01:00
commit bd86cf2c50
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/screen.css
View File

@ -33,7 +33,7 @@
.cms .AssetAdmin .cms-content-fields .cms-edit-form.AssetAdmin { overflow-y: auto; } .cms .AssetAdmin .cms-content-fields .cms-edit-form.AssetAdmin { overflow-y: auto; }
.cms .AssetAdmin .cms-content-fields .cms-content-tools .cms-panel-content { overflow: hidden; } .cms .AssetAdmin .cms-content-fields .cms-content-tools .cms-panel-content { overflow: hidden; }
.cms .AssetAdmin .cms-content-fields .cms-content-tools .cms-panel-content .cms-search-form { height: 100%; } .cms .AssetAdmin .cms-content-fields .cms-content-tools .cms-panel-content .cms-search-form { height: 100%; }
.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li a { font-weight: bold; line-height: 16px; padding: 12px 20px 12px; text-indent: -9999em; background: url(../images/content-header-tabs-sprite.png) no-repeat; } .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li a { font-weight: bold; padding: 0 20px 0; text-indent: -9999em; background: url(../images/content-header-tabs-sprite.png) no-repeat; }
.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li.content-treeview a { background-position: 2px 0px; } .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li.content-treeview a { background-position: 2px 0px; }
.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li.content-galleryview a { background-position: -160px 0px; } .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li.content-galleryview a { background-position: -160px 0px; }
.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li.content-listview a { background-position: -39px 0px; } .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li.content-listview a { background-position: -39px 0px; }

3
scss/_AssetAdmin.scss
View File

@ -16,8 +16,7 @@
li { li {
a { a {
font-weight: bold; font-weight: bold;
line-height: 16px; padding: 0 20px 0;
padding: 12px 20px 12px;
text-indent:-9999em; text-indent:-9999em;
background: url(../images/content-header-tabs-sprite.png) no-repeat; background: url(../images/content-header-tabs-sprite.png) no-repeat;
} }

6
templates/Includes/CMSMain_Content.ss
View File

@ -9,17 +9,17 @@
<div class="cms-content-header-tabs"> <div class="cms-content-header-tabs">
<ul> <ul>
<li class="content-treeview<% if class == 'CMSPageEditController' %> ui-tabs-selected<% end_if %>"> <li class="content-treeview<% if class == 'CMSPageEditController' %> ui-tabs-active<% end_if %>">
<a href="$LinkPageEdit" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageEdit"> <a href="$LinkPageEdit" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageEdit">
<% _t('CMSMain.TabContent', 'Content') %> <% _t('CMSMain.TabContent', 'Content') %>
</a> </a>
</li> </li>
<li class="content-listview<% if class == 'CMSPageSettingsController' %> ui-tabs-selected<% end_if %>"> <li class="content-listview<% if class == 'CMSPageSettingsController' %> ui-tabs-active<% end_if %>">
<a href="$LinkPageSettings" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageSettings"> <a href="$LinkPageSettings" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageSettings">
<% _t('CMSMain.TabSettings', 'Settings') %> <% _t('CMSMain.TabSettings', 'Settings') %>
</a> </a>
</li> </li>
<li class="content-listview<% if class == 'CMSPageHistoryController' %> ui-tabs-selected<% end_if %>"> <li class="content-listview<% if class == 'CMSPageHistoryController' %> ui-tabs-active<% end_if %>">
<a href="$LinkPageHistory" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageHistory"> <a href="$LinkPageHistory" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageHistory">
<% _t('CMSMain.TabHistory', 'History') %> <% _t('CMSMain.TabHistory', 'History') %>
</a> </a>

4
templates/Includes/CMSPagesController_Content.ss
View File

@ -9,10 +9,10 @@
<div class="cms-content-header-tabs"> <div class="cms-content-header-tabs">
<ul> <ul>
<li class="content-treeview<% if ViewState == tree %> ui-tabs-selected<% end_if %>"> <li class="content-treeview<% if ViewState == tree %> ui-tabs-active<% end_if %>">
<a href="#cms-content-treeview" class="cms-panel-link" data-href="$LinkTreeView"><% _t('CMSPagesController.TreeView', 'Tree View') %></a> <a href="#cms-content-treeview" class="cms-panel-link" data-href="$LinkTreeView"><% _t('CMSPagesController.TreeView', 'Tree View') %></a>
</li> </li>
<li class="content-listview<% if ViewState == list %> ui-tabs-selected<% end_if %>"> <li class="content-listview<% if ViewState == list %> ui-tabs-active<% end_if %>">
<a href="#cms-content-listview" class="cms-panel-link" data-href="$LinkListView"><% _t('CMSPagesController.ListView', 'List View') %></a> <a href="#cms-content-listview" class="cms-panel-link" data-href="$LinkListView"><% _t('CMSPagesController.ListView', 'List View') %></a>
</li> </li>
<!-- <!--