The basic glass shader should be fine for both the liquid and the glass (with appropriate IORs).
The key is however to make sure the normals are pointed in the right direction, because Blender doesn’t currently support nested dielectrics.
Have a look at these references:
