Skip to content

Commit

Permalink
remove jquerycssmenu.css, replace ul/li by button tag (#511)
Browse files Browse the repository at this point in the history
This is because jquerycssmenu license doesn't permit redistribution, and so is
problematic for Debian inclusion.

We replace the code by custom CSS using <button> tag instead of the ul/li

License of jquerycssmenu.css is actually unsure and not to be found. In the past I
attributed it to this license without being sure:

License: Dynamic-Drive-CSS-Library
 Dynamic Drive CSS Library Usage Terms <http://www.dynamicdrive.com/style/>
 .
   The CSS codes offered in [37]Dynamic Drive CSS Library are free for use
   on both personal and commercial sites. However, the following usage
   terms exist, and must be understood/ abided by first:
    1. Users may use any CSS code offered for download on [38]Dynamic
       Drive's CSS Library, free of charge, on both personal and
       commercial web sites. This includes web designers who wish to use
       our CSS codes in their paid web site projects.
    2. Users may NOT, however, redistribute or repost/ resell for download
       any CSS code (including any graphics) found in the CSS library.
       Redistribution is defined as re-offering our codes for download in
       any fashion, whether on a competing web site, an application that
       generates code snippets, or a CD-ROM collection of CSS/JavaScript
       codes etc. Some examples of what is acceptable and what is not are:
          + Acceptable:
            -Use our CSS codes on any personal or commercial web site to
            aid in its appearance/ usability.
            -As a web designer, use our CSS codes in your paid projects
            for your client web sites.
            -As a software developer, use our CSS codes within a
            application/ program as part of its interface, such as a CSS
            menu being used as the program's navigation interface. The
            program itself can be distributable.
          + Not Acceptable:
            -Put our CSS codes (including graphics) on another webmaster
            type site for others to download.
            -Use our CSS codes in any type of service or application
            whereby our codes are part of the product offerings
            themselves.
            -Put our CSS code in any other types of medium for
            redistribution, such as a CD-ROM that consists of, but not
            limited to, webmaster codes and web graphics.
    3. Users agree not to remove/ edit the credit notice within the CSS
       source code, or claim the code to be work of their own.
    4. Users are not required to link back to Dynamic Drive CSS library to
       use our CSS codes, as much as they are appreciated. :)
    5. Users agree not to hold Dynamic Drive liable for any damages
       resulted from proper or improper use of any of the CSS codes found
       in the CSS Library. Use at your own risk.
 .
 By using any code offered in our CSS Library, it is understood you have read
 and agreed to the above usage terms.
  • Loading branch information
tenzap authored Oct 29, 2024
1 parent 43047ce commit c05d7f0
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 131 deletions.
1 change: 0 additions & 1 deletion application/views/main/messages/index.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<link type="text/css" rel="stylesheet" href="<?php echo $this->config->item('css_path');?>jquery-plugin/jquerycssmenu.css" />
<?php if ($this->uri->segment(2) !== 'conversation' && $this->uri->segment(2) !== 'search')
{
$this->load->view('js_init/message/js_function');
Expand Down
69 changes: 41 additions & 28 deletions application/views/main/messages/navigation.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?php $this->load->helper('inflector'); ?>

<div class="jquerycssmenu">
<ul>
<?php
<div class="bttn-container">
<?php
if ($this->uri->segment(2) === 'conversation'):
if ($this->uri->segment(3) === 'folder'):

Expand Down Expand Up @@ -33,55 +32,69 @@
}
}
?>
<li><?php echo anchor('messages/folder/'.$this->uri->segment(4), '&lsaquo;&lsaquo; '.tr('Back to {0}', NULL, $theFname), array('class' => 'button', 'id' => 'back_threadlist'));?></li>
<?php else: ?>
<li><?php echo anchor('messages/my_folder/'.$this->uri->segment(4).'/'.$this->uri->segment(6), '&lsaquo;&lsaquo; '.tr('Back to {0}', NULL, humanize($this->Kalkun_model->get_folders('name', $this->uri->segment(6))->row('name'))), array('class' => 'button', 'id' => 'back_threadlist'));?></li>
<li>&nbsp;</li>
<?php endif;?>
<?php endif;?>
<li><a href="javascript:void(0);" class="select_all_button button"><?php echo tr('Select all');?></a></li>
<li><a href="javascript:void(0);" class="clear_all_button button"><?php echo tr('Deselect all');?></a></li>
<li>&nbsp;</li>
<div class="bttn-group">
<button><?php echo anchor('messages/folder/'.$this->uri->segment(4), '&lsaquo;&lsaquo; '.tr('Back to {0}', NULL, $theFname), array('class' => 'button', 'id' => 'back_threadlist'));?></button>
</div>
<?php else: ?>
<div class="bttn-group">
<button><?php echo anchor('messages/my_folder/'.$this->uri->segment(4).'/'.$this->uri->segment(6), '&lsaquo;&lsaquo; '.tr('Back to {0}', NULL, humanize($this->Kalkun_model->get_folders('name', $this->uri->segment(6))->row('name'))), array('class' => 'button', 'id' => 'back_threadlist'));?></button>
</div>

<?php endif;?>
<?php endif;?>
<div class="bttn-group">
<button><a href="javascript:void(0);" class="select_all_button button"><?php echo tr('Select all');?></a></button>
<button><a href="javascript:void(0);" class="clear_all_button button"><?php echo tr('Deselect all');?></a></button>
</div>

<div class="bttn-group">
<?php if ($this->uri->segment(2) === 'conversation' && $this->uri->segment(4) === 'inbox') :
if ($this->uri->segment(6) !== '6') : ?>
<li><a href="javascript:void(0);" class="spam_button button"><?php echo tr('Report spam');?></a></li>
<button><a href="javascript:void(0);" class="spam_button button"><?php echo tr('Report spam');?></a></button>
<?php else : ?>
<li><a href="javascript:void(0);" class="ham_button button"><?php echo tr('Not spam');?></a></li>
<button><a href="javascript:void(0);" class="ham_button button"><?php echo tr('Not spam');?></a></button>
<?php endif;
endif;?>
</div>

<div class="bttn-group">
<?php
if ($this->uri->segment(2) === 'folder' && $this->uri->segment(3) === 'outbox'):
elseif ($this->uri->segment(2) === 'conversation' && $this->uri->segment(4) === 'outbox'):
else:?>
<li>&nbsp;</li>

<?php if ($this->uri->segment(4) === '5' or $this->uri->segment(6) === '5') : ?>
<li><a href="javascript:void(0);" class="recover_button button"><?php echo tr('Recover');?></a></li>
<button><a href="javascript:void(0);" class="recover_button button"><?php echo tr('Recover');?></a></button>
<?php endif; ?>
<li><a class="move_to_button button" href="javascript:void(0);"><?php echo tr('Move to');?></a></li>
<button><a class="move_to_button button" href="javascript:void(0);"><?php echo tr('Move to');?></a></button>
<?php endif; ?>
<li><a class="global_delete button" href="javascript:void(0);">
<button><a class="global_delete button" href="javascript:void(0);">
<?php
if ($this->uri->segment(4) === '5' or $this->uri->segment(6) === '5' or $this->uri->segment(4) === '6' or $this->uri->segment(6) === '6'):
echo tr('Delete permanently');
else:
echo tr('Delete');
endif;
?></a></li>
<?php if ($this->uri->segment(2) !== 'search'): ?>
<li>&nbsp;</li>
<li><a href="javascript:void(0);" class="refresh_button button"><?php echo tr('Refresh');?></a></li>
<?php endif; ?>
?></a></button>
</div>
<?php if ($this->uri->segment(2) !== 'search'): ?>

<div class="bttn-group">
<button><a href="javascript:void(0);" class="refresh_button button"><?php echo tr('Refresh');?></a></button>
</div>
<?php endif; ?>

<div class="bttn-group">
<?php if ($this->uri->segment(2) === 'conversation' && $this->uri->segment(4) === 'sentitems'): ?>
<li>&nbsp;</li>
<li><a href="javascript:void(0);" class="resend_bulk button"><?php echo tr('Resend');?></a></li>

<button><a href="javascript:void(0);" class="resend_bulk button"><?php echo tr('Resend');?></a></button>
<?php endif; ?>

<?php if ($pagination_links !== ''): ?>
<li class="paging">
<button class="paging">
<div id="paging"><?php echo $pagination_links;?></div>
</li>
</button>
<?php endif; ?>
</div>

</ul>
</div>
32 changes: 32 additions & 0 deletions media/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -1165,3 +1165,35 @@ input#groups {
line-height: 10px !important;
font-size: 12px !important;
}

.bttn-container {
background: #86C0D2;
margin: 0px;
padding: 5px;
overflow: auto;
color: #444;
}

.bttn-container:after {
content: "";
clear: both;
display: table;
}

.bttn-group button {
padding: 3px 8px;
background: linear-gradient(to bottom, white, rgba(222, 222, 222, 1));
border: 1px outset #F0F0F0;
float: left;
font-family: inherit;
}

.bttn-group button:last-child {
margin-right: 0.7ex;
}

.bttn-group button a {
text-decoration: none;
font-size: 11px;
color: #000;
}
102 changes: 0 additions & 102 deletions media/css/jquery-plugin/jquerycssmenu.css

This file was deleted.

0 comments on commit c05d7f0

Please sign in to comment.