Project

General

Profile

« Previous | Next » 

Revision 9161008b

Added by Amos Benari about 13 years ago

  • ID 9161008b9bc7c5d15ebd7e9025bc8995808654c0

added search bookmarks, fixes #836

  • adds sub navigations under main menu items, each sub navigation is a bookmark.
  • adds visual improvements to main menu

    app/controllers/bookmarks_controller.rb | 74 ++++++++
    app/helpers/application_helper.rb | 2
    app/helpers/bookmarks_helper.rb | 2 +
    app/helpers/home_helper.rb | 13 +

    app/models/bookmark.rb | 22 ++
    app/views/bookmarks/_form.html.erb | 17 +
    +
    app/views/bookmarks/_list.html.erb | 5
    app/views/bookmarks/edit.html.erb | 7 +
    app/views/bookmarks/index.html.erb | 25 +
    ++
    app/views/bookmarks/new.html.erb | 5
    app/views/bookmarks/welcome.html.erb | 8 +
    app/views/common/_searchbar.erb | 5 +
    app/views/home/_menu.erb | 34 +
    ---
    app/views/home/_settings.html.erb | 62 +++----
    app/views/layouts/application.html.erb | 5
    config/routes.rb | 2 +
    db/migrate/20110417102947_add_table_bookmarks.rb | 27 +
    ++
    public/images/header_bg.png | Bin 1416 -> 1266 bytes
    public/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 0 -> 180 bytes
    public/images/ui-bg_flat_55_fbec88_40x100.png | Bin 0 -> 182 bytes
    public/images/ui-bg_glass_85_dfeffc_1x400.png | Bin 0 -> 123 bytes
    public/images/ui-bg_glass_95_fef1ec_1x400.png | Bin 0 -> 119 bytes
    .../images/ui-bg_gloss-wave_55_5c9ccc_500x100.png | Bin 0 -> 4033 bytes
    .../images/ui-bg_inset-hard_100_f5f8f9_1x100.png | Bin 0 -> 104 bytes
    public/images/ui-icons_2e83ff_256x240.png | Bin 0 -> 4369 bytes
    public/images/ui-icons_469bdd_256x240.png | Bin 0 -> 4369 bytes
    public/images/ui-icons_6da8d5_256x240.png | Bin 0 -> 4369 bytes
    public/images/ui-icons_cd0a0a_256x240.png | Bin 0 -> 4369 bytes
    public/images/ui-icons_d8e7f3_256x240.png | Bin 0 -> 4369 bytes
    public/images/ui-icons_f9bd01_256x240.png | Bin 0 -> 4369 bytes
    public/javascripts/menu.js | 147 ++++++++++++++++++
    public/stylesheets/style.css | 75 +++----
    test/fixtures/bookmarks.yml | 13 +
    test/functional/bookmarks_controller_test.rb | 41 +
    ++++
    test/unit/bookmark_test.rb | 30 +++
    test/unit/helpers/bookmarks_helper_test.rb | 4 +
    36 files changed, 534 insertions(
    ), 91 deletions(-)
    create mode 100644 app/controllers/bookmarks_controller.rb
    create mode 100644 app/helpers/bookmarks_helper.rb
    create mode 100644 app/models/bookmark.rb
    create mode 100644 app/views/bookmarks/_form.html.erb
    create mode 100644 app/views/bookmarks/_list.html.erb
    create mode 100644 app/views/bookmarks/edit.html.erb
    create mode 100644 app/views/bookmarks/index.html.erb
    create mode 100644 app/views/bookmarks/new.html.erb
    create mode 100644 app/views/bookmarks/welcome.html.erb
    create mode 100644 db/migrate/20110417102947_add_table_bookmarks.rb
    create mode 100644 public/images/ui-bg_flat_0_aaaaaa_40x100.png
    create mode 100644 public/images/ui-bg_flat_55_fbec88_40x100.png
    create mode 100644 public/images/ui-bg_glass_85_dfeffc_1x400.png
    create mode 100644 public/images/ui-bg_glass_95_fef1ec_1x400.png
    create mode 100644 public/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
    create mode 100644 public/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
    create mode 100644 public/images/ui-icons_2e83ff_256x240.png
    create mode 100644 public/images/ui-icons_469bdd_256x240.png
    create mode 100644 public/images/ui-icons_6da8d5_256x240.png
    create mode 100644 public/images/ui-icons_cd0a0a_256x240.png
    create mode 100644 public/images/ui-icons_d8e7f3_256x240.png
    create mode 100644 public/images/ui-icons_f9bd01_256x240.png
    create mode 100644 public/javascripts/menu.js
    create mode 100644 test/fixtures/bookmarks.yml
    create mode 100644 test/functional/bookmarks_controller_test.rb
    create mode 100644 test/unit/bookmark_test.rb
    create mode 100644 test/unit/helpers/bookmarks_helper_test.rb

Signed-off-by: Ohad Levy <>

View differences:

public/stylesheets/style.css
.auto_complete {
width: 60%;
width: 73%;
position: absolute;
top:12px;
left: 320px;
left: 240px;
min-width: 600px;
}
.auto_complete_input {
font-family: Verdana, Helvetica, Arial;
padding: 0px 20px 0px 10px;
font-size: 1em;
width: 80%;
border-radius: 10px;
padding: 0px 20px 3px 10px;
margin: 0 2px 0 0;
font-size: 14px;
width: 70%;
border-radius: 8px;
}
.auto_complete_submit{
font-family: Verdana, Helvetica, Arial;
padding: 3px 8px;
.auto_complete_clear{
background: url('../images/ui-icons_6da8d5_256x240.png') right center no-repeat;
background-position: -32px -192px;
font-size: 12px;
border-radius: 5px;
}
.auto_complete_submit:active{
background: -moz-linear-gradient(top, #c2c3c0, #e4e5e4);
background: -webkit-gradient(linear, left top, left bottom, from(#c2c3c0), to(#e4e5e4));
box-shadow: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
}
.auto_complete_submit:hover, .auto_complete_submit:focus{
background: -moz-linear-gradient(top, white, white, #cfcfcf);
background: -webkit-gradient(linear, left top, left bottom, from(white), color-stop(0.6, white), to(#cfcfcf));
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
color: black;
padding: 0px 8px;
margin: 0px 0px 0px -20px;
}
.auto_complete_clear{
font-family: Verdana, Helvetica, Arial;
.auto_complete_clear:hover {
background: url('../images/ui-icons_217bc0_256x240.png') right center no-repeat;
background-position: -32px -192px;
font-size: 1em;
font-weight: bold;
text-decoration: none;
font-size: 12px;
padding: 0px 8px;
margin: 0px 4px 0px -20px;
display: inline;
margin: 0px 0px 0px -20px;
}
.ui-autocomplete-completed {
color: #aaa;
......
.ui-autocomplete-loading
{
background: white url('../images/spinner.gif') right center no-repeat;
margin: 0 -2px 0 0;
}
* {margin:0;padding:0;}
......
#wrap {min-height: 100%;}
#main {overflow:auto;
#main {
padding-bottom: 50px;} /* must be same height as the footer */
#footer {position: relative;
......
padding: 6px 0 4px 18px; /* push text down 1px */
}
.nomargin {
margin: none;
}
/* text align left */
.la { text-align: left; }
/* text align right */
......
.fr { float: right; }
/* float left */
.fl { float: left; }
/*
Menu
*/
.group:after { visibility: hidden; display: block; font-size: 0; content: " "; clear: both; height: 0; }
*:first-child+html .group { zoom: 1; } /* IE7 */
#menu1 { margin: 0 auto; list-style: none; position: absolute; top: 47px; width: 960px; }
#menu1 li { display: inline; text-transform: uppercase; font-weight: bold; float: left; }
#menu1 li a{ color: #455054; font-size: 14px; display: block; padding: 6px 10px 4px 10px; text-decoration: none; }
#menu1 li a:hover { color: white; }
#menu1 li span{}
#magic-line { position: absolute; top: -1px; left: 0; width: 100px; height: 2px; background: #fe4902; }
.current_page_item a {
background: url(../images/ui-bg_glass_85_dfeffc_1x400.png) 50% 50% repeat-x;
height: 23px;
-moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; border-top-right-radius: 5px;
-moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; border-top-left-radius: 5px;
}
.menu-dropdown {text-transform: capitalize;}

Also available in: Unified diff