I know you have asked us to come up with our own templates for the liquid and popup templates for the affiliate templates. I did the liquid and seem to be ok. But the Popup template as an area that I cannot modify to produce a correct result.
When displayed it looks ok. But when I try to print it instead of our affiliates title being displayed the UNL header is displayed.
<h1>University of Nebraska–Lincoln</h1>
<div> <InstanceBeginEditable>@@(" ")@@<InstanceEndEditable> </div>
Seems to be the culprit. In the liquid site we have an affiliate_name editable area that solves the problem.
You can see and example of the problem at http://snr.unl.edu:9112/testpop.asp