Thomas Blazek
3720d9cb6b
Merge pull request #5 from bernis/master
...
Fixes bug in Neuigkeiten mobile view, see picture
2015-01-28 12:39:57 +01:00
Bernhard Stampfer
1731714367
Layout changes for blue1
...
Ist das so ok, oder soll ich besser ein neues theme machen?
2015-01-28 09:35:08 +01:00
Bernhard Stampfer
db0a50acf2
LVA ECTS/Std right-aligned
...
Uses style="overflow:auto" to keep the Box arround the Modul sized correctly,
even if left and right aligned text uses more than one line.
This seems to hide the bulltes in chromium for some reason (shown in firefox)
2015-01-28 09:18:26 +01:00
Bernhard Stampfer
cdcbce6803
Fixes bug in Neuigkeiten mobile view, see picture
...
If display width forced header (Rubrik / User+Date) to display in two lines
whole content of Neuigkeit was squeezed to the width of the whitespace left
to the lower line
2015-01-27 17:26:55 +01:00
Thomas Blazek
d91a150d51
addendum
2015-01-27 10:59:09 +01:00
Thomas Blazek
deb8ccf47d
started working on menu
2015-01-27 10:58:45 +01:00
Thomas Blazek
6f52496a7a
updating beispielupload
2015-01-22 11:19:49 +01:00
Thomas Blazek
0280ebb6a1
Merge pull request #4 from bernis/master
...
Die spans/offsets + Optische Veränderungen (Hauptseite)
2015-01-21 10:37:48 +01:00
Bernhard Stampfer
a196b56669
Kleinere optische Veränderungen
...
Bitte umbedingt testen
Etwas größere Maximalbreite des content-wrap (kann man das sauberer ändern?)
5/7 Aufteilung des Contents
Word-wrap in den neuen Beispielen
Einige margins angepasst (oben sind die Boxen jetzt bündig)
2015-01-20 14:58:04 +01:00
Bernhard Stampfer
767df6439b
Platzhalter SPAN1s durch OFFSETs ersetzt, reduziert Leerstellen in Mobilansicht
...
Die span10 mit dem Seiteninhalt wurden von zwei span1 davor und dahinter
zentriert, diese verursachen aber Abstände in der mobilen Ansicht (sind dort
ober und unter dem span10), offset ist denk ich sauberer
2015-01-20 13:05:40 +01:00
Thomas Blazek
028cf58952
started working on beispiel
2015-01-19 18:40:15 +01:00
Thomas Blazek
229a44df4e
Alignment/added fix for dropdown
2015-01-19 14:59:14 +01:00
Andreas Stephanides
69b7604761
fix calendar for all
2015-01-18 15:08:18 +01:00
Andreas Stephanides
7a8889dcc4
meeting cont
2015-01-18 14:51:56 +01:00
Andreas Stephanides
b46e19b466
integrate calendar with meetings
2015-01-18 14:32:20 +01:00
Thomas Blazek
e5966bccce
I18n korrekturen
2015-01-18 00:30:42 +01:00
Thomas Blazek
7c5ac3b8d7
Merge branch 'master' of https://github.com/fetsite/fetsite
2015-01-18 00:21:19 +01:00
Thomas Blazek
b3000ae542
Show lecturer picture if it exists
2015-01-18 00:19:41 +01:00
Andreas Stephanides
e93b9b7342
Merge branch 'testgallery'
2015-01-17 12:18:14 +01:00
Andreas Stephanides
3c2250b4fc
Revert "change meetings"
...
This reverts commit 585b386e7c
2015-01-17 12:16:37 +01:00
edc8f6c2e3
small fixes
2015-01-17 12:04:53 +01:00
057a66966d
fix document searchable
2015-01-17 12:04:10 +01:00
Thomas Blazek
9ffebfd4e7
started writing the init script
2015-01-16 15:25:44 +01:00
Thomas Blazek
b7f9cf942b
Bildergallerie auf Kurs
...
Für alle mit löschrechten: 2 Buttons, einer zeigt auf originaldatei,
einer löscht das bild.
2015-01-16 14:41:37 +01:00
Thomas Blazek
9c6038d6dd
Gallery show enhancements
...
a) Worked on better pagination, knows now 25, 50, 100 and "all"
b) Viewer always shows ALL pictures, sorted to fit the order of the
pagination
2015-01-16 12:10:02 +01:00
Thomas Blazek
a9969a6c72
updates
2015-01-16 09:46:01 +01:00
Thomas Blazek
75667ae6ce
work in progress
2015-01-16 00:03:09 +01:00
Andreas Stephanides
978d923082
fix blueimp gallery
2015-01-15 16:38:16 +01:00
Andreas Stephanides
c95782744a
gemfle update
2015-01-15 16:13:28 +01:00
Andreas Stephanides
fe4d72dcb3
application css scss
2015-01-15 15:57:00 +01:00
Andreas Stephanides
43a551fc28
Merge branch 'master' of https://github.com/Inachos/fetsite into testgallery
...
Conflicts:
app/views/layouts/application.html.erb
2015-01-15 15:40:36 +01:00
Thomas Blazek
48e3c1149a
added start_topic.yml to gitignore
2015-01-15 15:36:54 +01:00
Thomas Blazek
3dff2d2bbe
Fix: Bildergallerie
...
Bildergallerie läuft jetzt auf Blueimp-gallery.
Viel spaß
2015-01-15 15:36:20 +01:00
Andreas Stephanides
565024c282
blue2
2015-01-15 15:20:19 +01:00
Thomas Blazek
9873c4f1c1
Merge branch 'master' of https://github.com/Inachos/fetsite
2015-01-15 14:38:41 +01:00
Thomas Blazek
f6a95dee57
commit
2015-01-15 14:30:53 +01:00
Thomas Blazek
3a00794851
dfsd
2015-01-15 14:01:16 +01:00
Thomas Blazek
2931ee6cd6
Need to enforce the jquery-fileupload version
...
0.4.2 broke uploads for me
2015-01-15 12:56:52 +01:00
Thomas Blazek
bcffee7bc9
Merge branch 'master' of https://github.com/fetsite/fetsite
2015-01-14 09:12:56 +01:00
70e34875f1
search results fix
2015-01-14 09:11:09 +01:00
Thomas Blazek
9cc108b2ed
Merge branch 'master' of https://github.com/andreassteph/fetsite
2015-01-14 09:10:57 +01:00
1d11b270cf
Merge branch 'master' of https://github.com/fetsite/fetsite
2015-01-14 09:08:51 +01:00
Andreas Stephanides
1731d1f3d2
Merge branch 'master' of github.com:fetsite/fetsite
2015-01-14 09:08:05 +01:00
Andreas Stephanides
47b692b243
Suchergebnis darstellung
2015-01-14 09:07:34 +01:00
Thomas Blazek
f95c8469e3
Merge branch 'master' of https://github.com/fetsite/fetsite
2015-01-12 16:54:21 +01:00
Thomas Blazek
25cf052f95
Merge pull request #212 from bernis/master
...
Sprache/Login im Menü rechtsbündig
2015-01-12 12:26:29 +01:00
Thomas Blazek
85d2bb5bf9
Check for 0 themen
2015-01-11 22:18:31 +01:00
Thomas Blazek
79ba089b70
Merge branch 'master' of https://github.com/Inachos/fetsite
...
Conflicts:
Gemfile.lock
config/routes.rb
2015-01-11 22:18:05 +01:00
Bernhard Stampfer
c879189705
Sprache/Login im Menü rechtsbündig
2015-01-05 18:37:05 +01:00
5b0840a7d2
Merge branch 'master' of https://github.com/fetsite/fetsite
2015-01-04 16:31:51 +01:00
