From 0a2bbed2a0919c6044d82368fb9e2e7e136183e3 Mon Sep 17 00:00:00 2001 From: Wojciech Todryk Date: Mon, 18 Jun 2012 21:34:30 +0200 Subject: [PATCH] fixes --- AUTHORS => AUTHORS.markdown | 2 + CHANGES.markdown | 12 +++-- UNLICENSE.markdown | 2 + .../tweeter_bootstrap.css.sass.css | 53 +++++++++++++++++++ app/views/contacts/_contact.html.haml | 2 +- app/views/internal/about.html.haml | 38 ++----------- app/views/links/_link.html.haml | 2 +- config/locales/pl.yml | 4 +- config/settings.yml.example | 2 +- lib/mail_plugin_extension.rb | 44 +++++++-------- 10 files changed, 97 insertions(+), 64 deletions(-) rename AUTHORS => AUTHORS.markdown (92%) create mode 100755 app/assets/stylesheets/tweeter_bootstrap.css.sass.css diff --git a/AUTHORS b/AUTHORS.markdown similarity index 92% rename from AUTHORS rename to AUTHORS.markdown index 79766f5..2bdfb37 100755 --- a/AUTHORS +++ b/AUTHORS.markdown @@ -1,3 +1,5 @@ +## Authors + * Luben Manolov * Nick Penkov * Eugene Korbut diff --git a/CHANGES.markdown b/CHANGES.markdown index 3e8909b..bbc65ff 100755 --- a/CHANGES.markdown +++ b/CHANGES.markdown @@ -1,10 +1,16 @@ ## Changes +#### 0.9.1 + + * nowrap to edit column in contacts & links + * decoded changed in mail gem + * fixes in pl locale + #### 0.9.0 - * switch to Rails 3.2.x - * Tweeter Bootstrap as default theme - * many fixes + * switch to Rails 3.2.x + * Tweeter Bootstrap as default theme + * many fixes #### 0.8.6 diff --git a/UNLICENSE.markdown b/UNLICENSE.markdown index 68a49da..d5d5664 100755 --- a/UNLICENSE.markdown +++ b/UNLICENSE.markdown @@ -1,3 +1,5 @@ +## License + This is free and unencumbered software released into the public domain. Anyone is free to copy, modify, publish, use, compile, sell, or diff --git a/app/assets/stylesheets/tweeter_bootstrap.css.sass.css b/app/assets/stylesheets/tweeter_bootstrap.css.sass.css new file mode 100755 index 0000000..781ac99 --- /dev/null +++ b/app/assets/stylesheets/tweeter_bootstrap.css.sass.css @@ -0,0 +1,53 @@ +$blue: #0088CC +$outline: #DDDDDD +$month: #0044CC +$outside: #DDDDDD +$today: #DA4F49 + +.calendar + margin-bottom: 18px + h3 + color: $month + table + width: 100% + border: 1px solid $outline + border-collapse: separate + border-radius: 4px 4px 4px 4px + td + text-align: right + margin: 2px + padding: 2px + border-top: 1px solid $outline + border-left: 1px solid $outline + td.wday + color: $blue + font-weight: bold + text-align: center + td.corner + border-top: 0 none + border-left: 0 none + td.weekend + background-color: $outline + td.outside + background-color: white + color: $outside + td.today + background-color: $today + color: white + font-weight: bold + td.weeknum + color: $blue + font-weight: bold + text-align: center + +.calendar.square + td.wday + border-top: 0 none + td.weeknum + border-left: 0 none + +.calendar.window + td.monthnum + border-top: 0 none + tr > td:first-child + border-left: 0 none diff --git a/app/views/contacts/_contact.html.haml b/app/views/contacts/_contact.html.haml index 4bcd3c7..328fa1a 100755 --- a/app/views/contacts/_contact.html.haml +++ b/app/views/contacts/_contact.html.haml @@ -1,5 +1,5 @@ %tr - %td + %td{:nowrap=>"nowrap"} = check_box_tag "items_ids[]", contact.id \/ = link_to "".html_safe,edit_contact_path(contact) diff --git a/app/views/internal/about.html.haml b/app/views/internal/about.html.haml index 932f700..7fb69df 100755 --- a/app/views/internal/about.html.haml +++ b/app/views/internal/about.html.haml @@ -16,38 +16,8 @@ = raw BlueCloth::new(render :file => 'CHANGES.markdown').to_html .well = raw BlueCloth::new(render :file => 'TODO.markdown').to_html - --# - <% content_for :title do %> - - <%= t(:about,:scope=>:internal) %> - <% end %> - - <% content_for :sidebar do %> - <%= content_for_sidebar %> - <% end %> - -
-
- <%= raw single_navigation(:about,:internal) %> -
-
- -

- <%= t(:current_version,:scope=>:internal) + ": " + $defaults["version"] %> -

- -
- <%= raw BlueCloth::new(render :file => 'README.markdown').to_html %> -
- -
- <%= raw BlueCloth::new(render :file => 'CHANGES').to_html %> -
- -
- <%= raw BlueCloth::new(render :file => 'TODO').to_html %> -
- - -
+.well + = raw BlueCloth::new(render :file => 'AUTHORS.markdown').to_html +.well + = raw BlueCloth::new(render :file => 'UNLICENSE.markdown').to_html diff --git a/app/views/links/_link.html.haml b/app/views/links/_link.html.haml index 470c1ee..9a5e1e7 100755 --- a/app/views/links/_link.html.haml +++ b/app/views/links/_link.html.haml @@ -1,5 +1,5 @@ %tr - %td + %td{:nowrap=>"nowrap"} = check_box_tag "items_ids[]", link.id \/ = link_to "".html_safe,edit_link_path(link) diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 691f829..2ca435c 100755 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -30,8 +30,7 @@ pl: goto: Idź do contact: nick: Pseudonim - first_name: Imię - last_name: Nazwisko + name: Nazwa email: E-mail info: Informacje dodatkowe prefs: @@ -86,6 +85,7 @@ pl: were_imported: Kontakty zostały zaimportowane format_error: Nieprawidłowy format kontaktu select_file: Wybierz plik + delete_selected: Usuń wybrane link: link: Sznurek diff --git a/config/settings.yml.example b/config/settings.yml.example index 3b1c759..695a011 100755 --- a/config/settings.yml.example +++ b/config/settings.yml.example @@ -1,4 +1,4 @@ -version: 0.9.0 +version: 0.9.1 theme: olive locale: pl diff --git a/lib/mail_plugin_extension.rb b/lib/mail_plugin_extension.rb index 7a1f679..84a57fd 100755 --- a/lib/mail_plugin_extension.rb +++ b/lib/mail_plugin_extension.rb @@ -7,17 +7,17 @@ module Mail def decoded_and_charseted - begin - if not charset.upcase == 'UTF-8' - charset.nil? ? source_charset = $defaults["msg_unknown_charset"] : source_charset = charset - charseted = Iconv.iconv("UTF-8",source_charset,decoded).first - else - charseted = decoded - end - rescue - decoded - end - + decoded + #begin + #if not charset.upcase == 'UTF-8' + #charset.nil? ? source_charset = $defaults["msg_unknown_charset"] : source_charset = charset + #charseted = Iconv.iconv("UTF-8",source_charset,decoded).first + #else + #charseted = decoded + #end + #rescue + #decoded + #end end def isImage? @@ -75,17 +75,17 @@ module Mail end def decoded_and_charseted - begin - if not charset.upcase == 'UTF-8' - charset.nil? ? source_charset = $defaults["msg_unknown_charset"] : source_charset = charset - charseted = Iconv.iconv("UTF-8",source_charset,decoded).first - else - charseted = decoded - end - rescue - decoded - end - + decoded + #begin + #if not charset.upcase == 'UTF-8' + #charset.nil? ? source_charset = $defaults["msg_unknown_charset"] : source_charset = charset + #charseted = Iconv.iconv("UTF-8",source_charset,decoded).first + #else + #charseted = decoded + #end + #rescue + #decoded + #end end