Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sidebar #53

Merged
merged 5 commits into from
Sep 8, 2016
Merged

Sidebar #53

merged 5 commits into from
Sep 8, 2016

Conversation

danohu
Copy link
Collaborator

@danohu danohu commented Mar 2, 2015

No description provided.

All very hacky, needing to be torn down and replaced

Conflicts:
	drupal_annotation/annotation.store.inc
	drupal_annotator/annotator_view/categories.js
	drupal_annotator/annotator_view/css/style.css
	drupal_annotator/annotator_view/img/Compartido.png
	drupal_annotator/annotator_view/img/edit-icon.png
	drupal_annotator/annotator_view/img/icono_eliminar.png
	drupal_annotator/annotator_view/img/papelera_over.png
	drupal_annotator/annotator_view/img/shared-icon.png
	drupal_annotator/annotator_view/lib/jquery-i18n-master/.gitignore
	drupal_annotator/annotator_view/lib/jquery-i18n-master/Gruntfile.js
	drupal_annotator/annotator_view/lib/jquery-i18n-master/LICENSE
	drupal_annotator/annotator_view/lib/jquery-i18n-master/README.md
	drupal_annotator/annotator_view/lib/jquery-i18n-master/SpecRunner.html
	drupal_annotator/annotator_view/lib/jquery-i18n-master/bower.json
	drupal_annotator/annotator_view/lib/jquery-i18n-master/examples/index.html
	drupal_annotator/annotator_view/lib/jquery-i18n-master/examples/jquery-1.4.2.js
	drupal_annotator/annotator_view/lib/jquery-i18n-master/jquery.i18n.js
	drupal_annotator/annotator_view/lib/jquery-i18n-master/jquery.i18n.min.js
	drupal_annotator/annotator_view/lib/jquery-i18n-master/lib/jasmine-1.2.0/MIT.LICENSE
	drupal_annotator/annotator_view/lib/jquery-i18n-master/lib/jasmine-1.2.0/jasmine-html.js
	drupal_annotator/annotator_view/lib/jquery-i18n-master/lib/jasmine-1.2.0/jasmine.css
	drupal_annotator/annotator_view/lib/jquery-i18n-master/lib/jasmine-1.2.0/jasmine.js
	drupal_annotator/annotator_view/lib/jquery-i18n-master/package.json
	drupal_annotator/annotator_view/lib/jquery-i18n-master/specs/jquery.i18n.spec.js
	drupal_annotator/annotator_view/lib/jquery-i18n-master/src/jquery.i18n.js
	drupal_annotator/annotator_view/lib/jquery.dateFormat.js
	drupal_annotator/annotator_view/lib/jquery.slimscroll.js
	drupal_annotator/annotator_view/view_annotator.js
Just keep the code for adding in a sidebar
@gandhiano
Copy link

Why was this never merged?

May I ask what was the approach to display the sidebars? I am working on a new theming framework/workflow for edgeryders.eu and would appreciate to collect any thoughts already made here. I'm currently strongly inclined to use CTools collapsible divs for this.

@albertocottica
Copy link
Member

@tanius OK to merge this? One more thing out of the way.

@danohu danohu merged commit b7aaad4 into edgeryders:master Sep 8, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants