master
Wojciech Todryk 2012-06-18 21:34:30 +02:00
parent 0c3e911553
commit 0a2bbed2a0
10 changed files with 97 additions and 64 deletions

View File

@ -1,3 +1,5 @@
## Authors
* Luben Manolov <luben.manolov@gmail.com> * Luben Manolov <luben.manolov@gmail.com>
* Nick Penkov <nick.penkov@gmail.com> * Nick Penkov <nick.penkov@gmail.com>
* Eugene Korbut * Eugene Korbut

View File

@ -1,10 +1,16 @@
## Changes ## Changes
#### 0.9.1
* nowrap to edit column in contacts & links
* decoded changed in mail gem
* fixes in pl locale
#### 0.9.0 #### 0.9.0
* switch to Rails 3.2.x * switch to Rails 3.2.x
* Tweeter Bootstrap as default theme * Tweeter Bootstrap as default theme
* many fixes * many fixes
#### 0.8.6 #### 0.8.6

View File

@ -1,3 +1,5 @@
## License
This is free and unencumbered software released into the public domain. This is free and unencumbered software released into the public domain.
Anyone is free to copy, modify, publish, use, compile, sell, or Anyone is free to copy, modify, publish, use, compile, sell, or

View File

@ -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

View File

@ -1,5 +1,5 @@
%tr %tr
%td %td{:nowrap=>"nowrap"}
= check_box_tag "items_ids[]", contact.id = check_box_tag "items_ids[]", contact.id
\/ \/
= link_to "<i class=\"icon-edit\"></i>".html_safe,edit_contact_path(contact) = link_to "<i class=\"icon-edit\"></i>".html_safe,edit_contact_path(contact)

View File

@ -16,38 +16,8 @@
= raw BlueCloth::new(render :file => 'CHANGES.markdown').to_html = raw BlueCloth::new(render :file => 'CHANGES.markdown').to_html
.well .well
= raw BlueCloth::new(render :file => 'TODO.markdown').to_html = raw BlueCloth::new(render :file => 'TODO.markdown').to_html
.well
-# = raw BlueCloth::new(render :file => 'AUTHORS.markdown').to_html
<% content_for :title do %> .well
- <%= t(:about,:scope=>:internal) %> = raw BlueCloth::new(render :file => 'UNLICENSE.markdown').to_html
<% end %>
<% content_for :sidebar do %>
<%= content_for_sidebar %>
<% end %>
<div class="block">
<div class="navigation-tabs clearfix">
<%= raw single_navigation(:about,:internal) %>
</div>
<div class="content">
<h4>
<%= t(:current_version,:scope=>:internal) + ": " + $defaults["version"] %>
</h4>
<div class="md">
<%= raw BlueCloth::new(render :file => 'README.markdown').to_html %>
</div>
<div class="md">
<%= raw BlueCloth::new(render :file => 'CHANGES').to_html %>
</div>
<div class="md">
<%= raw BlueCloth::new(render :file => 'TODO').to_html %>
</div>
</div>

View File

@ -1,5 +1,5 @@
%tr %tr
%td %td{:nowrap=>"nowrap"}
= check_box_tag "items_ids[]", link.id = check_box_tag "items_ids[]", link.id
\/ \/
= link_to "<i class=\"icon-edit\"></i>".html_safe,edit_link_path(link) = link_to "<i class=\"icon-edit\"></i>".html_safe,edit_link_path(link)

View File

@ -30,8 +30,7 @@ pl:
goto: Idź do goto: Idź do
contact: contact:
nick: Pseudonim nick: Pseudonim
first_name: Imię name: Nazwa
last_name: Nazwisko
email: E-mail email: E-mail
info: Informacje dodatkowe info: Informacje dodatkowe
prefs: prefs:
@ -86,6 +85,7 @@ pl:
were_imported: Kontakty zostały zaimportowane were_imported: Kontakty zostały zaimportowane
format_error: Nieprawidłowy format kontaktu format_error: Nieprawidłowy format kontaktu
select_file: Wybierz plik select_file: Wybierz plik
delete_selected: Usuń wybrane
link: link:
link: Sznurek link: Sznurek

View File

@ -1,4 +1,4 @@
version: 0.9.0 version: 0.9.1
theme: olive theme: olive
locale: pl locale: pl

View File

@ -7,17 +7,17 @@ module Mail
def decoded_and_charseted def decoded_and_charseted
begin decoded
if not charset.upcase == 'UTF-8' #begin
charset.nil? ? source_charset = $defaults["msg_unknown_charset"] : source_charset = charset #if not charset.upcase == 'UTF-8'
charseted = Iconv.iconv("UTF-8",source_charset,decoded).first #charset.nil? ? source_charset = $defaults["msg_unknown_charset"] : source_charset = charset
else #charseted = Iconv.iconv("UTF-8",source_charset,decoded).first
charseted = decoded #else
end #charseted = decoded
rescue #end
decoded #rescue
end #decoded
#end
end end
def isImage? def isImage?
@ -75,17 +75,17 @@ module Mail
end end
def decoded_and_charseted def decoded_and_charseted
begin decoded
if not charset.upcase == 'UTF-8' #begin
charset.nil? ? source_charset = $defaults["msg_unknown_charset"] : source_charset = charset #if not charset.upcase == 'UTF-8'
charseted = Iconv.iconv("UTF-8",source_charset,decoded).first #charset.nil? ? source_charset = $defaults["msg_unknown_charset"] : source_charset = charset
else #charseted = Iconv.iconv("UTF-8",source_charset,decoded).first
charseted = decoded #else
end #charseted = decoded
rescue #end
decoded #rescue
end #decoded
#end
end end