From f46a7969b02c4c8d8e1c8d744ba335c726374687 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sat, 11 Jun 2011 02:51:04 +0100 Subject: [PATCH] log: revamp html+css and icons --- SparkleShare/Mac/SparkleLog.cs | 9 +- SparkleShare/Mac/SparkleShare.csproj | 20 +- SparkleShare/Mac/SparkleStatusIcon.cs | 2 +- SparkleShare/SparkleController.cs | 24 +- data/actions.svg | 1960 +++++++++++++++++++++++++ data/html/event-entry.html | 13 +- data/html/event-log.html | 39 +- data/icons/Makefile.am | 8 +- data/icons/document-added-12.png | Bin 0 -> 459 bytes data/icons/document-added-16.png | Bin 487 -> 0 bytes data/icons/document-deleted-12.png | Bin 0 -> 333 bytes data/icons/document-edited-12.png | Bin 0 -> 618 bytes data/icons/document-edited-16.png | Bin 610 -> 0 bytes data/icons/document-moved-12.png | Bin 0 -> 3182 bytes data/icons/document-moved-16.png | Bin 589 -> 0 bytes data/icons/document-removed-16.png | Bin 318 -> 0 bytes 16 files changed, 2036 insertions(+), 39 deletions(-) create mode 100644 data/actions.svg create mode 100644 data/icons/document-added-12.png delete mode 100644 data/icons/document-added-16.png create mode 100644 data/icons/document-deleted-12.png create mode 100644 data/icons/document-edited-12.png delete mode 100644 data/icons/document-edited-16.png create mode 100644 data/icons/document-moved-12.png delete mode 100644 data/icons/document-moved-16.png delete mode 100644 data/icons/document-removed-16.png diff --git a/SparkleShare/Mac/SparkleLog.cs b/SparkleShare/Mac/SparkleLog.cs index 1717d7bc..a8ca567f 100644 --- a/SparkleShare/Mac/SparkleLog.cs +++ b/SparkleShare/Mac/SparkleLog.cs @@ -117,7 +117,6 @@ namespace SparkleShare { public void UpdateEventLog () { InvokeOnMainThread (delegate { - if (HTML == null) ContentView.AddSubview (ProgressIndicator); }); @@ -147,6 +146,14 @@ namespace SparkleShare { HTML = HTML.Replace ("", "#009ff8"); HTML = HTML.Replace ("", "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "avatar-default.png")); + HTML = HTML.Replace ("", + "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "document-added-12.png")); + HTML = HTML.Replace ("", + "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "document-deleted-12.png")); + HTML = HTML.Replace ("", + "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "document-edited-12.png")); + HTML = HTML.Replace ("", + "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "document-moved-12.png")); } diff --git a/SparkleShare/Mac/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare.csproj index 89c1e10f..31bc86d1 100644 --- a/SparkleShare/Mac/SparkleShare.csproj +++ b/SparkleShare/Mac/SparkleShare.csproj @@ -55,10 +55,6 @@ False - - False - ..\..\bin\SparkleLib.dll - False @@ -66,6 +62,10 @@ False ..\..\bin\Meebey.SmartIrc4net.dll + + False + ..\..\bin\SparkleLib.dll + @@ -158,6 +158,18 @@ Pixmaps\error-active.png + + Pixmaps\document-added-12.png + + + Pixmaps\document-edited-12.png + + + Pixmaps\document-deleted-12.png + + + Pixmaps\document-moved-12.png + diff --git a/SparkleShare/Mac/SparkleStatusIcon.cs b/SparkleShare/Mac/SparkleStatusIcon.cs index 81bd547d..8c62892d 100644 --- a/SparkleShare/Mac/SparkleStatusIcon.cs +++ b/SparkleShare/Mac/SparkleStatusIcon.cs @@ -154,7 +154,7 @@ namespace SparkleShare { Menu.AddItem (NSMenuItem.SeparatorItem); RecentEventsMenuItem = new NSMenuItem () { - Title = "Recent Events" + Title = "Show Events" }; RecentEventsMenuItem.Activated +=delegate { diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index 8eb4edcc..429def79 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -320,7 +320,7 @@ namespace SparkleShare { string event_entry = "
"; if (change_set.IsMerge) { - event_entry += "
Merged a branch
"; + event_entry += "
Did something magical
"; } else { if (change_set.Edited.Count > 0) { @@ -329,9 +329,9 @@ namespace SparkleShare { change_set.Folder, file_path); if (File.Exists (absolute_file_path)) - event_entry += "
" + file_path + "
"; + event_entry += "
" + file_path + "
"; else - event_entry += "
" + file_path + "
"; + event_entry += "
" + file_path + "
"; } } @@ -341,9 +341,9 @@ namespace SparkleShare { change_set.Folder, file_path); if (File.Exists (absolute_file_path)) - event_entry += "
" + file_path + "
"; + event_entry += "
" + file_path + "
"; else - event_entry += "
" + file_path + "
"; + event_entry += "
" + file_path + "
"; } } @@ -353,9 +353,9 @@ namespace SparkleShare { change_set.Folder, file_path); if (File.Exists (absolute_file_path)) - event_entry += "
" + file_path + "
"; + event_entry += "
" + file_path + "
"; else - event_entry += "
" + file_path + "
"; + event_entry += "
" + file_path + "
"; } } @@ -369,11 +369,9 @@ namespace SparkleShare { change_set.Folder, to_file_path); if (File.Exists (absolute_file_path)) - event_entry += "
" + file_path + "
" + - "→ "; + event_entry += "
" + file_path + "
"; else - event_entry += "
" + file_path + "
" + - "→ "; + event_entry += "
" + file_path + "
"; if (File.Exists (absolute_to_file_path)) event_entry += "" + to_file_path + "
"; @@ -388,7 +386,7 @@ namespace SparkleShare { event_entry += "
"; event_entries += event_entry_html.Replace ("", event_entry) .Replace ("", change_set.UserName) - .Replace ("", "file://" + GetAvatar (change_set.UserEmail, 36) ) + .Replace ("", "file://" + GetAvatar (change_set.UserEmail, 36)) .Replace ("", change_set.Timestamp.ToString ("H:mm")) .Replace ("", change_set.Folder) .Replace ("", AssignColor (change_set.Folder)); @@ -1038,7 +1036,7 @@ namespace SparkleShare { { string hash = GetMD5 (s).Substring (0, 8); string numbers = Regex.Replace (hash, "[a-z]", ""); - int number = int.Parse (numbers); + int number = 1 + int.Parse (numbers); return this.tango_palette [number % this.tango_palette.Length]; } } diff --git a/data/actions.svg b/data/actions.svg new file mode 100644 index 00000000..c349857c --- /dev/null +++ b/data/actions.svg @@ -0,0 +1,1960 @@ + + + + + Text Editor + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Text Editor + + + text + editor + gedit + + + + + + + + + + + + + + + + + + + + + Lapo Calamandrei + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/html/event-entry.html b/data/html/event-entry.html index f689b376..f8643fac 100644 --- a/data/html/event-entry.html +++ b/data/html/event-entry.html @@ -3,12 +3,13 @@
-
-
-
-
-
- +
+
+
+
+
+
+
diff --git a/data/html/event-log.html b/data/html/event-log.html index b4f45ad3..f16f3573 100644 --- a/data/html/event-log.html +++ b/data/html/event-log.html @@ -27,7 +27,7 @@ font-size: ; color: #444; margin-bottom: 9px; - margin-left: 40px; + margin-left: 30px; } .day-entry-content { @@ -60,6 +60,7 @@ margin-right: auto; margin-bottom: 12px; padding: 0px; + padding-bottom: 6px; border: #ccc 1px solid; -webkit-border-radius: 0 0 3px 3px; } @@ -72,19 +73,37 @@ dd { width: 90%; overflow: hidden; - margin-left: 24px; text-overflow: ellipsis; - padding: 4px 0px; - border-bottom: 1px solid #ddd; - } - - dd:first-child { - padding-top: 12px; + padding: 0; + padding-top: 2px; + padding-bottom: 4px; + padding-left: 22px; + margin: 0; + margin-bottom: 2px; + margin-left: 12px; + border-bottom: 1px solid #ddd; + background-repeat: no-repeat; + background-position: center left; } dd:last-child { border: none; - padding-bottom: 12px; + } + + .document-added { + background-image: url(''); + } + + .document-deleted { + background-image: url(''); + } + + .document-edited { + background-image: url(''); + } + + .document-moved { + background-image: url(''); } .no-buddy-icon { @@ -105,10 +124,10 @@ .event-info { float: left; padding: 15px; + margin-bottom: 6px; width: 410px; background-color: #fff; border-bottom: 1px #ccc solid; - position: relative; } diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index fd621831..f23af747 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -25,10 +25,10 @@ app_theme_icons = \ status,avatar-default-24.png \ status,avatar-default-32.png \ status,avatar-default-48.png \ - status,document-added-16.png \ - status,document-edited-16.png \ - status,document-moved-16.png \ - status,document-removed-16.png \ + status,document-added-12.png \ + status,document-edited-12.png \ + status,document-deleted-12.png \ + status,document-moved-12.png \ status,dialog-error-16.png \ status,dialog-error-24.png diff --git a/data/icons/document-added-12.png b/data/icons/document-added-12.png new file mode 100644 index 0000000000000000000000000000000000000000..409867db248dcd372e41668dc0d0143add70b69e GIT binary patch literal 459 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kmSQK*5Dp-y;YjHK@;M7UB8!3Q zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt+NeMIo6b zIjIaGsTCy(t|^%%`9-!xiXi(%K$4E7B^mie3|@)ZrAZ3GC8?QtsYTCzf7b`fD?)52 zElN&h$S5f(u+rDh%FNA8OxDXSEzV5NNX*I6ORmaHdmIN;e9zOxF+^kH(n*GW%?1Ll z|M{l9Z7SaJKrCAEru%|hlb1f?SXa#K#g)Y+USeWqv{*!XamyN)jr*luzCLeL|8sS2 z^qy6jv*gp>F*J1iDwN4zZ}(6o?cJQ>sm1HG4z6}sy7ky5orGtvj0#i(XPn-)Yn^%8 zG=>FJZuJ;`e_mat^vX5yT9mlT&UM-h2cooF1sED6lArEVqDdCo^a5`+xP4dqc-J3FV@53XA@} k>9%Lu`~BY!sr3Jhamv|K?p8Wp0s54|)78&qol`;+0JJ`{?f?J) literal 0 HcmV?d00001 diff --git a/data/icons/document-added-16.png b/data/icons/document-added-16.png deleted file mode 100644 index 14fa8a363be1a929e0be7b6b90273e10cb395d51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 487 zcmVPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igS{ z2`?{ZN`sF800C!7L_t(I%f(YYO9Md=eY>~093hI0y@FVXn8wyds|cxV1O*9p`Um6? zLYnJrZ2SXaWvOW67a}4eK~Rt+C@DnzN;EN=yW8Edh$%!4Ia4?=FfcRBn|W^-5uqL9 zXwyVcVtOl)^|faMK!lslYVtf23W29wdv<71%nU9FPq}tz1f(H+<>R_~0n)*Bfe45Q zHSY!G_XoIA{(ghWje)GIl&wh#(tssmjhb7rDj$!4VvXcl4}CEv0XW-Jr3?VD7LBR( zK7X_~B}^j~}U&Kt+NeMIo6b zIjIaGsTCy(t|^%%`9-!xiXi(%K$4E7B^mie3|@)ZrAZ3GC8?QtsYTCzf7b`fD?)52 zElN&h$S5f(u+rDh%FNA8OxDXSEzV5NNX*I6ORmaHdmIN;oZ#u=7@{#Txum>2U4hkL z;*wc~}U&Kt+NeMIo6b zIjIaGsTCy(t|^%%`9-!xiXi(%K$4E7B^mie3|@)ZrAZ3GC8?QtsYTCzf7b`fD?)52 zElN&h$S5f(u+rDh%FNA8OxDXSEzV5NNX*I6ORmaHdmP8Wz*y_);uxYav9{0NgDFv> zy?*}v~6p9pf$Z-6-nZv=tFWa?xp>0NP$FvO_*_N*;Td6urHgDz8i*I=XcTC|> zED6jM6t&go-y*Et=<-+s77 zU{ln}5WjySDUtj5SeOhwCtb)ene(*Bli@>rYlv3qG0T3YhQ}5&&ZZqP;JLl+ZS;A6 z3%UOH!Cu!dy)+SIVcfOu@cZx0LB9-U`n=m$+i^6heUZkyl+BUvD{R=F%k&t|SoU+p z>tC7-JDijzS_ruoYEM2{;l5aK*=5aFUw_Rhu8UtAw%*Q?so_b{&c^{7TNF=kDz}i? zwIOrX^tEBD|7>j%?LNwU>_(Z2(89lU_gi@n@6Zt8l44ksuV$a{XR+z85F1HgtTA}H`njxgN@xNAr)c_A literal 0 HcmV?d00001 diff --git a/data/icons/document-edited-16.png b/data/icons/document-edited-16.png deleted file mode 100644 index e0a9f97885c5f19ecb1318d980c0d847aaefba8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 610 zcmV-o0-gPdP)|6%;k@aG=`!-pR~86LcT&hU-r%VGuw0%33=jyYSG zUpP3>MVj%-liv(`E_`AT;^$-d_xj!y>0|dZ@w(tbJaZPSfJm20Kq%MWkIxvS89y^H zGchx8eSUBr zF=F9D9Ahe*fY?N3zhKV4pPn*&{l>}g^5lWD>%Av{{8fX;p=xUn9c2mi~l#{ z3M;q^xKuT2g!IBVnErlZ`1EoM!^@M0e*Av_vfFS8Zp{n~&{&vV=b`=OKc^zQyfx!5 zHerT$cW?as{r-86;gbLL_%y>^u*i{_%+r>`z^sNesG7>zJMbY{W@0H_|y&;I;sb^rhX07*qoM6N<$g4abVga7~l diff --git a/data/icons/document-moved-12.png b/data/icons/document-moved-12.png new file mode 100644 index 0000000000000000000000000000000000000000..dfe29d1d923a76d561e0d9df40d286d22bda4207 GIT binary patch literal 3182 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 UZg&POfB*mh07*qoM6N<$f=H_kXaE2J literal 0 HcmV?d00001 diff --git a/data/icons/document-moved-16.png b/data/icons/document-moved-16.png deleted file mode 100644 index 834f6a724048c8455d5eb9180a8ad7b4c854b127..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 589 zcmV-T0Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igS{ z2{0XF$J~(s00GTOL_t(I%f*vTNEC4x#()2D@(?NpvF%~43A2x-E%8zmwSvJ^$YK$M z&}Bi0tz(iX(bA#7sKZ9lWnmzqpgb8U36Z!%lvL#Qg<&cYN)YT4)9yOW&fB3ngl!}q zdd~0jm)ioc-*9R?2IHWe`yJHPF*_^ZRpq$?xnaltb!vw3LUU|e)1L)Ft*<2YkBD#$ExenlIZNgqJb*|(oyXt*ZYf%En`Oum4UW20dMHVcJ}45YqPEZ9%T z1Z#{)&DIub*EON(x-BBMQp*0iFrUepjTHg9h=@{ZJDq)|^JzBWh~NI(O2ik;{>l~q b?`!-H`D?eJYYwl500000NkvXXu0mjfWr`6P diff --git a/data/icons/document-removed-16.png b/data/icons/document-removed-16.png deleted file mode 100644 index 4695e878bd8aabada6934489a9387fab3c4ce086..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=f!eQwFr$;k>h z5@oYx(`J}@-f2ECcLs|>@9BRpAByferYPF@-GQ~Waa|%4-