From a7189482e92556c33b5a320989faa97be98c82bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20H=C3=A4usler?= <msquare@notrademark.de>
Date: Sat, 15 Aug 2015 23:36:38 +0200
Subject: [PATCH] add shift creator and editor

---
 db/update.sql                             |  13 ++++++++
 includes/model/Shifts_model.php           |  10 ++++--
 includes/view/Shifts_view.php             |  13 +++++++-
 locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 34023 -> 34218 bytes
 locale/de_DE.UTF-8/LC_MESSAGES/default.po |  39 +++++++++++++---------
 5 files changed, 57 insertions(+), 18 deletions(-)

diff --git a/db/update.sql b/db/update.sql
index 594969f9..3dbd613a 100644
--- a/db/update.sql
+++ b/db/update.sql
@@ -1,3 +1,16 @@
+/* more shift infos */
+ALTER TABLE `Shifts` ADD `created_by_user_id` INT NOT NULL ,
+ADD `created_at_timestamp` INT NOT NULL ,
+ADD `edited_by_user_id` INT NOT NULL ,
+ADD `edited_at_timestamp` INT NOT NULL;
+ALTER TABLE `Shifts` ADD INDEX ( `created_by_user_id` );
+ALTER TABLE `Shifts` ADD INDEX ( `edited_by_user_id` );
+ALTER TABLE `Shifts` CHANGE `created_by_user_id` `created_by_user_id` INT( 11 ) NULL ;
+ALTER TABLE `Shifts` CHANGE `edited_by_user_id` `edited_by_user_id` INT( 11 ) NULL ;
+update Shifts set created_by_user_id=null, edited_by_user_id=null;
+ALTER TABLE `Shifts` ADD FOREIGN KEY ( `created_by_user_id` ) REFERENCES `engelsystem`.`User` (`UID`) ON DELETE SET NULL ON UPDATE CASCADE ;
+ALTER TABLE `Shifts` ADD FOREIGN KEY ( `edited_by_user_id` ) REFERENCES `engelsystem`.`User` (`UID`) ON DELETE SET NULL ON UPDATE CASCADE ;
+
 /* Introduce planned departure date */
 ALTER TABLE `User` ADD `planned_departure_date` INT NULL, ADD INDEX ( `planned_departure_date` );
 
diff --git a/includes/model/Shifts_model.php b/includes/model/Shifts_model.php
index c12d3e01..d32de0cb 100644
--- a/includes/model/Shifts_model.php
+++ b/includes/model/Shifts_model.php
@@ -101,6 +101,7 @@ function Shift_delete($shift_id) {
  * Update a shift.
  */
 function Shift_update($shift) {
+  global $user;
   $shift['name'] = ShiftType($shift['shifttype_id'])['name'];
   mail_shift_change(Shift($shift['SID']), $shift);
   
@@ -111,7 +112,9 @@ function Shift_update($shift) {
       `RID`='" . sql_escape($shift['RID']) . "',
       `title`=" . sql_null($shift['title']) . ",
       `URL`=" . sql_null($shift['URL']) . ",
-      `PSID`=" . sql_null($shift['PSID']) . "
+      `PSID`=" . sql_null($shift['PSID']) . ",
+      `edited_by_user_id`='" . sql_escape($user['UID']) . "',
+      `edited_at_timestamp`=" . time() . "
       WHERE `SID`='" . sql_escape($shift['SID']) . "'");
 }
 
@@ -134,6 +137,7 @@ function Shift_update_by_psid($shift) {
  * @return new shift id or false
  */
 function Shift_create($shift) {
+  global $user;
   $result = sql_query("INSERT INTO `Shifts` SET
       `shifttype_id`='" . sql_escape($shift['shifttype_id']) . "',
       `start`='" . sql_escape($shift['start']) . "',
@@ -141,7 +145,9 @@ function Shift_create($shift) {
       `RID`='" . sql_escape($shift['RID']) . "',
       `title`=" . sql_null($shift['title']) . ",
       `URL`=" . sql_null($shift['URL']) . ",
-      `PSID`=" . sql_null($shift['PSID']));
+      `PSID`=" . sql_null($shift['PSID']) . ",
+      `created_by_user_id`='" . sql_escape($user['UID']) . "',
+      `created_at_timestamp`=" . time());
   if ($result === false)
     return false;
   return sql_id();
diff --git a/includes/view/Shifts_view.php b/includes/view/Shifts_view.php
index 9586cf90..b0628a3b 100644
--- a/includes/view/Shifts_view.php
+++ b/includes/view/Shifts_view.php
@@ -1,5 +1,14 @@
 <?php
 
+function Shift_editor_info_render($shift) {
+  $info = [];
+  if ($shift['created_by_user_id'] != null)
+    $info[] = sprintf(glyph('plus') . _("created at %s by %s"), date('Y-m-d H:i', $shift['created_at_timestamp']), User_Nick_render(User($shift['created_by_user_id'])));
+  if ($shift['edited_by_user_id'] != null)
+    $info[] = sprintf(glyph('pencil') . _("edited at %s by %s"), date('Y-m-d H:i', $shift['edited_at_timestamp']), User_Nick_render(User($shift['edited_by_user_id'])));
+  return join('<br />', $info);
+}
+
 function Shift_signup_button_render($shift, $angeltype, $user_angeltype = null, $user_shifts = null) {
   global $user;
   
@@ -60,6 +69,7 @@ function Shift_view($shift, $shifttype, $room, $shift_admin, $angeltypes_source,
   }
   
   return page_with_title($shift['name'] . ' <small class="moment-countdown" data-timestamp="' . $shift['start'] . '">%c</small>', [
+      
       msg(),
       Shift_collides($shift, $user_shifts) ? info(_('This shift collides with one of your shifts.'), true) : '',
       $signed_up ? info(_('You are signed up for this shift.'), true) : '',
@@ -104,7 +114,8 @@ function Shift_view($shift, $shifttype, $room, $shift_admin, $angeltypes_source,
               '<h2>' . _('Description') . '</h2>',
               $parsedown->parse($shifttype['description']) 
           ]) 
-      ]) 
+      ]),
+      $shift_admin ? Shift_editor_info_render($shift) : '' 
   ]);
 }
 
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
index a1f9cab619204f461b4ab0dc18c466ebdb4dee9c..3e58bc2a773703a6a127a56ab3d2b9bdb3d30825 100644
GIT binary patch
delta 9695
zcmZA534D)79>?(~i6lZKBuFA6Aqk0)I3f{B)J+hrJL(AH3PK2V{t?#EBZ#AJt)q3*
zh&sC3U5nb5ma1Zx?y9b8OI4L#*v~gJ>C5i(>M!r#%rnnC^UTciBzkj^`;M2~UDpE2
ztZ+Dvx;ajDykEg_o^yAck3v=JI2EHErxsSi8kmSQae81)%*5K5kCC{;dKPuvJygF{
zXjB&)SqGq(<G7rKCUFW-9j`=h+=3ps3#;Nj^v6?J1wTjrb8hp)6D!v-?W<X9U^(h*
zp%2!_2uwx|ye~#^e`gv=Fcljy1P@_FJdb+fFHsk`$CQlNi9&T4hZ;x|)b(ko8xBJ+
z%t7@t8O!4W48TJ4#ce8cf2WAV8&9Gio<+^XRV<6&qB^>dmC!TRaXMiT>PDI9gCkKl
z%0=}%3pHbpQT_Wd|6y1a)o&uY)L{#fYM73?(P(7Zoav~BucJENfg1Ti)RG*>IJ{!(
zy(sAVK-2?7*>WS)lea+)q&JqqfpLse$xtdZ(vhe&e-ZU$GcXYIt*cO*YA2S=6qcua
z6}1GntnT&9W(>t<)Tbho=S;%{+-%FA)?=Q?o!|M9im~<0g`-ew|B5Z|!iJPTK@H43
z-kkSAJy8sn!v?4aX^xtSH1xw4&<C@z0_LF}G~Y#{8CZbo=w;M}%TXO|MPDq&H}J2h
z3$u6(J@F{i49vwKd=)joZKwh5MqPi%)}KJN{|I$o*CktV75UG(#SdK=(!dyn8hHZh
zf)rGTEwKxxp=Rne^v8ElH#mh!_$j7iIi^obmw~l$CbA?hXNx^?1~u}#s7?0}_1Za&
zc(<VzZop(zyNeiwS5ceQy|J0O7}Nu#U_We&8qfyRbvsZGupfQ&o*X051s{}DFk)20
ztEhq8u=Tf5Q~wb4!TAl<&Mncbaaq(72BEGCN1czc^$Do^B-?UpEUWjlGf8Fafx2KM
zYN~TkQ$NX;XJKW^`KV3w8v5ZjTP{Wo@HpxTPucnl*6Y^0r~y7kmu}?U#B}J3ft0IR
z<86IwRJ-n|3wxnE4nz$w6Dwgh>RUe(HLx`pfZK5lzKanU%f?WDos*b<txY-=`t<fk
zU66<Bcp>UZm!Ue`WZjDz$T6&nr%;>l8fqYqP@B;|*(_B!svM1aOPZkW*EN~>*99Y}
zNWiHWhue|CI-eo0yi>lZnfese6Lv$re%VM9XPzy;YyAvkslS7~08Vg<`2cl7_N$YN
zb#SYTB!uJ)*2SBcg8_WD>fu~e{a#eNE69uC+_&Z0%}qzGunP4ft+Ozc@^Y+(`)v6`
zRJ)tD-t~w?PZa!&nZhPmk#bMeOk|-(x)k~LIEOI?zeYV_r560XfX$JvoL5k9!D;I`
z)ULmb+T1r#OZP3Z#4hJPi7t3-Pk6O7PwI~vNUSY4L(N1_)E;qR$=*PHST><<bQ}la
zS)7LPspiJpQJZcbs^4NPulN6CNy6`Y)O&r+dIPm-zOnv_>Y!XJ^J~-}^+fei14%@^
zJ*`ns*c)~IAk=_!P)j%$wVBsp1sBOqlFE1(_1>OEUHA{w6Mc)i-~sA}p3j;m@U@0n
z<B=(KQc-K%3Dxf)R6mofF4PPxMwf21mPAXi6ZM2esF^r~y5TW<{sig+a|YG!oUOlz
zdg5!SPw`D#U!k=bNEIATeH<p@GSu63sx|Yk*WnQr;n<*!*;L)JC*^6Vsrwi;1J|(~
z{(x$q+}3eAU>}^08*vJT(r5w}B4268v%PtnQcz1U9Q6RR+cW=q|L0TTiL1~H*Q2Iz
z3+e-P1hx52q6YE<s=e;6DfYr(47KG%)ODRu56}yB<B_Nv&qZCgz(t}9*I^hIqc+i}
zs5QH3y@%eEA0giq$Frk(!j{O#&e?|=*i8(=2dGWy*U2ndb<_hzAaAadgjx#ML=wHX
zZ=t5@2F7D>XLc}lK)psAuqKA2neRk%97s6>$KhcdjWJ!!>sW}9ln-JIUO^4eqbq;3
zU;uJImotMzBi@H<@BvoE&#iY*9e8##f6K+AzJQ~wYmrZfa|Tnfe7gDarJ)Dq5vZlg
zM$O;^ERR#MjNbqGBwkc3whflr2CGp^vDKbGjDD2gN3G$<SQanX@>SGYUq{{WC)AC8
zv**3Lo3bw^P#>%^_jfwl6FpHK4@Py6W$Uxim+}<U4d<aY?JKB(Z^R0?4K=_6sOyiT
z`a6x~@GR>3%eMYHmi+yHlSEVX3r4%M$*>OP$R1`5(@-7fpz3E~6mG*<{1CN7KcUvV
z2Jf!Uw?>^GfwgfdYQTq31AMP1^RFj6VNaY#P1$ACp7;v27am~*R_<kP&;->%KkFdW
zlV+iwbTn#4@-Q6pQ3KkH(fEO_ztfBPkD$VjtzHEaP~~>0kq<|WcnNCiR$*1#gnFOf
zLEZ2iYIFS)wFhpX9^@egqDLPypdi%wXw-F0T_jq|HdqmRp)MSbl`$8q;sRuLoeiib
zzlWN+pRJyK&FdF{KGe^&E<pYMUy8cnE-V>1)}rh>N1_|u$9VMVXGew_NE_5trei1$
zz+{|i>-VDu_#Wy>FQWSU#`**`GnF&U5>-b%Kuu&%xtuyA+I&f<DQ<@9s10gK`k*$~
zSk#SHqMm#=hTsvbh8HjnzsGtQ+TZ-?))6(}$ygWnU?N_|6utj`FPIy2L^YUTU5AY+
zpF-_{-%tZ_A7ExA4z+YC7=&r40S!eBd?xy1A!^Mxqc-V5)C?R&AHDy7AyEe(qMqza
z)D+&uJ?P1IRx@+}Bk&Na<IAWgzJ(fKl|g2ztE0|Gq4q)|YAIWy2GH4-(@}qaI{j_M
z3e+Zf9reENLf!Z%YC!K{H@twFsmQ@*NxGr-NEWuliO8}$Z=+r}-%Mj8)c2z=Y9?oA
zGXEOkb}F<<iclYrqo^tS0@vX^)Dsj8G2i~Rs5L%=+AF`J`tcje^kXnT)P4qPW)`9z
zr~tLcHlPOl=1`ZZD7Focp$8{Upr-1yEuTfL*?Cllmr$GW3)H|LSRbQq;5E$5q(AD$
z)ldVBMGdSmhGD9UL>&*X4n?iqC@h0hQBODv^?g`|+H{+3eKC4aK5fsRLEZ2gs-N4o
z{t;?v{jyBIA*l1N8YJ3$@u=O~9(BXPSOzCqr&?#BHfcVp{SvH?J5U3>gxdYLa1lO1
zt@Wbe=0V>^wL640^!}eF(TKlBP2EG($ea<zim0`UK%I|A-5?q3U{};Y@@#zpdQ;wN
z%e$?|QJeTOY5;ezmEQj+B+aO3HPZYcF&z^qA4YY23u~gsDD$UUG<K%k5<_tjYR0yr
zHsxW|2j@T70BelahlVexbrD8VK8|&{zjKphFa~6sUpf;phVpvU4NhVgyl%@0W6S{4
zP@8BvR>##Cjt8w5F@o{~YtUHpr(08NA9QIXlS%XhYp@mW!G`#~wdOdp#yzkR^>eTb
z9>BKfmSd*8J(i{14a;L6>rnKhoP*^s548ldbC`c$lBHB=<Qq`C`xxrUKfyTs4z)>x
z$D6fpfU0kgx=}9D#F>Q!cn7^yo?tfdeAM@3F=_zou@b&Df%(_Sj!>Zs-bXb&h1x7v
z&<DRq4e%FK`;c7o7KCFk<$72F+o66L^+0_e#$hzh#{k@k74aCV-N!Bx-RK((z$d5?
z223<h8ipD`V_R;4nu#8$HP1%1Ux*q=A*$nDsF^*5{&)c^;SJRF4^aKO{3e;T3r5XA
zgtd;Xk4HUmlC6Kn*0({ebs8pNPh0;IY5;}E_Hg!KQw+;9_C_sT0Y>TlKWZ!fg}iBw
z?_|?K9tKigf(f_<`CvE~Fav+YMc8eM`5kcySxqPJMYDN-!g$JcrkdBdH|m2n9yK$0
z=&38_lIY17qSm+o^<;ao0UkoF?JZOX4^dP9JL>fdnPxvosE)hZat79-JRa3wA*%m%
zsO#UwNR9Y1NeDhdbr3Y&7=_-H8)7F+!7Z4NtubbX**n>&wV#bz>(%Iv+fg&P3tQp)
zsO#KjntubfMg3nCXAVhyHNb4VgDWs&miffq#Zbz@j5Y@oaWrnhW#~WKw0i?%DgWJ;
z@1r(b^*QFB<%y`bVHaw%pPysj|F5WspyD2eVc=Zz1#F1TDQ93aT!~3|4mI$y`R3nz
z9Z)x3fF8IXHRZ*qx8oS<wL6WP(JSbK*YkM-eL%jm4SvQdlzrxz4#H6*jj`qCsJ+k@
z)$#MFCmev<LwTqroPlL<5vu=JQ3GFN%jc|DT_hUGE$ffgN2q~#&o>>1p`IWL)xHV(
zVXCd~h8ox)dwwkH##2x;k&k-vmr)P29Np3NCW#wKI6o#3)rr=W7Z7@~i$o7%m>O|t
z84lT8<zjMPapzwua6C)AOLU}uxo!8D@-3p1Eys}Okw0(VSpFqT#R@7m*#;DyBK_d_
z-QX1Co1CxlRGXpXZ`kvH#(xl*)aiq>+qP?gM{K^)s!RA>I4`=f{=29wL!mt}lYAlS
zXlolkgQqCJLo^`QS1pYwJr<L!qCSq$k|kpVv4dDaxo>GhylwNEoYN~ifcyV(#F4#E
zY$V)i@CxxPkxf}^mQJjuycB;V9ue$U=W{~GGGee2j_I^pkC%x;Vjtl}osLC#-K367
z@3S`4Br3IGbi8aEb|9}te56W_&eX>fe<lBl(5qS5wk36%kOvX3lmAM%o;s)Vbtoqi
z!NhuEyBqKSYa|1S5j04`(qpd8r%`dANG5s{KM-9x*N-?({u%Lr7(#h0@iY0qi4^j!
zL|H;d2kQ&uZxhWZU(@%$hR)ifzil*;vfkHrl(%7RTfc|AD)A)|PP8QgImZXG<ab3p
zE+=%%Bt9UTsKBw0cCXrgObvt6`fnw&?1_)bQ;63H9X}CaoV!_4GM`zc3#gl8uNhz+
zgMqf)JGO2SWgqe(_zQ8A=t&$S!U)$Le#{}d5IVXOeTY!o!4Yx|QpZ)IHc`O2#>61o
zM&}~Qqlhf>>V$qj{D~MzbS89+=KLX?jQW_puJv!EGaQjb7fxgo1?0ns5b_E{8%a5j
zC{NxAb<8HuCmNGSm(;MfluM7bHW@|T8^jLE{&*UnDLH2!Z4HH9#5_)3z{6OMm_d9)
zS>N>Uh}A@U>i&sOh=%0bh=YWVJ?L%o81ypLB|jhXvnh4mh)TB2A5&Y8iZ5vJA0mgm
z7IBcgJMJaUke?-15?>SJi89ppAigJ`LFkC4{PZ!KLaMD8$+`N(F3MAFool$g;5pn&
zWj`Xr*1bvoEisgMj_|ehq$Pi_v{1s4PQ9N=|M+>Ate!3TTbI(Vm+hlIb(gfYwv#L&
za*4(EWKHr|VyZ2ZmK>k(vk!GGi8W81n@B#LbI;ql)Thq1BA@?Mc_sM)qGL&qc5Vu(
z*iVHU_9g}s3yGJgtAaXC5JluK5Vgn;6Mrw<9~J2Gv@LdGCbc(+(&GwA8ucx47J6bu
zJYXBFBQHG~k-L``@Ks_8bsu6~{0%D;TZqk+s}cP*hm)y@rSK=B^yo`Ih(ZF<ntYW#
zv4Om&ZI?)$A9-EO#fI3G7*6b`yq3ry*D;>F6;2?=67LbaiIUI5Nti~1Ekx<DlVmQD
zP+Euc?a5H<r`Eq&U$&01R<f27Kp!KBZnk0+o^$bIAn_Ms6X8LFHrS4sM=YW2jXJ85
z>)2p$?%`WRl;qq|VjX!oB7!(i=on|OdkLEpo2m04UL;Ch@?~yCC!@jx3U4O`7u`-8
z92___H!E{e*06}oNfFT#BZf@nXJME0xJtuD{a<ZSUV56FXQRf=8YdN==pJdZqTAhv
zR4qyw(Y$(<tlWu{vc`;=6p=YrJx$ITr>-XErv?ql%FG>-MSuT$u4sRLlG}d)hN)d^

delta 9549
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
OBUe0HHhV>CmHz?JuPHbH

diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
index 8f724435..d2241761 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Engelsystem 2.0\n"
-"POT-Creation-Date: 2015-08-15 14:53+0100\n"
-"PO-Revision-Date: 2015-08-15 14:54+0100\n"
+"POT-Creation-Date: 2015-08-15 23:36+0100\n"
+"PO-Revision-Date: 2015-08-15 23:36+0100\n"
 "Last-Translator: msquare <msquare@notrademark.de>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -114,7 +114,7 @@ msgstr "ansehen"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:23
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:18
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:84
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:67
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:77
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:52
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:63
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:156
@@ -131,7 +131,7 @@ msgstr "bearbeiten"
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:86
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:5
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:12
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:68
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:78
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:15
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:53
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:64
@@ -680,7 +680,6 @@ msgid "arrived"
 msgstr "angekommen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:109
-#, fuzzy
 msgid "Planned arrival"
 msgstr "Geplanter Ankunftstag"
 
@@ -907,7 +906,7 @@ msgstr "Tag"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:128
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:137
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:306
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:88
 msgid "Start"
 msgstr "Beginn"
 
@@ -915,7 +914,7 @@ msgstr "Beginn"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:129
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:138
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:307
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:86
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:96
 msgid "End"
 msgstr "Ende"
 
@@ -930,7 +929,7 @@ msgstr "Schichttyp"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:140
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:302
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:185
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:74
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:84
 msgid "Title"
 msgstr "Titel"
 
@@ -1137,7 +1136,7 @@ msgstr "Typ und Titel"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:255
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:316
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:189
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:100
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:110
 msgid "Needed angels"
 msgstr "Benötigte Engel"
 
@@ -1715,7 +1714,7 @@ msgstr[0] "%d Helfer benötigt"
 msgstr[1] "%d Helfer benötigt"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:638
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:13
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:22
 msgid "Sign up"
 msgstr "Eintragen"
 
@@ -1725,7 +1724,7 @@ msgstr "vorbei"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:649
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:782
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:15
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:24
 #, php-format
 msgid "Become %s"
 msgstr "Werde ein %s"
@@ -1846,7 +1845,7 @@ msgstr ""
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:63
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:93
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:114
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:35
 msgid "Description"
 msgstr "Beschreibung"
@@ -1972,15 +1971,25 @@ msgstr "Typ:"
 msgid "Comment (for your eyes only):"
 msgstr "Kommentar (nur für Dich):"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:64
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:6
+#, php-format
+msgid "created at %s by %s"
+msgstr "erstellt am %s von %s"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:8
+#, php-format
+msgid "edited at %s by %s"
+msgstr "bearbeitet am %s von %s"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:74
 msgid "This shift collides with one of your shifts."
 msgstr "Diese Schicht kollidiert mit deinen Schichten."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:65
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:75
 msgid "You are signed up for this shift."
 msgstr "Du bist für diese Schicht eingetragen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:104
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:221
 msgid "Location"
 msgstr "Ort"