I was looking for exactly the same kind of grammar book and I think I found it: It is called Grammatik – ganz klar by Hueber. It is all in German but it isn’t difficult to follow, altough a dictionary comes in handy sometimes.