Skip to content
This repository has been archived by the owner on Mar 8, 2021. It is now read-only.

Commit

Permalink
Merge pull request #1195 from Nicola1971/develop
Browse files Browse the repository at this point in the history 
[i] Document overview > View Children: buttons+font awesome
  • Loading branch information
@Dmi3yy
Dmi3yy committed Jan 16, 2017
2 parents 6ee04af + 5f59f2c commit ec578f8
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
25 changes: 12 additions & 13 deletions manager/actions/document_data.static.php
View file
Expand Up @@ -145,18 +145,17 @@

// дописываем в заголовок класс для неопубликованных плюс по всем ссылкам обратный путь
// для сохранения сортировки
$icon_pub_unpub = (!$children['published']) ? '<a href="index.php?a=61&amp;id='.$children['id'].$add_path.'" title="'.$_lang["publish_resource"].'"><img src="' . $_style["icons_publish_document"] .'" /></a>' : '<a
href="index.php?a=62&amp;id='.$children['id'].$add_path.'" title="'.$_lang["unpublish_resource"].'"><img src="' . $_style["icons_unpublish_resource"] .'" /></a>';
$icon_del_undel = (!$children['deleted']) ? '<a href="index.php?a=6&amp;id='.$children['id'].$add_path.'" title="'.$_lang['delete_resource'].'"><img src="' . $_style["icons_delete_document"] .'" /></a>' : '<a href="index.php?a=63&amp;id='.$children['id'].$add_path.'" title="'.$_lang['undelete_resource'].'"><img src="' . $_style["icons_undelete_resource"] .'" /></a>';
$icon_pub_unpub = (!$children['published']) ? '<a class="btn btn-xs btn-default" href="index.php?a=61&amp;id='.$children['id'].$add_path.'" title="'.$_lang["publish_resource"].'"><i class="' . $_style["icons_publish_document"] .'"></i></a>' : '<a class="btn btn-xs btn-default" href="index.php?a=62&amp;id='.$children['id'].$add_path.'" title="'.$_lang["unpublish_resource"].'"><i class="' . $_style["icons_unpublish_resource"] .'" ></i></a>';
$icon_del_undel = (!$children['deleted']) ? '<a onclick="return confirm(\''.$_lang["confirm_delete_resource"].'\')" class="btn btn-xs btn-default" href="index.php?a=6&amp;id='.$children['id'].$add_path.'" title="'.$_lang['delete_resource'].'"><i class="' . $_style["icons_delete_resource"] .'"></i></a>' : '<a onclick="return confirm(\''.$_lang["confirm_undelete"].'\')" class="btn btn-xs btn-default" href="index.php?a=63&amp;id='.$children['id'].$add_path.'" title="'.$_lang['undelete_resource'].'"><i class="' . $_style["icons_undelete_resource"] .'"></i></a>';
$listDocs[] = array(
'docid' => $children['id'],
'title' => (($children['deleted'] ? ('<span class="deleted">'.$children['pagetitle'].'</span>') : ( ($modx->hasPermission('edit_document')) ? ('<a href="index.php?a=27&amp;id='.$children['id'].$add_path.'">' . ($children['published']?$children['pagetitle']:'<span class=unpublish>'.$children['pagetitle'].'</span>') . '</a>') : $children['pagetitle'] ))),
'createdon' => ($modx->toDateFormat($children['createdon']+$server_offset_time,'dateOnly')),
'pub_date' => ($children['pub_date']? ($modx->toDateFormat($children['pub_date']+$server_offset_time,'dateOnly')) : ''),
'status' => ($children['published'] == 0) ? '<span class="unpublishedDoc">'.$_lang['page_data_unpublished'].'</span>' : '<span class="publishedDoc">'.$_lang['page_data_published'].'</span>',
'edit' => (($modx->hasPermission('edit_document')) ? '&nbsp;<a href="index.php?a=27&amp;id='.$children['id'].$add_path.'" title="'.$_lang['edit'].'"><img src="' . $_style["icons_save"] .'" /></a>&nbsp;<a href="index.php?a=51&amp;id='.$children['id'].$add_path.'" title="'.$_lang['move'].'"><img
src="' . $_style["icons_move_document"] .'" /></a>&nbsp;'.$icon_pub_unpub .'&nbsp;': '') .
(($modx->hasPermission('delete_document')) ? '&nbsp;' . $icon_del_undel : ''),
'edit' => (($modx->hasPermission('edit_document')) ? '&nbsp;<a class="btn btn-xs btn-default" href="index.php?a=27&amp;id='.$children['id'].$add_path.'" title="'.$_lang['edit'].'"><i class="' . $_style["icons_edit_resource"] .'"></i></a>&nbsp;<a class="btn btn-xs btn-default" href="index.php?a=51&amp;id='.$children['id'].$add_path.'" title="'.$_lang['move'].'"><i
class="' . $_style["icons_move_document"] .'"></i></a>&nbsp;'.$icon_pub_unpub .'&nbsp;': '') .
(($modx->hasPermission('delete_document')) ? $icon_del_undel : ''),
);

/****************/
Expand Down Expand Up @@ -202,19 +201,19 @@ function movedocument() {
<div id="actions">
<ul class="actionButtons">
<li id="Button1" class="transition">
<a href="#" onclick="editdocument();"><img src="<?php echo $_style["icons_edit_document"] ?>" /> <?php echo $_lang['edit']?></a>
<a href="#" onclick="editdocument();"><?php echo $_lang['edit']?></a>
</li>
<li id="Button2" class="transition">
<a href="#" onclick="movedocument();"><img src="<?php echo $_style["icons_move_document"] ?>" /> <?php echo $_lang['move']?></a>
<a href="#" onclick="movedocument();"><?php echo $_lang['move']?></a>
</li>
<li id="Button6">
<a href="#" onclick="duplicatedocument();"><img src="<?php echo $_style["icons_resource_duplicate"] ?>" /> <?php echo $_lang['duplicate']?></a>
<a href="#" onclick="duplicatedocument();"><?php echo $_lang['duplicate']?></a>
</li>
<li id="Button3">
<a href="#" onclick="deletedocument();"><img src="<?php echo $_style["icons_delete_document"] ?>" /> <?php echo $_lang['delete']?></a>
<a href="#" onclick="deletedocument();"><?php echo $_lang['delete']?></a>
</li>
<li id="Button4">
<a href="#" onclick="<?php echo ($modx->config['friendly_urls'] == '1') ? "window.open('".$modx->makeUrl($id)."','previeWin')" : "window.open('".$modx->config['site_url']."index.php?id=$id','previeWin')"; ?>"><img src="<?php echo $_style["icons_preview_resource"]?>" /> <?php echo $_lang['preview']?></a>
<a href="#" onclick="<?php echo ($modx->config['friendly_urls'] == '1') ? "window.open('".$modx->makeUrl($id)."','previeWin')" : "window.open('".$modx->config['site_url']."index.php?id=$id','previeWin')"; ?>"><?php echo $_lang['preview']?></a>
</li>
</ul>
</div>
Expand Down Expand Up @@ -334,8 +333,8 @@ function movedocument() {
<?php if ($modx->hasPermission('new_document')) { ?>

<ul class="actionButtons">
<li><a href="index.php?a=4&amp;pid=<?php echo $content['id']?>"><img src="<?php echo $_style["icons_new_document"]; ?>" align="absmiddle" /> <?php echo $_lang['create_resource_here']?></a></li>
<li><a href="index.php?a=72&amp;pid=<?php echo $content['id']?>"><img src="<?php echo $_style["icons_new_weblink"]; ?>" align="absmiddle" /> <?php echo $_lang['create_weblink_here']?></a></li>
<li><a href="index.php?a=4&amp;pid=<?php echo $content['id']?>"><i class="<?php echo $_style["icons_new_document"]; ?>" align="absmiddle"></i> <?php echo $_lang['create_resource_here']?></a></li>
<li><a href="index.php?a=72&amp;pid=<?php echo $content['id']?>"><i class="<?php echo $_style["icons_new_weblink"]; ?>" align="absmiddle"></i> <?php echo $_lang['create_weblink_here']?></a></li>
</ul>
<?php }
if ($numRecords > 0)
Expand Down
27 changes: 14 additions & 13 deletions manager/media/style/MODxRE2/style.php
View file
Expand Up @@ -85,15 +85,23 @@
$_style['tree_page_word_secure'] = $style_path.'tree/file-word-secure.png';
$_style['tree_page_excel_secure'] = $style_path.'tree/file-excel-secure.png';

// resource overview and managment
$_style['icons_move_document'] = $style_path.'icons/move.png';
$_style['icons_publish_document'] = $style_path.'icons/arrow-up.png';
$_style['icons_unpublish_resource'] = $style_path.'icons/arrow-down.png';
$_style['icons_delete_document'] = $style_path.'icons/trash.png';
//View Resource data
$_style['icons_new_document'] = 'fa fa-file-o fa-lg';
$_style['icons_new_weblink'] = 'fa fa-link fa-lg';
$_style['icons_move_document'] = 'fa fa-arrows fa-fw fa-lg';
$_style['icons_publish_document'] = 'fa fa-arrow-up fa-fw fa-lg';
$_style['icons_unpublish_resource'] = 'fa fa-arrow-down fa-fw fa-lg';
$_style['icons_delete_resource'] = 'fa fa-trash fa-fw fa-lg';
$_style['icons_undelete_resource'] = 'fa fa-arrow-circle-o-up fa-fw fa-lg';
$_style['icons_resource_overview'] = 'fa fa-info fa-fw fa-lg';
$_style['icons_edit_resource'] = 'fa fa-pencil-square-o fa-fw fa-lg';
//context menu
$_style['icons_resource_duplicate'] = $style_path.'icons/clone.png';
$_style['icons_resource_overview'] = $style_path.'icons/info-sign.png';
$_style['icons_edit_document'] = $style_path.'icons/save.png';
$_style['icons_delete_document'] = $style_path.'icons/trash.png';
//locks
$_style['icons_preview_resource'] = $style_path.'icons/eye.png';
$_style['icons_secured'] = $style_path.'icons/lock.png';

//file manager icons
$_style['files_save'] = 'fa fa-floppy-o fa-fw fa-lg';
Expand Down Expand Up @@ -133,13 +141,6 @@
$_style['icons_modules'] = $style_path.'icons/modules.png';
$_style['icons_run'] = $style_path.'icons/play.png';

//View Resource data
$_style['icons_new_document'] = $style_path.'icons/save.png';
$_style['icons_new_weblink'] = $style_path.'icons/link.png';
$_style['icons_undelete_resource'] = $style_path.'icons/undelete.png';
$_style['icons_secured'] = $style_path.'icons/lock.png';


//users and webusers
$_style['icons_user'] = $style_path.'icons/user.png';

Expand Down

0 comments on commit ec578f8

Please sign in to comment.